fix: remove combinedReducer

Author: astandrik

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}, [

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;