CB-4548 adds ACTION_TAB_CLOSE_SQL_RESULT_GROUP to the end of the tabs

dbeaver · Mar 28, 2024 · e9e95fb · e9e95fb
1 parent e47420e
commit e9e95fb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditorGroupTabsBootstrap.ts b/webapp/packages/plugin-sql-editor/src/SqlEditorGroupTabsBootstrap.ts
@@ -1,6 +1,6 @@
 import { Bootstrap, injectable } from '@cloudbeaver/core-di';
 import { DATA_CONTEXT_TABS_CONTEXT, MENU_TAB } from '@cloudbeaver/core-ui';
-import { ActionService, DATA_CONTEXT_MENU, MenuService } from '@cloudbeaver/core-view';
+import { ActionService, DATA_CONTEXT_MENU, menuExtractItems, MenuService } from '@cloudbeaver/core-view';
 
 import { ACTION_TAB_CLOSE_SQL_RESULT_GROUP } from './ACTION_TAB_CLOSE_SQL_RESULT_GROUP';
 import { DATA_CONTEXT_SQL_EDITOR_STATE } from './DATA_CONTEXT_SQL_EDITOR_STATE';
@@ -26,6 +26,15 @@ export class SqlEditorGroupTabsBootstrap extends Bootstrap {
         return !!tab && !!state?.enabledBaseActions && menu;
       },
       getItems: (context, items) => [...items, ACTION_TAB_CLOSE_SQL_RESULT_GROUP],
+      orderItems: (context, items) => {
+        const actions = menuExtractItems(items, [ACTION_TAB_CLOSE_SQL_RESULT_GROUP]);
+
+        if (actions.length > 0) {
+          items.push(...actions);
+        }
+
+        return items;
+      },
     });
     this.actionService.addHandler({
       id: 'result-tabs-group-base-handler',

diff --git a/webapp/packages/plugin-sql-editor/src/locales/en.ts b/webapp/packages/plugin-sql-editor/src/locales/en.ts
@@ -38,5 +38,5 @@ export default [
   ['sql_editor_close_result_tabs_dialog_title', 'Confirm closing tabs'],
   ['plugin_sql_editor_action_overlay_title', 'Action required'],
   ['plugin_sql_editor_action_overlay_description', 'Please reopen editor to continue working.'],
-  ['plugin_sql_editor_action_close_group', 'Close all of the same group'],
+  ['plugin_sql_editor_action_close_group', 'Close all of the same query'],
 ];
diff --git a/webapp/packages/plugin-sql-editor/src/locales/it.ts b/webapp/packages/plugin-sql-editor/src/locales/it.ts
@@ -31,5 +31,5 @@ export default [
   ['sql_editor_close_result_tabs_dialog_title', 'Confirm closing tabs'],
   ['plugin_sql_editor_action_overlay_title', 'Action required'],
   ['plugin_sql_editor_action_overlay_description', 'Please reopen editor to continue working.'],
-  ['plugin_sql_editor_action_close_group', 'Close all of the same group'],
+  ['plugin_sql_editor_action_close_group', 'Close all of the same query'],
 ];
diff --git a/webapp/packages/plugin-sql-editor/src/locales/ru.ts b/webapp/packages/plugin-sql-editor/src/locales/ru.ts
@@ -35,5 +35,5 @@ export default [
   ['sql_editor_close_result_tabs_dialog_title', 'Подтвердить закрытие вкладок'],
   ['plugin_sql_editor_action_overlay_title', 'Требуется действие'],
   ['plugin_sql_editor_action_overlay_description', 'Пожалуйста, перезапустите редактор для продолжения работы.'],
-  ['plugin_sql_editor_action_close_group', 'Закрыть все из группы'],
+  ['plugin_sql_editor_action_close_group', 'Закрыть все из этого запроса'],
 ];
diff --git a/webapp/packages/plugin-sql-editor/src/locales/zh.ts b/webapp/packages/plugin-sql-editor/src/locales/zh.ts
@@ -35,5 +35,5 @@ export default [
   ['sql_editor_close_result_tabs_dialog_title', 'Confirm closing tabs'],
   ['plugin_sql_editor_action_overlay_title', 'Action required'],
   ['plugin_sql_editor_action_overlay_description', 'Please reopen editor to continue working.'],
-  ['plugin_sql_editor_action_close_group', 'Close all of the same group'],
+  ['plugin_sql_editor_action_close_group', 'Close all of the same query'],
 ];