Fix Worksheets for shared tables

data-dot-all · Dec 3, 2024 · cb9fbd0 · cb9fbd0
1 parent 9ff55b4
commit cb9fbd0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/backend/dataall/modules/s3_datasets_shares/api/resolvers.py b/backend/dataall/modules/s3_datasets_shares/api/resolvers.py
@@ -41,7 +41,7 @@ def validate_dataset_share_selector_input(data):
 
 
 def list_shared_tables_by_env_dataset(context: Context, source, datasetUri: str, envUri: str):
-    return S3ShareService.list_shared_tables_by_env_dataset(datasetUri, envUri)
+    return S3ShareService.list_shared_tables_by_env_dataset(dataset_uri=datasetUri, uri=envUri)
 
 
 @is_feature_enabled('modules.s3_datasets.features.aws_actions')

diff --git a/frontend/src/modules/Worksheets/views/WorksheetView.js b/frontend/src/modules/Worksheets/views/WorksheetView.js
@@ -190,7 +190,7 @@ const WorksheetView = () => {
           response.data.getSharedDatasetTables.map((t) => ({
             ...t,
             value: t.tableUri,
-            label: t.restricted.GlueTableName
+            label: t.GlueTableName
           }))
         );
       } else if (!response.errors) {
@@ -379,7 +379,11 @@ const WorksheetView = () => {
       dispatch({ type: SET_ERROR, error: e.message })
     );
     setSqlBody(
-      `SELECT * FROM "${selectedDatabase.label}"."${event.target.value.restricted.GlueTableName}" limit 10;`
+      `SELECT * FROM "${selectedDatabase.label}"."${
+        event.target.value.restricted
+          ? event.target.value.restricted.GlueTableName
+          : event.target.value.GlueTableName
+      }" limit 10;`
     );
   }
 
@@ -512,7 +516,7 @@ const WorksheetView = () => {
                     {tableOptions.length > 0 ? (
                       tableOptions.map((table) => (
                         <MenuItem key={table.tableUri} value={table}>
-                          {table.restricted.GlueTableName}
+                          {table.label}
                         </MenuItem>
                       ))
                     ) : (