feat: add rows limit to query settings

package.json

@@ -24,6 +24,7 @@
     "@gravity-ui/table": "^0.5.0",
     "@gravity-ui/uikit": "^6.20.1",
     "@gravity-ui/websql-autocomplete": "^9.1.0",
+    "@hookform/resolvers": "^3.9.0",
     "@reduxjs/toolkit": "^2.2.3",
     "@tanstack/react-table": "^8.19.3",
     "axios": "^1.7.3",

src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettings.test.ts

@@ -10,6 +10,7 @@ const DEFAULT_QUERY_SETTINGS: QuerySettings = {
     queryMode: QUERY_MODES.query,
     transactionMode: TRANSACTION_MODES.implicit,
     timeout: '60',
+    limitRows: '10000',
     statisticsMode: STATISTICS_MODES.none,
     tracingLevel: TRACING_LEVELS.detailed,
 };
@@ -28,9 +29,10 @@ describe('getChangedQueryExecutionSettings', () => {
             ...DEFAULT_QUERY_SETTINGS,
             queryMode: QUERY_MODES.data,
             timeout: '30',
+            limitRows: '100',
         };
         const result = getChangedQueryExecutionSettings(currentSettings, DEFAULT_QUERY_SETTINGS);
-        expect(result).toEqual(['queryMode', 'timeout']);
+        expect(result).toEqual(['queryMode', 'timeout', 'limitRows']);
     });
 
     it('should return all keys if all settings have changed', () => {

src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettingsDescription.test.ts

@@ -17,6 +17,7 @@ const DEFAULT_QUERY_SETTINGS: QuerySettings = {
     queryMode: QUERY_MODES.query,
     transactionMode: TRANSACTION_MODES.implicit,
     timeout: '60',
+    limitRows: '10000',
     statisticsMode: STATISTICS_MODES.none,
     tracingLevel: TRACING_LEVELS.detailed,
 };
@@ -38,6 +39,7 @@ describe('getChangedQueryExecutionSettingsDescription', () => {
             ...DEFAULT_QUERY_SETTINGS,
             queryMode: QUERY_MODES.pg,
             timeout: '63',
+            limitRows: '100',
         };
 
         const result = getChangedQueryExecutionSettingsDescription({
@@ -51,6 +53,7 @@ describe('getChangedQueryExecutionSettingsDescription', () => {
                     (option) => option.value === QUERY_MODES.pg,
                 )?.content,
             [QUERY_SETTINGS_FIELD_SETTINGS.timeout.title]: '63',
+            [QUERY_SETTINGS_FIELD_SETTINGS.limitRows.title]: '100',
         });
     });
 

src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettingsDescription.ts

@@ -15,14 +15,17 @@ export default function getChangedQueryExecutionSettingsDescription({
 
     keys.forEach((key) => {
         const settings = QUERY_SETTINGS_FIELD_SETTINGS[key];
-        const currentValue = currentSettings[key] as string;
+        const currentValue = currentSettings[key];
 
         if ('options' in settings) {
-            const content = settings.options.find((option) => option.value === currentValue)
-                ?.content as string;
+            const content = settings.options.find(
+                (option) => option.value === currentValue,
+            )?.content;
 
-            result[settings.title] = content;
-        } else {
+            if (content) {
+                result[settings.title] = content;
+            }
+        } else if (currentValue) {
             result[settings.title] = currentValue;
         }
     });

src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.scss

@@ -28,6 +28,7 @@
         flex: 6;
     }
 
+    &__limit-rows,
     &__timeout {
         width: 33.3%;
         margin-right: var(--g-spacing-2);

src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.tsx

@@ -1,14 +1,22 @@
 import React from 'react';
 
 import {Dialog, Link as ExternalLink, Flex, TextInput} from '@gravity-ui/uikit';
+import {zodResolver} from '@hookform/resolvers/zod';
 import {Controller, useForm} from 'react-hook-form';
+import {z} from 'zod';
 
 import {useTracingLevelOptionAvailable} from '../../../../store/reducers/capabilities/hooks';
 import {
     selectQueryAction,
     setQueryAction,
 } from '../../../../store/reducers/queryActions/queryActions';
-import type {QuerySettings} from '../../../../types/store/query';
+import type {
+    QueryMode,
+    QuerySettings,
+    StatisticsMode,
+    TracingLevel,
+    TransactionMode,
+} from '../../../../types/store/query';
 import {cn} from '../../../../utils/cn';
 import {
     useQueryExecutionSettings,
@@ -24,6 +32,15 @@ import './QuerySettingsDialog.scss';
 
 const b = cn('ydb-query-settings-dialog');
 
+const validationSchema = z.object({
+    timeout: z.coerce.number().positive().optional().or(z.string().length(0)),
+    limitRows: z.coerce.number().gt(0).lte(10_000).optional().or(z.string().length(0)),
+    queryMode: z.custom<QueryMode>(),
+    transactionMode: z.custom<TransactionMode>(),
+    statisticsMode: z.custom<StatisticsMode>().optional(),
+    tracingLevel: z.custom<TracingLevel>().optional(),
+});
+
 export function QuerySettingsDialog() {
     const dispatch = useTypedDispatch();
     const queryAction = useTypedSelector(selectQueryAction);
@@ -66,8 +83,13 @@ interface QuerySettingsFormProps {
 }
 
 function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsFormProps) {
-    const {control, handleSubmit} = useForm<QuerySettings>({
+    const {
+        control,
+        handleSubmit,
+        formState: {errors},
+    } = useForm<QuerySettings>({
         defaultValues: initialValues,
+        resolver: zodResolver(validationSchema),
     });
 
     const enableTracingLevel = useTracingLevelOptionAvailable();
@@ -85,6 +107,7 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                             control={control}
                             render={({field}) => (
                                 <QuerySettingsSelect
+                                    id="queryMode"
                                     setting={field.value}
                                     onUpdateSetting={field.onChange}
                                     settingOptions={QUERY_SETTINGS_FIELD_SETTINGS.queryMode.options}
@@ -104,10 +127,14 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                             render={({field}) => (
                                 <React.Fragment>
                                     <TextInput
+                                        id="timeout"
                                         type="number"
                                         {...field}
                                         className={b('timeout')}
                                         placeholder="60"
+                                        validationState={errors.timeout ? 'invalid' : undefined}
+                                        errorMessage={errors.timeout?.message}
+                                        errorPlacement="inside"
                                     />
                                     <span className={b('timeout-suffix')}>
                                         {i18n('form.timeout.seconds')}
@@ -128,6 +155,7 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                                 control={control}
                                 render={({field}) => (
                                     <QuerySettingsSelect
+                                        id="tracingLevel"
                                         setting={field.value}
                                         onUpdateSetting={field.onChange}
                                         settingOptions={
@@ -149,6 +177,7 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                             control={control}
                             render={({field}) => (
                                 <QuerySettingsSelect
+                                    id="transactionMode"
                                     setting={field.value}
                                     onUpdateSetting={field.onChange}
                                     settingOptions={
@@ -169,6 +198,7 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                             control={control}
                             render={({field}) => (
                                 <QuerySettingsSelect
+                                    id="statisticsMode"
                                     setting={field.value}
                                     onUpdateSetting={field.onChange}
                                     settingOptions={
@@ -179,6 +209,29 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                         />
                     </div>
                 </Flex>
+                <Flex direction="row" alignItems="flex-start" className={b('dialog-row')}>
+                    <label htmlFor="limitRows" className={b('field-title')}>
+                        {QUERY_SETTINGS_FIELD_SETTINGS.limitRows.title}
+                    </label>
+                    <div className={b('control-wrapper')}>
+                        <Controller
+                            name="limitRows"
+                            control={control}
+                            render={({field}) => (
+                                <TextInput
+                                    id="limitRows"
+                                    type="number"
+                                    {...field}
+                                    className={b('limit-rows')}
+                                    placeholder="10000"
+                                    validationState={errors.limitRows ? 'invalid' : undefined}
+                                    errorMessage={errors.limitRows?.message}
+                                    errorPlacement="inside"
+                                />
+                            )}
+                        />
+                    </div>
+                </Flex>
             </Dialog.Body>
             <Dialog.Footer
                 textButtonApply={i18n('button-done')}

src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsSelect.tsx

@@ -23,6 +23,7 @@ type SelectType = QueryMode | TransactionMode | StatisticsMode | TracingLevel;
 type QuerySettingSelectOption<T> = SelectOption<T> & {isDefault?: boolean};
 
 interface QuerySettingsSelectProps<T extends SelectType> {
+    id?: string;
     setting: T;
     settingOptions: QuerySettingSelectOption<T>[];
     onUpdateSetting: (mode: T) => void;
@@ -32,6 +33,7 @@ export function QuerySettingsSelect<T extends SelectType>(props: QuerySettingsSe
     return (
         <div className={b('selector')}>
             <Select<T>
+                id={props.id}
                 options={props.settingOptions}
                 value={[props.setting]}
                 onUpdate={(value) => {

src/containers/Tenant/Query/QuerySettingsDialog/constants.ts

@@ -148,4 +148,7 @@ export const QUERY_SETTINGS_FIELD_SETTINGS = {
     timeout: {
         title: formI18n('form.timeout'),
     },
+    limitRows: {
+        title: formI18n('form.limit-rows'),
+    },
 } as const;

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

@@ -5,6 +5,7 @@
   "form.transaction-mode": "Transaction mode",
   "form.statistics-mode": "Statistics collection mode",
   "form.tracing-level": "Tracing level",
+  "form.limit-rows": "Limit rows",
   "button-done": "Save",
   "button-cancel": "Cancel",
   "form.timeout.seconds": "sec",

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

@@ -5,6 +5,7 @@
   "form.transaction-mode": "Уровень изоляции",
   "form.statistics-mode": "Режим сбора статистики",
   "form.tracing-level": "Tracing level",
+  "form.limit-rows": "Лимит строк",
   "button-done": "Готово",
   "button-cancel": "Отменить",
   "form.timeout.seconds": "сек",

src/services/api.ts

@@ -543,6 +543,7 @@ export class YdbEmbeddedAPI extends AxiosWrapper {
             transaction_mode?: TransactionMode;
             timeout?: Timeout;
             query_id?: string;
+            limit_rows?: string;
         },
         {concurrentId, signal, withRetries}: AxiosOptions = {},
     ) {

src/store/reducers/executeQuery.ts

@@ -233,6 +233,7 @@ export const executeQueryApi = api.injectEndpoints({
                                 querySettings.tracingLevel && enableTracingLevel
                                     ? TracingLevelNumber[querySettings.tracingLevel]
                                     : undefined,
+                            limit_rows: querySettings.limitRows || undefined,
                             transaction_mode:
                                 querySettings.transactionMode === 'implicit'
                                     ? undefined

src/types/store/query.ts

@@ -41,6 +41,7 @@ export interface QuerySettings {
     queryMode: QueryMode;
     transactionMode: TransactionMode;
     timeout?: string;
+    limitRows?: string;
     statisticsMode?: StatisticsMode;
     tracingLevel?: TracingLevel;
 }

src/utils/constants.ts

@@ -127,6 +127,7 @@ export const DEFAULT_QUERY_SETTINGS = {
     queryMode: QUERY_MODES.query,
     transactionMode: TRANSACTION_MODES.implicit,
     timeout: '60',
+    limitRows: '10000',
     statisticsMode: STATISTICS_MODES.none,
     tracingLevel: TRACING_LEVELS.detailed,
 } satisfies QuerySettings;

src/utils/hooks/useLastQueryExecutionSettings.ts

@@ -14,6 +14,7 @@ export const useLastQueryExecutionSettings = () => {
               queryMode: lastStorageSettings.queryMode,
               statisticsMode: lastStorageSettings.statisticsMode,
               tracingLevel: lastStorageSettings.tracingLevel,
+              limitRows: lastStorageSettings.limitRows,
               timeout: lastStorageSettings.timeout,
           }
         : undefined;

src/utils/hooks/useQueryExecutionSettings.ts

@@ -13,6 +13,7 @@ export const useQueryExecutionSettings = () => {
         timeout: storageSettings.timeout ?? DEFAULT_QUERY_SETTINGS.timeout,
         statisticsMode: storageSettings.statisticsMode ?? DEFAULT_QUERY_SETTINGS.statisticsMode,
         transactionMode: storageSettings.transactionMode ?? DEFAULT_QUERY_SETTINGS.transactionMode,
+        limitRows: storageSettings.limitRows ?? DEFAULT_QUERY_SETTINGS.limitRows,
         tracingLevel: enableTracingLevel
             ? storageSettings.tracingLevel
             : DEFAULT_QUERY_SETTINGS.tracingLevel,