From fefd044fa887249ba415789c49c51f0ee6a77852 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Tue, 3 Jun 2025 13:11:40 +0300
Subject: [PATCH 01/11] feat: ai placeholders

---
 package-lock.json                             |  9 ++---
 .../ComponentsProvider/componentsRegistry.ts  |  6 +++-
 src/components/ComponentsProvider/index.ts    |  3 ++
 src/containers/App/App.tsx                    |  6 ++++
 src/containers/Header/Header.tsx              |  9 +++++
 src/containers/Heatmap/Heatmap.tsx            |  4 ++-
 src/containers/UserSettings/i18n/en.json      |  3 ++
 src/lib.ts                                    |  1 +
 src/setupProxy.js                             |  2 ++
 src/store/configureStore.ts                   | 35 ++++++++++++++++---
 src/store/index.ts                            |  1 +
 11 files changed, 68 insertions(+), 11 deletions(-)
 create mode 100644 src/components/ComponentsProvider/index.ts

diff --git a/package-lock.json b/package-lock.json
index cf3c52cf6..e8d169f45 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21867,11 +21867,12 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.13.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.1.tgz",
-      "integrity": "sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg==",
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
+      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "side-channel": "^1.0.6"
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">=0.6"
diff --git a/src/components/ComponentsProvider/componentsRegistry.ts b/src/components/ComponentsProvider/componentsRegistry.ts
index 971c37b5c..533acb4a0 100644
--- a/src/components/ComponentsProvider/componentsRegistry.ts
+++ b/src/components/ComponentsProvider/componentsRegistry.ts
@@ -6,11 +6,15 @@ import {StaffCard} from '../User/StaffCard';
 import type {ComponentsRegistryTemplate} from './registry';
 import {Registry} from './registry';
 
+const AnyPlaceholder = () => null;
+
 const componentsRegistryInner = new Registry()
     .register('StaffCard', StaffCard)
     .register('AsideNavigation', AsideNavigation)
     .register('ErrorBoundary', ErrorBoundaryInner)
-    .register('ShardsTable', ShardsTable);
+    .register('ShardsTable', ShardsTable)
+    .register('AIAssistantButton', AnyPlaceholder)
+    .register('ChatPanel', AnyPlaceholder);
 
 export type ComponentsRegistry = ComponentsRegistryTemplate<typeof componentsRegistryInner>;
 
diff --git a/src/components/ComponentsProvider/index.ts b/src/components/ComponentsProvider/index.ts
new file mode 100644
index 000000000..e220c3fbd
--- /dev/null
+++ b/src/components/ComponentsProvider/index.ts
@@ -0,0 +1,3 @@
+export {ComponentsProvider} from './ComponentsProvider';
+export {componentsRegistry} from './componentsRegistry';
+export type {ComponentsRegistry} from './componentsRegistry';
diff --git a/src/containers/App/App.tsx b/src/containers/App/App.tsx
index 7c3e86731..c1f3494e5 100644
--- a/src/containers/App/App.tsx
+++ b/src/containers/App/App.tsx
@@ -5,6 +5,7 @@ import type {History} from 'history';
 import {Helmet} from 'react-helmet-async';
 import {connect} from 'react-redux';
 
+import {componentsRegistry} from '../../components/ComponentsProvider/componentsRegistry';
 import {ErrorBoundary} from '../../components/ErrorBoundary/ErrorBoundary';
 import type {RootState} from '../../store';
 import {Navigation} from '../AsideNavigation/Navigation';
@@ -32,6 +33,9 @@ function App({
     children,
     userSettings = getUserSettings({singleClusterMode}),
 }: AppProps) {
+    // Get ChatPanel from registry if it exists
+    const ChatPanel = componentsRegistry.get('ChatPanel');
+
     return (
         <Providers store={store} history={history}>
             <Helmet defaultTitle="YDB Monitoring" titleTemplate="%s — YDB Monitoring" />
@@ -43,6 +47,8 @@ function App({
                     </ErrorBoundary>
                 </Navigation>
             </ContentWrapper>
+            {/* Render ChatPanel only if it's registered */}
+            {ChatPanel && <ChatPanel />}
             <ReduxTooltip />
         </Providers>
     );
diff --git a/src/containers/Header/Header.tsx b/src/containers/Header/Header.tsx
index af0e3ef46..c26d12726 100644
--- a/src/containers/Header/Header.tsx
+++ b/src/containers/Header/Header.tsx
@@ -4,6 +4,7 @@ import {ArrowUpRightFromSquare, CirclePlus, PlugConnection} from '@gravity-ui/ic
 import {Breadcrumbs, Button, Divider, Flex, Icon} from '@gravity-ui/uikit';
 import {useLocation} from 'react-router-dom';
 
+import {componentsRegistry} from '../../components/ComponentsProvider/componentsRegistry';
 import {getConnectToDBDialog} from '../../components/ConnectToDB/ConnectToDBDialog';
 import {InternalLink} from '../../components/InternalLink';
 import {useAddClusterFeatureAvailable} from '../../store/reducers/capabilities/hooks';
@@ -38,6 +39,9 @@ function Header() {
     const isAddClusterAvailable =
         useAddClusterFeatureAvailable() && uiFactory.onAddCluster !== undefined;
 
+    // Get AIAssistantButton from registry if it exists
+    const AIAssistantButton = componentsRegistry.get('AIAssistantButton');
+
     const breadcrumbItems = React.useMemo(() => {
         let options = {...pageBreadcrumbsOptions, singleClusterMode};
 
@@ -76,6 +80,11 @@ function Header() {
             );
         }
 
+        // Add AI Assistant button if component is registered
+        if (AIAssistantButton) {
+            elements.push(<AIAssistantButton key="ai-assistant" />);
+        }
+
         if (!isClustersPage && isUserAllowedToMakeChanges) {
             elements.push(
                 <Button view="flat" href={createDeveloperUIInternalPageHref()} target="_blank">
diff --git a/src/containers/Heatmap/Heatmap.tsx b/src/containers/Heatmap/Heatmap.tsx
index 6b3639ce7..ab3d4b591 100644
--- a/src/containers/Heatmap/Heatmap.tsx
+++ b/src/containers/Heatmap/Heatmap.tsx
@@ -88,7 +88,9 @@ export const Heatmap = ({path, database}: HeatmapProps) => {
         const {min, max} = getCurrentMetricLimits(currentMetric, tablets);
 
         const preparedTablets = tablets.map((tablet) => {
-            const value = currentMetric && Number(tablet.metrics?.[currentMetric]);
+            const value =
+                currentMetric &&
+                Number(tablet.metrics?.[currentMetric as keyof typeof tablet.metrics]);
             const colorIndex = getColorIndex(value, min, max);
             const color = COLORS_RANGE[colorIndex];
 
diff --git a/src/containers/UserSettings/i18n/en.json b/src/containers/UserSettings/i18n/en.json
index 3ca13000e..f888b5130 100644
--- a/src/containers/UserSettings/i18n/en.json
+++ b/src/containers/UserSettings/i18n/en.json
@@ -17,6 +17,9 @@
   "settings.editor.codeAssistant.title": "Code Assistant",
   "settings.editor.codeAssistant.description": "Use Code Assistant for autocomplete.",
 
+  "settings.editor.aiAssistant.title": "AI Assistant",
+  "settings.editor.aiAssistant.description": "Show AI Assistant.",
+
   "settings.editor.queryStreaming.title": "Query Streaming",
   "settings.editor.queryStreaming.description": "Use streaming api for query results.",
 
diff --git a/src/lib.ts b/src/lib.ts
index 5e1013c8d..f3f951f8a 100644
--- a/src/lib.ts
+++ b/src/lib.ts
@@ -7,6 +7,7 @@ export {
 export {AsideNavigation} from './containers/AsideNavigation/AsideNavigation';
 
 export {configureStore, rootReducer} from './store';
+export type {ConfigureStoreOptions} from './store';
 export {default as appRoutes} from './routes';
 
 export {YdbEmbeddedAPI} from './services/api';
diff --git a/src/setupProxy.js b/src/setupProxy.js
index 58abe8b2d..8cad1619c 100644
--- a/src/setupProxy.js
+++ b/src/setupProxy.js
@@ -3,6 +3,8 @@ const {createProxyMiddleware} = require('http-proxy-middleware');
 
 module.exports = function (app) {
     const metaYdbBackend = process.env.META_YDB_BACKEND;
+
+    // Proxy for existing YDB meta backend
     if (metaYdbBackend && metaYdbBackend !== 'undefined') {
         app.use(
             '/meta',
diff --git a/src/store/configureStore.ts b/src/store/configureStore.ts
index 1be4ac711..6dc095cbe 100644
--- a/src/store/configureStore.ts
+++ b/src/store/configureStore.ts
@@ -1,4 +1,4 @@
-import {configureStore as configureReduxStore} from '@reduxjs/toolkit';
+import {combineReducers, configureStore as configureReduxStore} from '@reduxjs/toolkit';
 import type {Action, Dispatch, Middleware, Reducer, UnknownAction} from '@reduxjs/toolkit';
 import type {History} from 'history';
 import {createBrowserHistory} from 'history';
@@ -7,7 +7,7 @@ import {listenForHistoryChange} from 'redux-location-state';
 import {YdbEmbeddedAPI} from '../services/api';
 
 import {getUrlData} from './getUrlData';
-import rootReducer from './reducers';
+import combinedRootReducer, {rootReducer} from './reducers';
 import {api as storeApi} from './reducers/api';
 import {syncUserSettingsFromLS} from './reducers/settings/settings';
 import {UPDATE_REF} from './reducers/tooltip';
@@ -54,18 +54,43 @@ export const codeAssistBackend = window.code_assist_backend;
 
 const isSingleClusterMode = `${metaBackend}` === 'undefined';
 
+export interface ConfigureStoreOptions {
+    aRootReducer?: Reducer;
+    singleClusterMode?: boolean;
+    api?: YdbEmbeddedAPI;
+    additionalReducers?: Record<string, Reducer>;
+}
+
 export function configureStore({
-    aRootReducer = rootReducer,
+    aRootReducer,
     singleClusterMode = isSingleClusterMode,
     api = new YdbEmbeddedAPI({webVersion, withCredentials: !customBackend}),
-} = {}) {
+    additionalReducers = {},
+}: ConfigureStoreOptions = {}) {
     ({backend, basename, clusterName} = getUrlData({
         singleClusterMode,
         customBackend,
     }));
     const history = createBrowserHistory({basename});
 
-    const store = _configureStore(aRootReducer, history, {singleClusterMode}, [
+    // Create the final reducer
+    let finalReducer: Reducer;
+
+    if (aRootReducer) {
+        // If custom root reducer is provided, use it
+        finalReducer = aRootReducer;
+    } else if (Object.keys(additionalReducers).length > 0) {
+        // If additional reducers are provided, combine them with the default ones
+        finalReducer = combineReducers({
+            ...rootReducer,
+            ...additionalReducers,
+        });
+    } else {
+        // Otherwise use the default combined reducer
+        finalReducer = combinedRootReducer;
+    }
+
+    const store = _configureStore(finalReducer, history, {singleClusterMode}, [
         storeApi.middleware,
     ]);
     listenForHistoryChange(store, history);
diff --git a/src/store/index.ts b/src/store/index.ts
index dfd8a8919..4b3c1aef8 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -11,3 +11,4 @@ export {
 export {rootReducer} from './reducers';
 
 export type {AppDispatch, GetState, RootState} from './defaultStore';
+export type {ConfigureStoreOptions} from './configureStore';

From 329b2e4e13f65cef4e1513be5d09a831da2e02bb Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 25 Jun 2025 20:49:33 +0300
Subject: [PATCH 02/11] fix: remove unused

---
 src/components/ComponentsProvider/componentsRegistry.ts | 6 +++---
 src/components/ComponentsProvider/index.ts              | 3 ---
 src/containers/UserSettings/i18n/en.json                | 3 ---
 src/lib.ts                                              | 1 -
 src/setupProxy.js                                       | 1 -
 src/store/index.ts                                      | 1 -
 6 files changed, 3 insertions(+), 12 deletions(-)
 delete mode 100644 src/components/ComponentsProvider/index.ts

diff --git a/src/components/ComponentsProvider/componentsRegistry.ts b/src/components/ComponentsProvider/componentsRegistry.ts
index 533acb4a0..abaa28d5b 100644
--- a/src/components/ComponentsProvider/componentsRegistry.ts
+++ b/src/components/ComponentsProvider/componentsRegistry.ts
@@ -6,15 +6,15 @@ import {StaffCard} from '../User/StaffCard';
 import type {ComponentsRegistryTemplate} from './registry';
 import {Registry} from './registry';
 
-const AnyPlaceholder = () => null;
+const EmptyPlaceholder = () => null;
 
 const componentsRegistryInner = new Registry()
     .register('StaffCard', StaffCard)
     .register('AsideNavigation', AsideNavigation)
     .register('ErrorBoundary', ErrorBoundaryInner)
     .register('ShardsTable', ShardsTable)
-    .register('AIAssistantButton', AnyPlaceholder)
-    .register('ChatPanel', AnyPlaceholder);
+    .register('AIAssistantButton', EmptyPlaceholder)
+    .register('ChatPanel', EmptyPlaceholder);
 
 export type ComponentsRegistry = ComponentsRegistryTemplate<typeof componentsRegistryInner>;
 
diff --git a/src/components/ComponentsProvider/index.ts b/src/components/ComponentsProvider/index.ts
deleted file mode 100644
index e220c3fbd..000000000
--- a/src/components/ComponentsProvider/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export {ComponentsProvider} from './ComponentsProvider';
-export {componentsRegistry} from './componentsRegistry';
-export type {ComponentsRegistry} from './componentsRegistry';
diff --git a/src/containers/UserSettings/i18n/en.json b/src/containers/UserSettings/i18n/en.json
index f888b5130..3ca13000e 100644
--- a/src/containers/UserSettings/i18n/en.json
+++ b/src/containers/UserSettings/i18n/en.json
@@ -17,9 +17,6 @@
   "settings.editor.codeAssistant.title": "Code Assistant",
   "settings.editor.codeAssistant.description": "Use Code Assistant for autocomplete.",
 
-  "settings.editor.aiAssistant.title": "AI Assistant",
-  "settings.editor.aiAssistant.description": "Show AI Assistant.",
-
   "settings.editor.queryStreaming.title": "Query Streaming",
   "settings.editor.queryStreaming.description": "Use streaming api for query results.",
 
diff --git a/src/lib.ts b/src/lib.ts
index f3f951f8a..5e1013c8d 100644
--- a/src/lib.ts
+++ b/src/lib.ts
@@ -7,7 +7,6 @@ export {
 export {AsideNavigation} from './containers/AsideNavigation/AsideNavigation';
 
 export {configureStore, rootReducer} from './store';
-export type {ConfigureStoreOptions} from './store';
 export {default as appRoutes} from './routes';
 
 export {YdbEmbeddedAPI} from './services/api';
diff --git a/src/setupProxy.js b/src/setupProxy.js
index 8cad1619c..d739b3fed 100644
--- a/src/setupProxy.js
+++ b/src/setupProxy.js
@@ -4,7 +4,6 @@ const {createProxyMiddleware} = require('http-proxy-middleware');
 module.exports = function (app) {
     const metaYdbBackend = process.env.META_YDB_BACKEND;
 
-    // Proxy for existing YDB meta backend
     if (metaYdbBackend && metaYdbBackend !== 'undefined') {
         app.use(
             '/meta',
diff --git a/src/store/index.ts b/src/store/index.ts
index 4b3c1aef8..dfd8a8919 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -11,4 +11,3 @@ export {
 export {rootReducer} from './reducers';
 
 export type {AppDispatch, GetState, RootState} from './defaultStore';
-export type {ConfigureStoreOptions} from './configureStore';

From 07f13ac71a534535549b8ad30672522151ef9195 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 25 Jun 2025 21:06:51 +0300
Subject: [PATCH 03/11] fix: remove comments

---
 src/containers/App/App.tsx       | 2 --
 src/containers/Header/Header.tsx | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/containers/App/App.tsx b/src/containers/App/App.tsx
index c1f3494e5..f3d1a6d40 100644
--- a/src/containers/App/App.tsx
+++ b/src/containers/App/App.tsx
@@ -33,7 +33,6 @@ function App({
     children,
     userSettings = getUserSettings({singleClusterMode}),
 }: AppProps) {
-    // Get ChatPanel from registry if it exists
     const ChatPanel = componentsRegistry.get('ChatPanel');
 
     return (
@@ -47,7 +46,6 @@ function App({
                     </ErrorBoundary>
                 </Navigation>
             </ContentWrapper>
-            {/* Render ChatPanel only if it's registered */}
             {ChatPanel && <ChatPanel />}
             <ReduxTooltip />
         </Providers>
diff --git a/src/containers/Header/Header.tsx b/src/containers/Header/Header.tsx
index c26d12726..3fedfb3fb 100644
--- a/src/containers/Header/Header.tsx
+++ b/src/containers/Header/Header.tsx
@@ -39,7 +39,6 @@ function Header() {
     const isAddClusterAvailable =
         useAddClusterFeatureAvailable() && uiFactory.onAddCluster !== undefined;
 
-    // Get AIAssistantButton from registry if it exists
     const AIAssistantButton = componentsRegistry.get('AIAssistantButton');
 
     const breadcrumbItems = React.useMemo(() => {
@@ -80,7 +79,6 @@ function Header() {
             );
         }
 
-        // Add AI Assistant button if component is registered
         if (AIAssistantButton) {
             elements.push(<AIAssistantButton key="ai-assistant" />);
         }

From b53412e3299c70dd59a3c2782cb7e2e736f5b713 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 25 Jun 2025 21:07:30 +0300
Subject: [PATCH 04/11] fix: nanofix

---
 src/setupProxy.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/setupProxy.js b/src/setupProxy.js
index d739b3fed..58abe8b2d 100644
--- a/src/setupProxy.js
+++ b/src/setupProxy.js
@@ -3,7 +3,6 @@ const {createProxyMiddleware} = require('http-proxy-middleware');
 
 module.exports = function (app) {
     const metaYdbBackend = process.env.META_YDB_BACKEND;
-
     if (metaYdbBackend && metaYdbBackend !== 'undefined') {
         app.use(
             '/meta',

From 50e7e53719f13df092d0d485032bf1f224865b14 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 25 Jun 2025 21:25:56 +0300
Subject: [PATCH 05/11] fix: better code

---
 src/store/configureStore.ts | 61 ++++++++++++++++++++++++++++---------
 src/store/reducers/index.ts |  8 -----
 2 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/src/store/configureStore.ts b/src/store/configureStore.ts
index 6dc095cbe..4106fea1b 100644
--- a/src/store/configureStore.ts
+++ b/src/store/configureStore.ts
@@ -7,7 +7,7 @@ import {listenForHistoryChange} from 'redux-location-state';
 import {YdbEmbeddedAPI} from '../services/api';
 
 import {getUrlData} from './getUrlData';
-import combinedRootReducer, {rootReducer} from './reducers';
+import {rootReducer} from './reducers';
 import {api as storeApi} from './reducers/api';
 import {syncUserSettingsFromLS} from './reducers/settings/settings';
 import {UPDATE_REF} from './reducers/tooltip';
@@ -54,19 +54,53 @@ export const codeAssistBackend = window.code_assist_backend;
 
 const isSingleClusterMode = `${metaBackend}` === 'undefined';
 
-export interface ConfigureStoreOptions {
-    aRootReducer?: Reducer;
+interface BaseStoreOptions {
     singleClusterMode?: boolean;
     api?: YdbEmbeddedAPI;
-    additionalReducers?: Record<string, Reducer>;
 }
 
-export function configureStore({
-    aRootReducer,
-    singleClusterMode = isSingleClusterMode,
-    api = new YdbEmbeddedAPI({webVersion, withCredentials: !customBackend}),
-    additionalReducers = {},
-}: ConfigureStoreOptions = {}) {
+interface StoreOptionsWithCustomRootReducer extends BaseStoreOptions {
+    /**
+     * Custom root reducer that completely replaces the default rootReducer.
+     * ⚠️ Cannot be used together with additionalReducers
+     */
+    aRootReducer: Reducer;
+    /**
+     * @deprecated When using aRootReducer, additionalReducers cannot be used
+     */
+    additionalReducers?: undefined;
+}
+
+interface StoreOptionsWithAdditionalReducers extends BaseStoreOptions {
+    /**
+     * @deprecated When using additionalReducers, aRootReducer cannot be used
+     */
+    aRootReducer?: undefined;
+    /**
+     * Additional reducers to be merged with the default rootReducer.
+     * ⚠️ Cannot be used together with aRootReducer
+     */
+    additionalReducers: Record<string, Reducer>;
+}
+
+interface StoreOptionsDefault extends BaseStoreOptions {
+    aRootReducer?: undefined;
+    additionalReducers?: undefined;
+}
+
+export type ConfigureStoreOptions =
+    | StoreOptionsWithCustomRootReducer
+    | StoreOptionsWithAdditionalReducers
+    | StoreOptionsDefault;
+
+export function configureStore(options: ConfigureStoreOptions = {}) {
+    const {
+        aRootReducer,
+        singleClusterMode = isSingleClusterMode,
+        api = new YdbEmbeddedAPI({webVersion, withCredentials: !customBackend}),
+        additionalReducers = {},
+    } = options;
+
     ({backend, basename, clusterName} = getUrlData({
         singleClusterMode,
         customBackend,
@@ -79,15 +113,12 @@ export function configureStore({
     if (aRootReducer) {
         // If custom root reducer is provided, use it
         finalReducer = aRootReducer;
-    } else if (Object.keys(additionalReducers).length > 0) {
-        // If additional reducers are provided, combine them with the default ones
+    } else {
+        // Always create combined reducer from rootReducer and any additional reducers
         finalReducer = combineReducers({
             ...rootReducer,
             ...additionalReducers,
         });
-    } else {
-        // Otherwise use the default combined reducer
-        finalReducer = combinedRootReducer;
     }
 
     const store = _configureStore(finalReducer, history, {singleClusterMode}, [
diff --git a/src/store/reducers/index.ts b/src/store/reducers/index.ts
index 249f83a90..224617b94 100644
--- a/src/store/reducers/index.ts
+++ b/src/store/reducers/index.ts
@@ -1,5 +1,3 @@
-import {combineReducers} from '@reduxjs/toolkit';
-
 import {api} from './api';
 import authentication from './authentication/authentication';
 import cluster from './cluster/cluster';
@@ -39,9 +37,3 @@ export const rootReducer = {
     fullscreen,
     clusters,
 };
-
-const combinedReducer = combineReducers({
-    ...rootReducer,
-});
-
-export default combinedReducer;

From 54308750872f6ba6d693c64efb3498da3480b0bb Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 25 Jun 2025 21:30:27 +0300
Subject: [PATCH 06/11] Revert "fix: better code"

This reverts commit 50e7e53719f13df092d0d485032bf1f224865b14.
---
 src/store/configureStore.ts | 61 +++++++++----------------------------
 src/store/reducers/index.ts |  8 +++++
 2 files changed, 23 insertions(+), 46 deletions(-)

diff --git a/src/store/configureStore.ts b/src/store/configureStore.ts
index 4106fea1b..6dc095cbe 100644
--- a/src/store/configureStore.ts
+++ b/src/store/configureStore.ts
@@ -7,7 +7,7 @@ import {listenForHistoryChange} from 'redux-location-state';
 import {YdbEmbeddedAPI} from '../services/api';
 
 import {getUrlData} from './getUrlData';
-import {rootReducer} from './reducers';
+import combinedRootReducer, {rootReducer} from './reducers';
 import {api as storeApi} from './reducers/api';
 import {syncUserSettingsFromLS} from './reducers/settings/settings';
 import {UPDATE_REF} from './reducers/tooltip';
@@ -54,53 +54,19 @@ export const codeAssistBackend = window.code_assist_backend;
 
 const isSingleClusterMode = `${metaBackend}` === 'undefined';
 
-interface BaseStoreOptions {
+export interface ConfigureStoreOptions {
+    aRootReducer?: Reducer;
     singleClusterMode?: boolean;
     api?: YdbEmbeddedAPI;
+    additionalReducers?: Record<string, Reducer>;
 }
 
-interface StoreOptionsWithCustomRootReducer extends BaseStoreOptions {
-    /**
-     * Custom root reducer that completely replaces the default rootReducer.
-     * ⚠️ Cannot be used together with additionalReducers
-     */
-    aRootReducer: Reducer;
-    /**
-     * @deprecated When using aRootReducer, additionalReducers cannot be used
-     */
-    additionalReducers?: undefined;
-}
-
-interface StoreOptionsWithAdditionalReducers extends BaseStoreOptions {
-    /**
-     * @deprecated When using additionalReducers, aRootReducer cannot be used
-     */
-    aRootReducer?: undefined;
-    /**
-     * Additional reducers to be merged with the default rootReducer.
-     * ⚠️ Cannot be used together with aRootReducer
-     */
-    additionalReducers: Record<string, Reducer>;
-}
-
-interface StoreOptionsDefault extends BaseStoreOptions {
-    aRootReducer?: undefined;
-    additionalReducers?: undefined;
-}
-
-export type ConfigureStoreOptions =
-    | StoreOptionsWithCustomRootReducer
-    | StoreOptionsWithAdditionalReducers
-    | StoreOptionsDefault;
-
-export function configureStore(options: ConfigureStoreOptions = {}) {
-    const {
-        aRootReducer,
-        singleClusterMode = isSingleClusterMode,
-        api = new YdbEmbeddedAPI({webVersion, withCredentials: !customBackend}),
-        additionalReducers = {},
-    } = options;
-
+export function configureStore({
+    aRootReducer,
+    singleClusterMode = isSingleClusterMode,
+    api = new YdbEmbeddedAPI({webVersion, withCredentials: !customBackend}),
+    additionalReducers = {},
+}: ConfigureStoreOptions = {}) {
     ({backend, basename, clusterName} = getUrlData({
         singleClusterMode,
         customBackend,
@@ -113,12 +79,15 @@ export function configureStore(options: ConfigureStoreOptions = {}) {
     if (aRootReducer) {
         // If custom root reducer is provided, use it
         finalReducer = aRootReducer;
-    } else {
-        // Always create combined reducer from rootReducer and any additional reducers
+    } else if (Object.keys(additionalReducers).length > 0) {
+        // If additional reducers are provided, combine them with the default ones
         finalReducer = combineReducers({
             ...rootReducer,
             ...additionalReducers,
         });
+    } else {
+        // Otherwise use the default combined reducer
+        finalReducer = combinedRootReducer;
     }
 
     const store = _configureStore(finalReducer, history, {singleClusterMode}, [
diff --git a/src/store/reducers/index.ts b/src/store/reducers/index.ts
index 224617b94..249f83a90 100644
--- a/src/store/reducers/index.ts
+++ b/src/store/reducers/index.ts
@@ -1,3 +1,5 @@
+import {combineReducers} from '@reduxjs/toolkit';
+
 import {api} from './api';
 import authentication from './authentication/authentication';
 import cluster from './cluster/cluster';
@@ -37,3 +39,9 @@ export const rootReducer = {
     fullscreen,
     clusters,
 };
+
+const combinedReducer = combineReducers({
+    ...rootReducer,
+});
+
+export default combinedReducer;

From 659e4607f119f1e0569432aa9ca5794506538ac0 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Wed, 25 Jun 2025 21:49:20 +0300
Subject: [PATCH 07/11] fix: remove combinedReducer

---
 src/store/configureStore.ts | 63 ++++++++++++++++++++++++++-----------
 src/store/reducers/index.ts |  8 -----
 2 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/src/store/configureStore.ts b/src/store/configureStore.ts
index 6dc095cbe..86b26d400 100644
--- a/src/store/configureStore.ts
+++ b/src/store/configureStore.ts
@@ -7,7 +7,7 @@ import {listenForHistoryChange} from 'redux-location-state';
 import {YdbEmbeddedAPI} from '../services/api';
 
 import {getUrlData} from './getUrlData';
-import combinedRootReducer, {rootReducer} from './reducers';
+import {rootReducer} from './reducers';
 import {api as storeApi} from './reducers/api';
 import {syncUserSettingsFromLS} from './reducers/settings/settings';
 import {UPDATE_REF} from './reducers/tooltip';
@@ -54,40 +54,67 @@ export const codeAssistBackend = window.code_assist_backend;
 
 const isSingleClusterMode = `${metaBackend}` === 'undefined';
 
-export interface ConfigureStoreOptions {
-    aRootReducer?: Reducer;
+interface BaseStoreOptions {
     singleClusterMode?: boolean;
     api?: YdbEmbeddedAPI;
-    additionalReducers?: Record<string, Reducer>;
 }
 
-export function configureStore({
-    aRootReducer,
-    singleClusterMode = isSingleClusterMode,
-    api = new YdbEmbeddedAPI({webVersion, withCredentials: !customBackend}),
-    additionalReducers = {},
-}: ConfigureStoreOptions = {}) {
+interface StoreOptionsWithCustomRootReducer extends BaseStoreOptions {
+    /**
+     * Custom root reducer that completely replaces the default rootReducer.
+     * ⚠️ Cannot be used together with additionalReducers
+     */
+    aRootReducer: Reducer;
+    /**
+     * @deprecated When using aRootReducer, additionalReducers cannot be used
+     */
+    additionalReducers?: undefined;
+}
+
+interface StoreOptionsWithAdditionalReducers extends BaseStoreOptions {
+    /**
+     * @deprecated When using additionalReducers, aRootReducer cannot be used
+     */
+    aRootReducer?: undefined;
+    /**
+     * Additional reducers to be merged with the default rootReducer.
+     * ⚠️ Cannot be used together with aRootReducer
+     */
+    additionalReducers: Record<string, Reducer>;
+}
+
+interface StoreOptionsDefault extends BaseStoreOptions {
+    aRootReducer?: undefined;
+    additionalReducers?: undefined;
+}
+
+export type ConfigureStoreOptions =
+    | StoreOptionsWithCustomRootReducer
+    | StoreOptionsWithAdditionalReducers
+    | StoreOptionsDefault;
+
+export function configureStore(options: ConfigureStoreOptions = {}) {
+    const {
+        aRootReducer,
+        singleClusterMode = isSingleClusterMode,
+        api = new YdbEmbeddedAPI({webVersion, withCredentials: !customBackend}),
+        additionalReducers = {},
+    } = options;
+
     ({backend, basename, clusterName} = getUrlData({
         singleClusterMode,
         customBackend,
     }));
     const history = createBrowserHistory({basename});
-
-    // Create the final reducer
     let finalReducer: Reducer;
 
     if (aRootReducer) {
-        // If custom root reducer is provided, use it
         finalReducer = aRootReducer;
-    } else if (Object.keys(additionalReducers).length > 0) {
-        // If additional reducers are provided, combine them with the default ones
+    } else {
         finalReducer = combineReducers({
             ...rootReducer,
             ...additionalReducers,
         });
-    } else {
-        // Otherwise use the default combined reducer
-        finalReducer = combinedRootReducer;
     }
 
     const store = _configureStore(finalReducer, history, {singleClusterMode}, [
diff --git a/src/store/reducers/index.ts b/src/store/reducers/index.ts
index 249f83a90..224617b94 100644
--- a/src/store/reducers/index.ts
+++ b/src/store/reducers/index.ts
@@ -1,5 +1,3 @@
-import {combineReducers} from '@reduxjs/toolkit';
-
 import {api} from './api';
 import authentication from './authentication/authentication';
 import cluster from './cluster/cluster';
@@ -39,9 +37,3 @@ export const rootReducer = {
     fullscreen,
     clusters,
 };
-
-const combinedReducer = combineReducers({
-    ...rootReducer,
-});
-
-export default combinedReducer;

From 50cdeed33a37af68b6eabffc1cef662aa977e006 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Thu, 26 Jun 2025 01:44:43 +0300
Subject: [PATCH 08/11] fix: remove additional reducers

---
 src/store/configureStore.ts | 68 +++++--------------------------------
 src/store/reducers/index.ts |  8 +++++
 2 files changed, 16 insertions(+), 60 deletions(-)

diff --git a/src/store/configureStore.ts b/src/store/configureStore.ts
index 86b26d400..1be4ac711 100644
--- a/src/store/configureStore.ts
+++ b/src/store/configureStore.ts
@@ -1,4 +1,4 @@
-import {combineReducers, configureStore as configureReduxStore} from '@reduxjs/toolkit';
+import {configureStore as configureReduxStore} from '@reduxjs/toolkit';
 import type {Action, Dispatch, Middleware, Reducer, UnknownAction} from '@reduxjs/toolkit';
 import type {History} from 'history';
 import {createBrowserHistory} from 'history';
@@ -7,7 +7,7 @@ import {listenForHistoryChange} from 'redux-location-state';
 import {YdbEmbeddedAPI} from '../services/api';
 
 import {getUrlData} from './getUrlData';
-import {rootReducer} from './reducers';
+import rootReducer from './reducers';
 import {api as storeApi} from './reducers/api';
 import {syncUserSettingsFromLS} from './reducers/settings/settings';
 import {UPDATE_REF} from './reducers/tooltip';
@@ -54,70 +54,18 @@ export const codeAssistBackend = window.code_assist_backend;
 
 const isSingleClusterMode = `${metaBackend}` === 'undefined';
 
-interface BaseStoreOptions {
-    singleClusterMode?: boolean;
-    api?: YdbEmbeddedAPI;
-}
-
-interface StoreOptionsWithCustomRootReducer extends BaseStoreOptions {
-    /**
-     * Custom root reducer that completely replaces the default rootReducer.
-     * ⚠️ Cannot be used together with additionalReducers
-     */
-    aRootReducer: Reducer;
-    /**
-     * @deprecated When using aRootReducer, additionalReducers cannot be used
-     */
-    additionalReducers?: undefined;
-}
-
-interface StoreOptionsWithAdditionalReducers extends BaseStoreOptions {
-    /**
-     * @deprecated When using additionalReducers, aRootReducer cannot be used
-     */
-    aRootReducer?: undefined;
-    /**
-     * Additional reducers to be merged with the default rootReducer.
-     * ⚠️ Cannot be used together with aRootReducer
-     */
-    additionalReducers: Record<string, Reducer>;
-}
-
-interface StoreOptionsDefault extends BaseStoreOptions {
-    aRootReducer?: undefined;
-    additionalReducers?: undefined;
-}
-
-export type ConfigureStoreOptions =
-    | StoreOptionsWithCustomRootReducer
-    | StoreOptionsWithAdditionalReducers
-    | StoreOptionsDefault;
-
-export function configureStore(options: ConfigureStoreOptions = {}) {
-    const {
-        aRootReducer,
-        singleClusterMode = isSingleClusterMode,
-        api = new YdbEmbeddedAPI({webVersion, withCredentials: !customBackend}),
-        additionalReducers = {},
-    } = options;
-
+export function configureStore({
+    aRootReducer = rootReducer,
+    singleClusterMode = isSingleClusterMode,
+    api = new YdbEmbeddedAPI({webVersion, withCredentials: !customBackend}),
+} = {}) {
     ({backend, basename, clusterName} = getUrlData({
         singleClusterMode,
         customBackend,
     }));
     const history = createBrowserHistory({basename});
-    let finalReducer: Reducer;
-
-    if (aRootReducer) {
-        finalReducer = aRootReducer;
-    } else {
-        finalReducer = combineReducers({
-            ...rootReducer,
-            ...additionalReducers,
-        });
-    }
 
-    const store = _configureStore(finalReducer, history, {singleClusterMode}, [
+    const store = _configureStore(aRootReducer, history, {singleClusterMode}, [
         storeApi.middleware,
     ]);
     listenForHistoryChange(store, history);
diff --git a/src/store/reducers/index.ts b/src/store/reducers/index.ts
index 224617b94..249f83a90 100644
--- a/src/store/reducers/index.ts
+++ b/src/store/reducers/index.ts
@@ -1,3 +1,5 @@
+import {combineReducers} from '@reduxjs/toolkit';
+
 import {api} from './api';
 import authentication from './authentication/authentication';
 import cluster from './cluster/cluster';
@@ -37,3 +39,9 @@ export const rootReducer = {
     fullscreen,
     clusters,
 };
+
+const combinedReducer = combineReducers({
+    ...rootReducer,
+});
+
+export default combinedReducer;

From 33c0608fff5a5071fcfb9156de4cd7436c6f9f92 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Thu, 26 Jun 2025 01:45:48 +0300
Subject: [PATCH 09/11] fix: revert

---
 src/containers/Heatmap/Heatmap.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/containers/Heatmap/Heatmap.tsx b/src/containers/Heatmap/Heatmap.tsx
index ab3d4b591..6b3639ce7 100644
--- a/src/containers/Heatmap/Heatmap.tsx
+++ b/src/containers/Heatmap/Heatmap.tsx
@@ -88,9 +88,7 @@ export const Heatmap = ({path, database}: HeatmapProps) => {
         const {min, max} = getCurrentMetricLimits(currentMetric, tablets);
 
         const preparedTablets = tablets.map((tablet) => {
-            const value =
-                currentMetric &&
-                Number(tablet.metrics?.[currentMetric as keyof typeof tablet.metrics]);
+            const value = currentMetric && Number(tablet.metrics?.[currentMetric]);
             const colorIndex = getColorIndex(value, min, max);
             const color = COLORS_RANGE[colorIndex];
 

From 1110a8c6eec3dfddc98f90b931af3a04073d86ce Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Thu, 26 Jun 2025 09:52:41 +0300
Subject: [PATCH 10/11] fix: make hellen calm

---
 package-lock.json | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e8d169f45..30b8d7a6b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21867,12 +21867,11 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
-      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
-      "license": "BSD-3-Clause",
+      "version": "6.13.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.1.tgz",
+      "integrity": "sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg==",
       "dependencies": {
-        "side-channel": "^1.1.0"
+        "side-channel": "^1.0.6"
       },
       "engines": {
         "node": ">=0.6"
@@ -29844,4 +29843,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file

From 8ff4e52ef69d31e4d85e83d32e0c140817a6d684 Mon Sep 17 00:00:00 2001
From: Anton Standrik <astandrik@yandex-team.ru>
Date: Thu, 26 Jun 2025 09:53:23 +0300
Subject: [PATCH 11/11] fix: newline

---
 package-lock.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index 30b8d7a6b..cf3c52cf6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29843,4 +29843,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}