modularization: Worksheets modularization

backend/dataall/api/Objects/Feed/registry.py

@@ -36,6 +36,5 @@ def types(cls):
         return [gql.Ref(target_type) for target_type in cls._DEFINITIONS.keys()]
 
 
-FeedRegistry.register(FeedDefinition("Worksheet", models.Worksheet))
 FeedRegistry.register(FeedDefinition("DataPipeline", models.DataPipeline))
 FeedRegistry.register(FeedDefinition("Dashboard", models.Dashboard))

backend/dataall/api/Objects/__init__.py

@@ -27,8 +27,6 @@
     SagemakerStudio,
     RedshiftCluster,
     Glossary,
-    AthenaQueryResult,
-    Worksheet,
     Feed,
     Notification,
     Vpc,

backend/dataall/api/constants.py

@@ -214,12 +214,4 @@ class Topic(GraphQLEnumMapper):
     Misc = 'Misc'
 
 
-class WorksheetRole(GraphQLEnumMapper):
-    Creator = '950'
-    Admin = '900'
-    SharedWithWritePermission = '500'
-    SharedWithReadPermission = '400'
-    NoPermission = '000'
-
-
 GLUEBUSINESSPROPERTIES = ['EXAMPLE_GLUE_PROPERTY_TO_BE_ADDED_ON_ES']

backend/dataall/core/group/services/group_resource_manager.py

@@ -3,7 +3,7 @@
 
 
 class GroupResource(ABC):
-    def count_resources(self, session, environment_uri, group_uri) -> int:
+    def count_resources(self, session, environment, group_uri) -> int:
         raise NotImplementedError()
 
 
@@ -18,8 +18,8 @@ def register(resource: GroupResource):
         GroupResourceManager._resources.append(resource)
 
     @staticmethod
-    def count_group_resources(session, environment_uri, group_uri) -> int:
+    def count_group_resources(session, environment, group_uri) -> int:
         counter = 0
         for resource in GroupResourceManager._resources:
-            counter += resource.count_resources(session, environment_uri, group_uri)
+            counter += resource.count_resources(session, environment, group_uri)
         return counter

backend/dataall/db/api/__init__.py

@@ -17,4 +17,3 @@
 from .sgm_studio_notebook import SgmStudioNotebook
 from .dashboard import Dashboard
 from .pipeline import Pipeline
-from .worksheet import Worksheet

backend/dataall/db/api/environment.py

@@ -305,7 +305,6 @@ def validate_permissions(session, uri, g_permissions, group):
         if permissions.CREATE_NETWORK in g_permissions:
             g_permissions.append(permissions.LIST_ENVIRONMENT_NETWORKS)
 
-        g_permissions.append(permissions.RUN_ATHENA_QUERY)
         g_permissions.append(permissions.GET_ENVIRONMENT)
         g_permissions.append(permissions.LIST_ENVIRONMENT_GROUPS)
         g_permissions.append(permissions.LIST_ENVIRONMENT_GROUP_PERMISSIONS)
@@ -370,11 +369,6 @@ def remove_group(session, username, groups, uri, data=None, check_perm=None):
                 models.Dashboard,
                 models.Dashboard.environmentUri == models.Environment.environmentUri,
             )
-            .outerjoin(
-                models.WorksheetQueryResult,
-                models.WorksheetQueryResult.AwsAccountId
-                == models.Environment.AwsAccountId,
-            )
             .filter(
                 and_(
                     models.Environment.environmentUri == environment.environmentUri,
@@ -391,7 +385,7 @@ def remove_group(session, username, groups, uri, data=None, check_perm=None):
 
         group_env_objects_count += GroupResourceManager.count_group_resources(
             session=session,
-            environment_uri=environment.environmentUri,
+            environment=environment,
             group_uri=group
         )