fix(QueryEditor): save chosen run action

Author: ariser

src/containers/Tenant/QueryEditor/QueryEditor.js

@@ -33,6 +33,7 @@ import {
     DEFAULT_SIZE_RESULT_PANE_KEY,
     DEFAULT_TABLE_SETTINGS,
     SAVED_QUERIES_KEY,
+    QUERY_INITIAL_RUN_ACTION_KEY,
 } from '../../../utils/constants';
 import {prepareQueryResponse} from '../../../utils/index';
 
@@ -538,15 +539,24 @@ function QueryEditor(props) {
     };
 
     const renderControls = () => {
-        const {executeQuery, explainQuery, savedQueries, selectRunAction} = props;
+        const {
+            executeQuery,
+            explainQuery,
+            savedQueries,
+            selectRunAction,
+            setSettingValue,
+        } = props;
         const {runAction} = executeQuery;
         const runIsDisabled = !executeQuery.input || executeQuery.loading;
         const runText = _.find(RUN_ACTIONS, {value: runAction}).content;
 
         const menuItems = RUN_ACTIONS.map((action) => {
             return {
                 text: action.content,
-                action: () => selectRunAction(action.value),
+                action: () => {
+                    selectRunAction(action.value);
+                    setSettingValue(QUERY_INITIAL_RUN_ACTION_KEY, action.value);
+                },
             };
         });
 

src/store/reducers/executeQuery.js

@@ -1,7 +1,8 @@
 import {createRequestActionTypes, createApiRequest} from '../utils';
 import '../../services/api';
 import {getValueFromLS, parseJson} from '../../utils/utils';
-import {QUERIES_HISTORY_KEY} from '../../utils/constants';
+import {QUERIES_HISTORY_KEY, QUERY_INITIAL_RUN_ACTION_KEY} from '../../utils/constants';
+import {readSavedSettingsValue} from './settings';
 
 const MAXIMUM_QUERIES_IN_HISTORY = 20;
 
@@ -39,7 +40,7 @@ const initialState = {
                 ? MAXIMUM_QUERIES_IN_HISTORY - 1
                 : queriesHistoryInitial.length - 1,
     },
-    runAction: RUN_ACTIONS_VALUES.script,
+    runAction: readSavedSettingsValue(QUERY_INITIAL_RUN_ACTION_KEY, RUN_ACTIONS_VALUES.script),
     monacoHotKey: null,
 };
 

src/store/reducers/settings.js

@@ -1,4 +1,11 @@
-import {ALL, defaultUserSettings, SAVED_QUERIES_KEY, THEME_KEY, TENANT_INITIAL_TAB_KEY} from '../../utils/constants';
+import {
+    defaultUserSettings,
+    ALL,
+    SAVED_QUERIES_KEY,
+    THEME_KEY,
+    TENANT_INITIAL_TAB_KEY,
+    QUERY_INITIAL_RUN_ACTION_KEY,
+} from '../../utils/constants';
 import '../../services/api';
 import {getValueFromLS} from '../../utils/utils';
 
@@ -7,24 +14,24 @@ const SET_SETTING_VALUE = 'settings/SET_VALUE';
 
 const userSettings = window.userSettings || {};
 const systemSettings = window.systemSettings || {};
-const theme = window.web_version
-    ? userSettings.theme || 'light'
-    : getValueFromLS(THEME_KEY, 'light');
-const savedQueries = window.web_version
-    ? userSettings[SAVED_QUERIES_KEY]
-    : getValueFromLS(SAVED_QUERIES_KEY, '[]');
-const savedTenantGeneralTab = window.web_version
-    ? userSettings[TENANT_INITIAL_TAB_KEY]
-    : getValueFromLS(TENANT_INITIAL_TAB_KEY);
+
+export function readSavedSettingsValue(key, defaultValue) {
+    const savedValue = window.web_version
+        ? userSettings[key]
+        : getValueFromLS(key);
+
+    return savedValue ?? defaultValue;
+}
 
 export const initialState = {
     problemFilter: ALL,
     userSettings: {
         ...defaultUserSettings,
         ...userSettings,
-        theme,
-        [SAVED_QUERIES_KEY]: savedQueries,
-        [TENANT_INITIAL_TAB_KEY]: savedTenantGeneralTab,
+        theme: readSavedSettingsValue(THEME_KEY, 'light'),
+        [SAVED_QUERIES_KEY]: readSavedSettingsValue(SAVED_QUERIES_KEY, '[]'),
+        [TENANT_INITIAL_TAB_KEY]: readSavedSettingsValue(TENANT_INITIAL_TAB_KEY),
+        [QUERY_INITIAL_RUN_ACTION_KEY]: readSavedSettingsValue(QUERY_INITIAL_RUN_ACTION_KEY),
     },
     systemSettings,
 };

src/utils/constants.js

@@ -139,3 +139,4 @@ export const DEFAULT_TABLE_SETTINGS = {
 };
 
 export const TENANT_INITIAL_TAB_KEY = 'saved_tenant_initial_tab';
+export const QUERY_INITIAL_RUN_ACTION_KEY = 'query_initial_run_action';