fix: review fixes

Author: astandrik

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

@@ -101,6 +101,22 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
             },
         );
 
+    const resourcePoolOptions = React.useMemo(
+        () => [
+            {
+                value: RESOURCE_POOL_NO_OVERRIDE_VALUE,
+                content: i18n('form.resource-pool.no-override'),
+                text: i18n('form.resource-pool.no-override'),
+            },
+            ...resourcePools.map((name) => ({
+                value: name,
+                content: name,
+                text: name,
+            })),
+        ],
+        [resourcePools],
+    );
+
     const timeout = watch('timeout');
     const queryMode = watch('queryMode');
 
@@ -127,6 +143,13 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                                         } else if (mode === 'query') {
                                             setValue('timeout', null);
                                         }
+
+                                        if (mode === QUERY_MODES.pg) {
+                                            setValue(
+                                                'resourcePool',
+                                                RESOURCE_POOL_NO_OVERRIDE_VALUE,
+                                            );
+                                        }
                                     }}
                                     settingOptions={QUERY_SETTINGS_FIELD_SETTINGS.queryMode.options}
                                 />
@@ -152,18 +175,7 @@ function QuerySettingsForm({initialValues, onSubmit, onClose}: QuerySettingsForm
                                         queryMode === QUERY_MODES.pg
                                     }
                                     onUpdateSetting={(value) => field.onChange(value)}
-                                    settingOptions={[
-                                        {
-                                            value: RESOURCE_POOL_NO_OVERRIDE_VALUE,
-                                            content: i18n('form.resource-pool.no-override'),
-                                            text: i18n('form.resource-pool.no-override'),
-                                        },
-                                        ...resourcePools.map((name) => ({
-                                            value: name,
-                                            content: name,
-                                            text: name,
-                                        })),
-                                    ]}
+                                    settingOptions={resourcePoolOptions}
                                 />
                             )}
                         />

src/store/reducers/query/__test__/prepareQueryWithPragmas.test.ts

@@ -1,4 +1,4 @@
-import {applyResourcePoolPragma, prepareQueryWithPragmas} from '../utils';
+import {prepareQueryWithPragmas} from '../utils';
 
 describe('prepareQueryWithPragmas', () => {
     test('Should prepend pragmas correctly', () => {
@@ -27,32 +27,4 @@ describe('prepareQueryWithPragmas', () => {
 
         expect(expectedResult).toBe('PRAGMA OrderedColumns;\n\nSELECT * FROM table;');
     });
-
-    test('applyResourcePoolPragma should prepend pragma for yql syntax', () => {
-        const query = 'SELECT * FROM table;';
-        const result = applyResourcePoolPragma(query, 'olap', 'yql_v1');
-
-        expect(result).toBe('PRAGMA ResourcePool = "olap";\n\nSELECT * FROM table;');
-    });
-
-    test('applyResourcePoolPragma should not change query when no resource pool is set', () => {
-        const query = 'SELECT * FROM table;';
-        const result = applyResourcePoolPragma(query, undefined, 'yql_v1');
-
-        expect(result).toBe(query);
-    });
-
-    test('applyResourcePoolPragma should not change query for pg syntax', () => {
-        const query = 'SELECT * FROM table;';
-        const result = applyResourcePoolPragma(query, 'olap', 'pg');
-
-        expect(result).toBe(query);
-    });
-
-    test('applyResourcePoolPragma should not duplicate existing ResourcePool pragma', () => {
-        const query = 'PRAGMA ResourcePool = "analytics";\n\nSELECT * FROM table;';
-        const result = applyResourcePoolPragma(query, 'olap', 'yql_v1');
-
-        expect(result).toBe(query);
-    });
 });

src/store/reducers/query/utils.ts

@@ -78,23 +78,3 @@ export const prepareQueryWithPragmas = (query: string, pragmas?: string): string
 
     return `${trimmedPragmas}${separator}${query}`;
 };
-
-const RESOURCE_POOL_PRAGMA_REGEXP = /PRAGMA\s+ResourcePool\b/i;
-
-export const applyResourcePoolPragma = (
-    query: string,
-    resourcePool: string | undefined,
-    syntax: QuerySyntax,
-): string => {
-    if (!resourcePool || syntax !== 'yql_v1') {
-        return query;
-    }
-
-    if (RESOURCE_POOL_PRAGMA_REGEXP.test(query)) {
-        return query;
-    }
-
-    const pragmaLine = `PRAGMA ResourcePool = "${resourcePool}";`;
-
-    return `${pragmaLine}\n\n${query}`;
-};