CB-3972 safe way to get action check for the document (#2261)

dbeaver · Jan 3, 2024 · d719008 · d719008
1 parent 1330b95
commit d719008
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/...packages/plugin-data-viewer-result-set-grouping/src/DVResultSetGroupingPluginBootstrap.ts b/...packages/plugin-data-viewer-result-set-grouping/src/DVResultSetGroupingPluginBootstrap.ts
@@ -89,18 +89,25 @@ export class DVResultSetGroupingPluginBootstrap extends Bootstrap {
             if (!model.source.hasResult(resultIndex)) {
               return true;
             }
-            const selectionAction = model.source.getAction(resultIndex, ResultSetSelectAction);
-            const dataAction = model.source.getAction(resultIndex, ResultSetDataAction);
 
-            return !grouping.getColumns().some(name => {
-              const key = dataAction.findColumnKey(column => column.name === name);
+            const format = model.source.getResult(resultIndex)?.dataFormat;
 
-              if (!key) {
-                return false;
-              }
+            if (format === ResultDataFormat.Resultset) {
+              const selectionAction = model.source.getAction(resultIndex, ResultSetSelectAction);
+              const dataAction = model.source.getAction(resultIndex, ResultSetDataAction);
 
-              return selectionAction.isElementSelected({ column: key });
-            });
+              return !grouping.getColumns().some(name => {
+                const key = dataAction.findColumnKey(column => column.name === name);
+
+                if (!key) {
+                  return false;
+                }
+
+                return selectionAction.isElementSelected({ column: key });
+              });
+            }
+
+            return true;
           }
         }
 

diff --git a/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DataContext/DATA_CONTEXT_DV_DDM.ts b/webapp/packages/plugin-data-viewer/src/DatabaseDataModel/DataContext/DATA_CONTEXT_DV_DDM.ts
@@ -10,4 +10,4 @@ import { createDataContext } from '@cloudbeaver/core-data-context';
 import type { IDatabaseDataModel } from '../IDatabaseDataModel';
 import type { IDatabaseDataOptions } from '../IDatabaseDataOptions';
 
-export const DATA_CONTEXT_DV_DDM = createDataContext<IDatabaseDataModel<IDatabaseDataOptions, any>>('data-viewer-database-data-model');
+export const DATA_CONTEXT_DV_DDM = createDataContext<IDatabaseDataModel<IDatabaseDataOptions>>('data-viewer-database-data-model');