feat(Query): remove query modes setting (#600)

Author: artemmufazalov

src/containers/Tenant/Query/QueriesHistory/QueriesHistory.tsx

@@ -9,7 +9,7 @@ import {setQueryTab} from '../../../../store/reducers/tenant/tenant';
 import {selectQueriesHistory} from '../../../../store/reducers/executeQuery';
 import {TENANT_QUERY_TABS_ID} from '../../../../store/reducers/tenant/constants';
 import {useQueryModes, useTypedSelector} from '../../../../utils/hooks';
-import {QUERY_MODES, QUERY_MODES_TITLES, QUERY_SYNTAX} from '../../../../utils/query';
+import {QUERY_MODES, QUERY_SYNTAX} from '../../../../utils/query';
 import {MAX_QUERY_HEIGHT, QUERY_TABLE_SETTINGS} from '../../utils/constants';
 
 import i18n from '../i18n';
@@ -31,22 +31,15 @@ function QueriesHistory({changeUserInput}: QueriesHistoryProps) {
     const reversedHistory = [...queriesHistory].reverse();
 
     const onQueryClick = (query: QueryInHistory) => {
-        let isQueryModeSet = true;
-
         if (query.syntax === QUERY_SYNTAX.pg && queryMode !== QUERY_MODES.pg) {
-            isQueryModeSet = setQueryMode(
-                QUERY_MODES.pg,
-                i18n('history.cannot-set-mode', {mode: QUERY_MODES_TITLES[QUERY_MODES.pg]}),
-            );
+            setQueryMode(QUERY_MODES.pg);
         } else if (query.syntax !== QUERY_SYNTAX.pg && queryMode === QUERY_MODES.pg) {
             // Set query mode for queries with yql syntax
-            isQueryModeSet = setQueryMode(QUERY_MODES.script);
+            setQueryMode(QUERY_MODES.script);
         }
 
-        if (isQueryModeSet) {
-            changeUserInput({input: query.queryText});
-            dispatch(setQueryTab(TENANT_QUERY_TABS_ID.newQuery));
-        }
+        changeUserInput({input: query.queryText});
+        dispatch(setQueryTab(TENANT_QUERY_TABS_ID.newQuery));
     };
 
     const columns: Column<QueryInHistory>[] = [

src/containers/Tenant/Query/QueryEditor/QueryEditor.js

@@ -23,12 +23,11 @@ import {
     DEFAULT_IS_QUERY_RESULT_COLLAPSED,
     DEFAULT_SIZE_RESULT_PANE_KEY,
     SAVED_QUERIES_KEY,
-    ENABLE_ADDITIONAL_QUERY_MODES,
     LAST_USED_QUERY_ACTION_KEY,
     QUERY_USE_MULTI_SCHEMA_KEY,
 } from '../../../../utils/constants';
 import {useSetting, useQueryModes} from '../../../../utils/hooks';
-import {QUERY_ACTIONS, QUERY_MODES, isNewQueryMode} from '../../../../utils/query';
+import {QUERY_ACTIONS} from '../../../../utils/query';
 
 import {
     PaneVisibilityActionTypes,
@@ -85,16 +84,9 @@ function QueryEditor(props) {
 
     const [isResultLoaded, setIsResultLoaded] = useState(false);
     const [queryMode, setQueryMode] = useQueryModes();
-    const [enableAdditionalQueryModes] = useSetting(ENABLE_ADDITIONAL_QUERY_MODES);
     const [useMultiSchema] = useSetting(QUERY_USE_MULTI_SCHEMA_KEY);
     const [lastUsedQueryAction, setLastUsedQueryAction] = useSetting(LAST_USED_QUERY_ACTION_KEY);
 
-    useEffect(() => {
-        if (isNewQueryMode(queryMode) && !enableAdditionalQueryModes) {
-            setQueryMode(QUERY_MODES.script);
-        }
-    }, [enableAdditionalQueryModes, queryMode, setQueryMode]);
-
     useEffect(() => {
         if (savedPath !== path) {
             if (savedPath) {
@@ -470,7 +462,6 @@ function QueryEditor(props) {
                 disabled={!executeQuery.input}
                 onUpdateQueryMode={setQueryMode}
                 queryMode={queryMode}
-                enableAdditionalQueryModes={enableAdditionalQueryModes}
                 highlitedAction={lastUsedQueryAction}
             />
         );

src/containers/Tenant/Query/QueryEditorControls/QueryEditorControls.scss

@@ -27,7 +27,7 @@
         $b: &;
 
         &__button {
-            width: 189px;
+            width: 241px;
             margin-left: 2px;
         }
 
@@ -36,24 +36,11 @@
             justify-content: space-between;
             align-items: center;
 
-            width: 163px;
+            width: 215px;
         }
 
         &__popup {
-            width: 189px;
-
-            &_extended {
-                width: 241px;
-            }
-        }
-
-        &_extended {
-            #{$b}__button {
-                width: 241px;
-            }
-            #{$b}__button-content {
-                width: 215px;
-            }
+            width: 241px;
         }
     }
 

src/containers/Tenant/Query/QueryEditorControls/QueryEditorControls.tsx

@@ -19,17 +19,6 @@ const queryModeSelectorPopupQa = 'query-mode-selector-popup';
 
 const b = block('ydb-query-editor-controls');
 
-const OldQueryModeSelectorOptions = {
-    [QUERY_MODES.script]: {
-        title: QUERY_MODES_TITLES[QUERY_MODES.script],
-        description: i18n('method-description.script'),
-    },
-    [QUERY_MODES.scan]: {
-        title: QUERY_MODES_TITLES[QUERY_MODES.scan],
-        description: i18n('method-description.scan'),
-    },
-} as const;
-
 const QueryModeSelectorOptions = {
     [QUERY_MODES.script]: {
         title: QUERY_MODES_TITLES[QUERY_MODES.script],
@@ -63,7 +52,6 @@ interface QueryEditorControlsProps {
     disabled: boolean;
     onUpdateQueryMode: (mode: QueryMode) => void;
     queryMode: QueryMode;
-    enableAdditionalQueryModes: boolean;
     highlitedAction: QueryAction;
 }
 
@@ -78,14 +66,9 @@ export const QueryEditorControls = ({
     onUpdateQueryMode,
     queryMode,
     highlitedAction,
-    enableAdditionalQueryModes,
 }: QueryEditorControlsProps) => {
     const querySelectorMenuItems = useMemo(() => {
-        const options = enableAdditionalQueryModes
-            ? QueryModeSelectorOptions
-            : OldQueryModeSelectorOptions;
-
-        return Object.entries(options).map(([mode, {title, description}]) => {
+        return Object.entries(QueryModeSelectorOptions).map(([mode, {title, description}]) => {
             return {
                 text: (
                     <LabelWithPopover
@@ -100,7 +83,7 @@ export const QueryEditorControls = ({
                 },
             };
         });
-    }, [onUpdateQueryMode, enableAdditionalQueryModes]);
+    }, [onUpdateQueryMode]);
 
     const runView: ButtonView | undefined = highlitedAction === 'execute' ? 'action' : undefined;
     const explainView: ButtonView | undefined =
@@ -132,17 +115,11 @@ export const QueryEditorControls = ({
                 >
                     Explain
                 </Button>
-                <div
-                    className={b('mode-selector', {
-                        extended: enableAdditionalQueryModes,
-                    })}
-                >
+                <div className={b('mode-selector')}>
                     <DropdownMenu
                         items={querySelectorMenuItems}
                         popupProps={{
-                            className: b('mode-selector__popup', {
-                                extended: enableAdditionalQueryModes,
-                            }),
+                            className: b('mode-selector__popup'),
                             qa: queryModeSelectorPopupQa,
                         }}
                         switcher={

src/containers/Tenant/Query/i18n/en.json

@@ -8,8 +8,6 @@
   "history.empty": "History is empty",
   "saved.empty": "There are no saved queries",
 
-  "history.cannot-set-mode": "This query is available only with '{{mode}}' query mode. You need to turn in additional query modes in settings to enable it",
-
   "delete-dialog.header": "Delete query",
   "delete-dialog.question": "Are you sure you want to delete query",
   "delete-dialog.delete": "Delete",

src/containers/Tenant/Query/i18n/ru.json

@@ -8,8 +8,6 @@
   "history.empty": "История пуста",
   "saved.empty": "Нет сохраненных запросов",
 
-  "history.cannot-set-mode": "Этот запрос доступен только в режиме '{{mode}}'. Вам необходимо включить дополнительные режимы выполнения запросов в настройках",
-
   "delete-dialog.header": "Удалить запрос",
   "delete-dialog.question": "Вы уверены что хотите удалить запрос",
   "delete-dialog.delete": "Удалить",

src/containers/Tenant/utils/schemaActions.ts

@@ -4,7 +4,6 @@ import copy from 'copy-to-clipboard';
 import type {NavigationTreeNodeType, NavigationTreeProps} from 'ydb-ui-components';
 
 import type {QueryMode} from '../../../types/store/query';
-import type {SetQueryModeIfAvailable} from '../../../utils/hooks';
 import {changeUserInput} from '../../../store/reducers/executeQuery';
 import {setQueryTab, setTenantPage} from '../../../store/reducers/tenant/tenant';
 import {TENANT_QUERY_TABS_ID, TENANT_PAGES_IDS} from '../../../store/reducers/tenant/constants';
@@ -25,7 +24,7 @@ import {
 } from './queryTemplates';
 
 interface ActionsAdditionalEffects {
-    setQueryMode: SetQueryModeIfAvailable;
+    setQueryMode: (mode: QueryMode) => void;
     setActivePath: (path: string) => void;
 }
 
@@ -36,18 +35,16 @@ const bindActions = (
 ) => {
     const {setActivePath, setQueryMode} = additionalEffects;
 
-    const inputQuery =
-        (tmpl: (path: string) => string, mode?: QueryMode, setQueryModeErrorMessage?: string) =>
-        () => {
-            const isNewQueryModeSet = mode && setQueryMode(mode, setQueryModeErrorMessage);
+    const inputQuery = (tmpl: (path: string) => string, mode?: QueryMode) => () => {
+        if (mode) {
+            setQueryMode(mode);
+        }
 
-            if (!mode || isNewQueryModeSet) {
-                dispatch(changeUserInput({input: tmpl(path)}));
-                dispatch(setTenantPage(TENANT_PAGES_IDS.query));
-                dispatch(setQueryTab(TENANT_QUERY_TABS_ID.newQuery));
-                setActivePath(path);
-            }
-        };
+        dispatch(changeUserInput({input: tmpl(path)}));
+        dispatch(setTenantPage(TENANT_PAGES_IDS.query));
+        dispatch(setQueryTab(TENANT_QUERY_TABS_ID.newQuery));
+        setActivePath(path);
+    };
 
     return {
         createTable: inputQuery(createTableTemplate, 'script'),
@@ -56,11 +53,7 @@ const bindActions = (
         upsertQuery: inputQuery(upsertQueryTemplate),
         createExternalTable: inputQuery(createExternalTableTemplate, 'script'),
         dropExternalTable: inputQuery(dropExternalTableTemplate, 'script'),
-        selectQueryFromExternalTable: inputQuery(
-            selectQueryTemplate,
-            'query',
-            i18n('actions.externalTableSelectUnavailable'),
-        ),
+        selectQueryFromExternalTable: inputQuery(selectQueryTemplate, 'query'),
         createTopic: inputQuery(createTopicTemplate, 'script'),
         alterTopic: inputQuery(alterTopicTemplate, 'script'),
         dropTopic: inputQuery(dropTopicTemplate, 'script'),

src/containers/UserSettings/i18n/en.json

@@ -22,9 +22,6 @@
   "settings.useBackendParamsForTables.title": "Use virtual table for cluster Nodes tab",
   "settings.useBackendParamsForTables.popover": "Use table with data load on scroll. It will increase performance, but could work unstable",
 
-  "settings.enableAdditionalQueryModes.title": "Enable additional query modes",
-  "settings.enableAdditionalQueryModes.popover": "Adds 'Data', 'YQL - QueryService' and 'PostgreSQL' modes. May not work on some versions",
-
   "settings.queryUseMultiSchema.title": "Allow queries with multiple result sets",
   "settings.queryUseMultiSchema.popover": "Use 'multi' schema for queries that enables queries with multiple result sets. Returns nothing on versions 23-3 and older"
 }

src/containers/UserSettings/i18n/ru.json

@@ -22,9 +22,6 @@
   "settings.useBackendParamsForTables.title": "Использовать виртуализированную таблицу для вкладки Nodes кластера",
   "settings.useBackendParamsForTables.popover": "Использовать таблицу с загрузкой данных по скроллу. Это улучшит производительность, но может работать нестабильно",
 
-  "settings.enableAdditionalQueryModes.title": "Включить дополнительные режимы выполнения запросов",
-  "settings.enableAdditionalQueryModes.popover": "Добавляет режимы 'Data', 'YQL - QueryService' и 'PostgreSQL'. Может работать некорректно на некоторых версиях",
-
   "settings.queryUseMultiSchema.title": "Разрешить запросы с несколькими результатами",
   "settings.queryUseMultiSchema.popover": "Использовать для запросов схему 'multi', которая позволяет выполнять запросы с несколькими результатами. На версиях 23-3 и старше результат не возвращается вообще"
 }

src/containers/UserSettings/settings.ts

@@ -4,7 +4,6 @@ import favoriteFilledIcon from '../../assets/icons/star.svg';
 import flaskIcon from '../../assets/icons/flask.svg';
 
 import {
-    ENABLE_ADDITIONAL_QUERY_MODES,
     INVERTED_DISKS_KEY,
     LANGUAGE_KEY,
     THEME_KEY,
@@ -90,11 +89,6 @@ export const useBackendParamsForTables: SettingProps = {
     title: i18n('settings.useBackendParamsForTables.title'),
     helpPopoverContent: i18n('settings.useBackendParamsForTables.popover'),
 };
-export const enableQueryModesForExplainSetting: SettingProps = {
-    settingKey: ENABLE_ADDITIONAL_QUERY_MODES,
-    title: i18n('settings.enableAdditionalQueryModes.title'),
-    helpPopoverContent: i18n('settings.enableAdditionalQueryModes.popover'),
-};
 export const queryUseMultiSchemaSetting: SettingProps = {
     settingKey: QUERY_USE_MULTI_SCHEMA_KEY,
     title: i18n('settings.queryUseMultiSchema.title'),
@@ -109,12 +103,7 @@ export const appearanceSection: SettingsSection = {
 export const experimentsSection: SettingsSection = {
     id: 'experimentsSection',
     title: i18n('section.experiments'),
-    settings: [
-        useNodesEndpointSetting,
-        useBackendParamsForTables,
-        enableQueryModesForExplainSetting,
-        queryUseMultiSchemaSetting,
-    ],
+    settings: [useNodesEndpointSetting, useBackendParamsForTables, queryUseMultiSchemaSetting],
 };
 
 export const generalPage: SettingsPage = {