Skip to content

Commit 73616ba

Browse files
committed
fix: prettier code
1 parent 80d2dda commit 73616ba

File tree

8 files changed

+27
-15
lines changed

8 files changed

+27
-15
lines changed

src/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopQueries.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
setTopQueriesFilters,
99
topQueriesApi,
1010
} from '../../../../../store/reducers/executeTopQueries/executeTopQueries';
11-
import {changeUserInput} from '../../../../../store/reducers/query/query';
11+
import {changeUserInput, setIsDirty} from '../../../../../store/reducers/query/query';
1212
import {
1313
TENANT_DIAGNOSTICS_TABS_IDS,
1414
TENANT_PAGE,
@@ -56,7 +56,8 @@ export function TopQueries({tenantName}: TopQueriesProps) {
5656
(row: any) => {
5757
const {QueryText: input} = row;
5858

59-
dispatch(changeUserInput({input, isDirty: false}));
59+
dispatch(changeUserInput({input}));
60+
dispatch(setIsDirty(false));
6061

6162
const queryParams = parseQuery(location);
6263

src/containers/Tenant/Diagnostics/TopQueries/TopQueries.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {Search} from '../../../../components/Search';
1212
import {TableWithControlsLayout} from '../../../../components/TableWithControlsLayout/TableWithControlsLayout';
1313
import {parseQuery} from '../../../../routes';
1414
import {setTopQueriesFilters} from '../../../../store/reducers/executeTopQueries/executeTopQueries';
15-
import {changeUserInput} from '../../../../store/reducers/query/query';
15+
import {changeUserInput, setIsDirty} from '../../../../store/reducers/query/query';
1616
import {
1717
TENANT_PAGE,
1818
TENANT_PAGES_IDS,
@@ -71,7 +71,8 @@ export const TopQueries = ({tenantName}: TopQueriesProps) => {
7171

7272
const applyRowClick = React.useCallback(
7373
(input: string) => {
74-
dispatch(changeUserInput({input, isDirty: false}));
74+
dispatch(changeUserInput({input}));
75+
dispatch(setIsDirty(false));
7576

7677
const queryParams = parseQuery(location);
7778

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {TruncatedQuery} from '../../../../components/TruncatedQuery/TruncatedQue
77
import {
88
selectQueriesHistory,
99
selectQueriesHistoryFilter,
10+
setIsDirty,
1011
setQueryHistoryFilter,
1112
} from '../../../../store/reducers/query/query';
1213
import type {QueryInHistory} from '../../../../store/reducers/query/types';
@@ -27,7 +28,7 @@ const b = cn('ydb-queries-history');
2728
const QUERIES_HISTORY_COLUMNS_WIDTH_LS_KEY = 'queriesHistoryTableColumnsWidth';
2829

2930
interface QueriesHistoryProps {
30-
changeUserInput: (value: {input: string; isDirty?: boolean}) => void;
31+
changeUserInput: (value: {input: string}) => void;
3132
}
3233

3334
function QueriesHistory({changeUserInput}: QueriesHistoryProps) {
@@ -38,7 +39,8 @@ function QueriesHistory({changeUserInput}: QueriesHistoryProps) {
3839
const reversedHistory = [...queriesHistory].reverse();
3940

4041
const applyQueryClick = (query: QueryInHistory) => {
41-
changeUserInput({input: query.queryText, isDirty: false});
42+
changeUserInput({input: query.queryText});
43+
dispatch(setIsDirty(false));
4244
dispatch(setQueryTab(TENANT_QUERY_TABS_ID.newQuery));
4345
};
4446

src/containers/Tenant/Query/Query.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export const Query = (props: QueryProps) => {
2929

3030
const {queryTab = TENANT_QUERY_TABS_ID.newQuery} = useTypedSelector((state) => state.tenant);
3131

32-
const handleUserInputChange = (value: {input: string; isDirty?: boolean}) => {
32+
const handleUserInputChange = (value: {input: string}) => {
3333
dispatch(changeUserInput(value));
3434
};
3535

src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ const initialTenantCommonInfoState = {
6666
interface QueryEditorProps {
6767
tenantName: string;
6868
path: string;
69-
changeUserInput: (arg: {input: string; isDirty?: boolean}) => void;
69+
changeUserInput: (arg: {input: string}) => void;
7070
theme: string;
7171
type?: EPathType;
7272
}

src/containers/Tenant/Query/QueryEditor/YqlEditor.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
goToPreviousQuery,
1212
selectQueriesHistory,
1313
selectUserInput,
14+
setIsDirty,
1415
} from '../../../../store/reducers/query/query';
1516
import type {QueryAction} from '../../../../types/store/query';
1617
import {ENABLE_CODE_ASSISTANT, LAST_USED_QUERY_ACTION_KEY} from '../../../../utils/constants';
@@ -32,7 +33,7 @@ import {getKeyBindings} from './keybindings';
3233
const CONTEXT_MENU_GROUP_ID = 'navigation';
3334

3435
interface YqlEditorProps {
35-
changeUserInput: (arg: {input: string; isDirty?: boolean}) => void;
36+
changeUserInput: (arg: {input: string}) => void;
3637
theme: string;
3738
handleGetExplainQueryClick: (text: string) => void;
3839
handleSendExecuteClick: (text: string, partial?: boolean) => void;
@@ -92,7 +93,8 @@ export function YqlEditor({
9293
window.ydbEditor = editor;
9394
const keybindings = getKeyBindings(monaco);
9495
monaco.editor.registerCommand('insertSnippetToEditor', (_asessor, input: string) => {
95-
changeUserInput({input, isDirty: false});
96+
changeUserInput({input});
97+
dispatch(setIsDirty(false));
9698
});
9799

98100
if (window.api.codeAssist) {
@@ -179,7 +181,8 @@ export function YqlEditor({
179181

180182
const onChange = (newValue: string) => {
181183
updateErrorsHighlighting();
182-
changeUserInput({input: newValue, isDirty: true});
184+
changeUserInput({input: newValue});
185+
dispatch(setIsDirty(true));
183186
};
184187
return (
185188
<MonacoEditor

src/containers/Tenant/Query/SavedQueries/SavedQueries.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {ResizeableDataTable} from '../../../../components/ResizeableDataTable/Re
99
import {Search} from '../../../../components/Search';
1010
import {TableWithControlsLayout} from '../../../../components/TableWithControlsLayout/TableWithControlsLayout';
1111
import {TruncatedQuery} from '../../../../components/TruncatedQuery/TruncatedQuery';
12+
import {setIsDirty} from '../../../../store/reducers/query/query';
1213
import {
1314
deleteSavedQuery,
1415
selectSavedQueriesFilter,
@@ -63,7 +64,7 @@ const DeleteDialog = ({visible, queryName, onCancelClick, onConfirmClick}: Delet
6364
const SAVED_QUERIES_COLUMNS_WIDTH_LS_KEY = 'savedQueriesTableColumnsWidth';
6465

6566
interface SavedQueriesProps {
66-
changeUserInput: (value: {input: string; isDirty?: boolean}) => void;
67+
changeUserInput: (value: {input: string}) => void;
6768
}
6869

6970
export const SavedQueries = ({changeUserInput}: SavedQueriesProps) => {
@@ -91,7 +92,8 @@ export const SavedQueries = ({changeUserInput}: SavedQueriesProps) => {
9192

9293
const applyQueryClick = React.useCallback(
9394
({queryText, queryName}: {queryText: string; queryName: string}) => {
94-
changeUserInput({input: queryText, isDirty: false});
95+
changeUserInput({input: queryText});
96+
dispatch(setIsDirty(false));
9597
dispatch(setQueryNameToEdit(queryName));
9698
dispatch(setQueryTab(TENANT_QUERY_TABS_ID.newQuery));
9799
},

src/store/reducers/query/query.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,11 @@ const slice = createSlice({
4747
name: 'query',
4848
initialState,
4949
reducers: {
50-
changeUserInput: (state, action: PayloadAction<{input: string; isDirty?: boolean}>) => {
50+
changeUserInput: (state, action: PayloadAction<{input: string}>) => {
5151
state.input = action.payload.input;
52-
state.isDirty = action.payload.isDirty;
52+
},
53+
setIsDirty: (state, action: PayloadAction<boolean>) => {
54+
state.isDirty = action.payload;
5355
},
5456
setQueryResult: (state, action: PayloadAction<QueryResult | undefined>) => {
5557
state.result = action.payload;
@@ -164,6 +166,7 @@ export const {
164166
addStreamingChunks,
165167
setStreamQueryResponse,
166168
setStreamSession,
169+
setIsDirty,
167170
} = slice.actions;
168171

169172
export const {

0 commit comments

Comments
 (0)