From 1d11fa7aedd305215dcf6e0a9810b3e75900031d Mon Sep 17 00:00:00 2001 From: Tejas Rajopadhye Date: Mon, 31 Mar 2025 17:21:20 -0500 Subject: [PATCH] Fix for blank screen --- .../dataall/core/environment/services/environment_service.py | 5 +++++ backend/dataall/modules/s3_datasets/api/dataset/resolvers.py | 4 ++-- backend/dataall/modules/s3_datasets/api/dataset/types.py | 5 ++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/backend/dataall/core/environment/services/environment_service.py b/backend/dataall/core/environment/services/environment_service.py index b064d759f..033130c19 100644 --- a/backend/dataall/core/environment/services/environment_service.py +++ b/backend/dataall/core/environment/services/environment_service.py @@ -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]: """ diff --git a/backend/dataall/modules/s3_datasets/api/dataset/resolvers.py b/backend/dataall/modules/s3_datasets/api/dataset/resolvers.py index db2fad2df..ffd6ebe07 100644 --- a/backend/dataall/modules/s3_datasets/api/dataset/resolvers.py +++ b/backend/dataall/modules/s3_datasets/api/dataset/resolvers.py @@ -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): diff --git a/backend/dataall/modules/s3_datasets/api/dataset/types.py b/backend/dataall/modules/s3_datasets/api/dataset/types.py index 6bb344b2e..6bfd42b33 100644 --- a/backend/dataall/modules/s3_datasets/api/dataset/types.py +++ b/backend/dataall/modules/s3_datasets/api/dataset/types.py @@ -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, @@ -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',