Skip to content

[BUGFIX] | GH-1796 | Fix for blank screen #1797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -851,6 +851,11 @@ def find_environment_by_uri(uri) -> Environment:
with get_context().db_engine.scoped_session() as session:
return EnvironmentService.get_environment_by_uri(session, uri)

@staticmethod
def find_environment_by_simplified(uri):
with get_context().db_engine.scoped_session() as session:
return EnvironmentService.get_environment_by_uri(session, uri)

@staticmethod
def list_all_active_environments(session) -> List[Environment]:
"""
Expand Down
4 changes: 2 additions & 2 deletions backend/dataall/modules/s3_datasets/api/dataset/resolvers.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,10 @@ def get_dataset_organization(context, source: S3Dataset, **kwargs):
return OrganizationRepository.get_organization_by_uri(session, source.organizationUri)


def get_dataset_environment(context, source: S3Dataset, **kwargs):
def get_dataset_environment_simplified(context, source: S3Dataset, **kwargs):
if not source:
return None
return EnvironmentService.find_environment_by_uri(uri=source.environmentUri)
return EnvironmentService.find_environment_by_simplified(uri=source.environmentUri)


def get_dataset_owners_group(context, source: S3Dataset, **kwargs):
Expand Down
5 changes: 2 additions & 3 deletions backend/dataall/modules/s3_datasets/api/dataset/types.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
from dataall.base.api import gql
from dataall.modules.datasets_base.services.datasets_enums import DatasetRole
from dataall.modules.s3_datasets.api.dataset.resolvers import (
get_dataset_environment,
get_dataset_organization,
get_dataset_environment_simplified,
get_dataset_owners_group,
get_dataset_stewards_group,
list_tables,
Expand Down Expand Up @@ -63,7 +62,7 @@
gql.Field(
name='environment',
type=gql.Ref('EnvironmentSimplified'),
resolver=get_dataset_environment,
resolver=get_dataset_environment_simplified,
),
gql.Field(
name='owners',
Expand Down
Loading