CB-4548 closes group tabs via tabs context close function (to save hi…

…ghlight tab logic)
dbeaver · Mar 28, 2024 · c2d9255 · c2d9255
1 parent de2003a
commit c2d9255
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditorGroupTabsBootstrap.ts b/webapp/packages/plugin-sql-editor/src/SqlEditorGroupTabsBootstrap.ts
@@ -36,6 +36,7 @@ export class SqlEditorGroupTabsBootstrap extends Bootstrap {
         return items;
       },
     });
+
     this.actionService.addHandler({
       id: 'result-tabs-group-base-handler',
       isActionApplicable: (context, action) => {
@@ -50,11 +51,13 @@ export class SqlEditorGroupTabsBootstrap extends Bootstrap {
         return [ACTION_TAB_CLOSE_SQL_RESULT_GROUP].includes(action);
       },
       handler: async (context, action) => {
-        const state = context.get(DATA_CONTEXT_SQL_EDITOR_STATE);
         const tab = context.get(DATA_CONTEXT_SQL_EDITOR_RESULT_ID);
+        const sqlEditorState = context.get(DATA_CONTEXT_SQL_EDITOR_STATE);
+        const tabs = context.get(DATA_CONTEXT_TABS_CONTEXT);
+
         switch (action) {
           case ACTION_TAB_CLOSE_SQL_RESULT_GROUP:
-            this.sqlResultTabsService.closeTabGroup(state, tab.id);
+            this.sqlResultTabsService.closeTabGroup(sqlEditorState, tabs, context, tab.id);
             break;
           default:
             break;

diff --git a/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabsService.ts b/webapp/packages/plugin-sql-editor/src/SqlResultTabs/SqlResultTabsService.ts
@@ -7,7 +7,9 @@
  */
 import { action, makeObservable } from 'mobx';
 
+import type { IDataContextProvider } from '@cloudbeaver/core-data-context';
 import { injectable } from '@cloudbeaver/core-di';
+import type { ITabsContext } from '@cloudbeaver/core-ui';
 
 import type { ISqlEditorResultTab, ISqlEditorTabState } from '../ISqlEditorTabState';
 import { SqlExecutionPlanService } from './ExecutionPlan/SqlExecutionPlanService';
@@ -75,16 +77,16 @@ export class SqlResultTabsService {
     }
   }
 
-  async closeTabGroup(state: ISqlEditorTabState, tabId: string) {
+  async closeTabGroup(state: ISqlEditorTabState, tabsContext: ITabsContext, context: IDataContextProvider, tabId: string) {
     const resultTab = state.resultTabs.find(tabState => tabState.tabId === tabId);
     const groupResultTabs = state.resultTabs.filter(tab => tab.groupId === resultTab?.groupId);
 
     if (groupResultTabs.length) {
       for (const groupTab of groupResultTabs) {
-        const canClose = await this.sqlQueryResultService.canCloseResultTab(state, groupTab.tabId);
+        const canClose = tabsContext.canClose(groupTab.tabId);
 
         if (canClose) {
-          this.removeResultTab(state, groupTab.tabId);
+          tabsContext.close(groupTab.tabId);
         }
       }
     }