fix: should always ask confirmation is user input is truthy

Author: Raubzeug

src/containers/Tenant/ObjectSummary/SchemaTree/SchemaTree.tsx

@@ -6,7 +6,7 @@ import React from 'react';
 import {NavigationTree} from 'ydb-ui-components';
 
 import {useCreateDirectoryFeatureAvailable} from '../../../../store/reducers/capabilities/hooks';
-import {selectIsQuerySaved} from '../../../../store/reducers/executeQuery';
+import {selectUserInput} from '../../../../store/reducers/executeQuery';
 import {schemaApi} from '../../../../store/reducers/schema/schema';
 import {tableSchemaDataApi} from '../../../../store/reducers/tableSchemaData';
 import type {GetTableSchemaDataParams} from '../../../../store/reducers/tableSchemaData';
@@ -39,7 +39,7 @@ export function SchemaTree(props: SchemaTreeProps) {
     const createDirectoryFeatureAvailable = useCreateDirectoryFeatureAvailable();
     const {rootPath, rootName, rootType, currentPath, onActivePathUpdate} = props;
     const dispatch = useTypedDispatch();
-    const isQuerySaved = useTypedSelector(selectIsQuerySaved);
+    const input = useTypedSelector(selectUserInput);
     const [getTableSchemaDataMutation] = tableSchemaDataApi.useGetTableSchemaDataMutation();
 
     const getTableSchemaDataPromise = React.useCallback(
@@ -151,7 +151,7 @@ export function SchemaTree(props: SchemaTreeProps) {
                             ? handleOpenCreateDirectoryDialog
                             : undefined,
                         getTableSchemaDataPromise,
-                        getConfirmation: isQuerySaved ? undefined : getConfirmation,
+                        getConfirmation: input ? getConfirmation : undefined,
                     },
                     rootPath,
                 )}

src/store/reducers/executeQuery.ts

@@ -1,24 +1,17 @@
-import {createSelector, createSlice} from '@reduxjs/toolkit';
+import {createSlice} from '@reduxjs/toolkit';
 import type {PayloadAction} from '@reduxjs/toolkit';
 
 import {settingsManager} from '../../services/settings';
 import {TracingLevelNumber} from '../../types/api/query';
 import type {ExecuteActions} from '../../types/api/query';
 import {ResultType} from '../../types/store/executeQuery';
 import type {ExecuteQueryState, QueryInHistory, QueryResult} from '../../types/store/executeQuery';
-import type {
-    QueryRequestParams,
-    QuerySettings,
-    QuerySyntax,
-    SavedQuery,
-} from '../../types/store/query';
-import {QUERIES_HISTORY_KEY, SAVED_QUERIES_KEY} from '../../utils/constants';
+import type {QueryRequestParams, QuerySettings, QuerySyntax} from '../../types/store/query';
+import {QUERIES_HISTORY_KEY} from '../../utils/constants';
 import {QUERY_SYNTAX, isQueryErrorResponse, parseQueryAPIExecuteResponse} from '../../utils/query';
 import {isNumeric} from '../../utils/utils';
-import type {RootState} from '../defaultStore';
 
 import {api} from './api';
-import {getSettingValue} from './settings/settings';
 
 const MAXIMUM_QUERIES_IN_HISTORY = 20;
 
@@ -31,7 +24,6 @@ const sliceLimit = queriesHistoryInitial.length - MAXIMUM_QUERIES_IN_HISTORY;
 
 const initialState: ExecuteQueryState = {
     input: '',
-    changed: false,
     history: {
         queries: queriesHistoryInitial
             .slice(sliceLimit < 0 ? 0 : sliceLimit)
@@ -50,11 +42,6 @@ const slice = createSlice({
     reducers: {
         changeUserInput: (state, action: PayloadAction<{input: string}>) => {
             state.input = action.payload.input;
-            state.changed = state.input !== action.payload.input;
-        },
-
-        setQueryChanged: (state, action: PayloadAction<boolean>) => {
-            state.changed = action.payload;
         },
         setQueryTraceReady: (state) => {
             if (state.result) {
@@ -156,7 +143,6 @@ const slice = createSlice({
 export default slice.reducer;
 export const {
     changeUserInput,
-    setQueryChanged,
     setQueryTraceReady,
     setQueryResult,
     saveQueryToHistory,
@@ -175,18 +161,6 @@ export const {
     selectUserInput,
 } = slice.selectors;
 
-export const selectIsQuerySaved = createSelector(
-    (state: RootState) => state,
-    (state: RootState) => {
-        const savedQueries = (getSettingValue(state, SAVED_QUERIES_KEY) as SavedQuery[]) ?? [];
-        return (
-            savedQueries.some((query) => query.body === state.executeQuery.input) ||
-            state.executeQuery.history.queries[state.executeQuery.history.queries.length - 1]
-                ?.queryText === state.executeQuery.input
-        );
-    },
-);
-
 interface SendQueryParams extends QueryRequestParams {
     queryId: string;
     querySettings?: Partial<QuerySettings>;

src/types/store/executeQuery.ts

@@ -38,7 +38,6 @@ export type QueryResult = ExecuteQueryResult | ExplainQueryResult;
 export interface ExecuteQueryState {
     input: string;
     result?: QueryResult & {isTraceReady?: boolean};
-    changed?: boolean;
     history: {
         // String type for backward compatibility
         queries: QueryInHistory[];

src/utils/hooks/withConfirmation/useChangeInputWithConfirmation.ts

@@ -4,7 +4,7 @@ import NiceModal from '@ebay/nice-modal-react';
 
 import {useTypedSelector} from '..';
 import {CONFIRMATION_DIALOG} from '../../../components/ConfirmationDialog/ConfirmationDialog';
-import {selectIsQuerySaved} from '../../../store/reducers/executeQuery';
+import {selectUserInput} from '../../../store/reducers/executeQuery';
 
 import i18n from './i18n';
 
@@ -27,12 +27,12 @@ export function changeInputWithConfirmation<T>(callback: (args: T) => void) {
 }
 
 export function useChangeInputWithConfirmation<T>(callback: (args: T) => void) {
-    const isQuerySaved = useTypedSelector(selectIsQuerySaved);
+    const userInput = useTypedSelector(selectUserInput);
     const callbackWithConfirmation = React.useMemo(
         () => changeInputWithConfirmation<T>(callback),
         [callback],
     );
-    if (isQuerySaved) {
+    if (!userInput) {
         return callback;
     }
     return callbackWithConfirmation;