fix: review

Author: astandrik

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

@@ -20,6 +20,7 @@ import {
     useTypedDispatch,
     useTypedSelector,
 } from '../../../../utils/hooks';
+import type {ResourcePoolValue} from '../../../../utils/query';
 import {
     QUERY_MODES,
     RESOURCE_POOL_NO_OVERRIDE_VALUE,
@@ -166,7 +167,7 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                             name="resourcePool"
                             control={control}
                             render={({field}) => (
-                                <QuerySettingsSelect<string>
+                                <QuerySettingsSelect<ResourcePoolValue>
                                     id="resourcePool"
                                     setting={field.value ?? RESOURCE_POOL_NO_OVERRIDE_VALUE}
                                     disabled={

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

@@ -8,6 +8,7 @@ import type {
     TransactionMode,
 } from '../../../../types/store/query';
 import {cn} from '../../../../utils/cn';
+import type {ResourcePoolValue} from '../../../../utils/query';
 
 import i18n from './i18n';
 
@@ -19,7 +20,7 @@ export const getOptionHeight = () => -1;
 
 const b = cn('ydb-query-settings-select');
 
-type SelectType = QueryMode | TransactionMode | StatisticsMode | TracingLevel | string;
+type SelectType = QueryMode | TransactionMode | StatisticsMode | TracingLevel | ResourcePoolValue;
 type QuerySettingSelectOption<T> = SelectOption<T> & {isDefault?: boolean};
 
 interface QuerySettingsSelectProps<T extends SelectType> {

src/utils/query.ts

@@ -306,6 +306,8 @@ export const defaultPragma = 'PRAGMA OrderedColumns;';
 // Special marker meaning "do not override resource pool in request params"
 export const RESOURCE_POOL_NO_OVERRIDE_VALUE = '__no_pool_override__';
 
+export type ResourcePoolValue = typeof RESOURCE_POOL_NO_OVERRIDE_VALUE | string;
+
 export const DEFAULT_QUERY_SETTINGS = {
     queryMode: QUERY_MODES.query,
     transactionMode: TRANSACTION_MODES.implicit,

tests/suites/tenant/queryEditor/models/SettingsDialog.ts

@@ -89,11 +89,11 @@ export class SettingsDialog {
         return options;
     }
 
-    async changeResourcePool(value: string) {
+    async changeResourcePool(label: string) {
         await this.resourcePoolSelect.waitFor({state: 'visible', timeout: VISIBILITY_TIMEOUT});
         await this.resourcePoolSelect.click();
         await this.selectPopup.waitFor({state: 'visible', timeout: VISIBILITY_TIMEOUT});
-        await this.page.locator(`.ydb-query-settings-select__item_type_${value}`).click();
+        await this.selectPopup.getByText(label, {exact: true}).click();
         await this.page.waitForTimeout(1000);
     }