CB-5278 fix: don't dispose execution context (#2718)

dbeaver · Jun 18, 2024 · cdd3a35 · cdd3a35
1 parent 9a471be
commit cdd3a35
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/...p/packages/plugin-data-viewer-result-set-grouping/src/DVResultSetGroupingPresentation.tsx b/...p/packages/plugin-data-viewer-result-set-grouping/src/DVResultSetGroupingPresentation.tsx
@@ -6,7 +6,6 @@
  * you may not use this file except in compliance with the License.
  */
 import { observer } from 'mobx-react-lite';
-import { useState } from 'react';
 
 import { s, useS, useTranslate } from '@cloudbeaver/core-blocks';
 import { useTabLocalState } from '@cloudbeaver/core-ui';
@@ -26,15 +25,14 @@ export const DVResultSetGroupingPresentation: DataPresentationComponent<any, IDa
 }) {
   const state = useTabLocalState<IDVResultSetGroupingPresentationState>(() => ({
     presentationId: '',
+    valuePresentationId: null,
     columns: [],
     functions: [DEFAULT_GROUPING_QUERY_OPERATION],
     showDuplicatesOnly: false,
   }));
   const style = useS(styles);
 
   const translate = useTranslate();
-  const [presentationId, setPresentation] = useState('');
-  const [valuePresentationId, setValuePresentation] = useState<string | null>(null);
   const model = useGroupingDataModel(originalModel, resultIndex, state);
   const dnd = useGroupingDnDColumns(state, originalModel, model);
 
@@ -66,11 +64,15 @@ export const DVResultSetGroupingPresentation: DataPresentationComponent<any, IDa
           <TableViewerLoader
             tableId={model.model.id}
             resultIndex={resultIndex}
-            presentationId={presentationId}
-            valuePresentationId={valuePresentationId}
+            presentationId={state.presentationId}
+            valuePresentationId={state.valuePresentationId}
             simple
-            onPresentationChange={setPresentation}
-            onValuePresentationChange={setValuePresentation}
+            onPresentationChange={presentationId => {
+              state.presentationId = presentationId;
+            }}
+            onValuePresentationChange={presentationId => {
+              state.valuePresentationId = presentationId;
+            }}
           />
         )}
       </div>

diff --git a/...kages/plugin-data-viewer-result-set-grouping/src/IDVResultSetGroupingPresentationState.ts b/...kages/plugin-data-viewer-result-set-grouping/src/IDVResultSetGroupingPresentationState.ts
@@ -9,4 +9,5 @@ import type { IGroupingQueryState } from './IGroupingQueryState';
 
 export interface IDVResultSetGroupingPresentationState extends IGroupingQueryState {
   presentationId: string;
+  valuePresentationId: string | null;
 }
diff --git a/webapp/packages/plugin-data-viewer-result-set-grouping/src/useGroupingDataModel.ts b/webapp/packages/plugin-data-viewer-result-set-grouping/src/useGroupingDataModel.ts
@@ -59,7 +59,7 @@ export function useGroupingDataModel(
         source,
         model,
         dispose() {
-          this.model.dispose();
+          this.model.dispose(true);
           tableViewerStorageService.remove(this.model.id);
         },
       };