simplify test store solution

Author: KrumTy

jest.config.cjs

@@ -11,6 +11,7 @@ module.exports = {
     '\\.svg': '<rootDir>/redisinsight/__mocks__/svg.js',
     '\\.(css|less|sass|scss)$': 'identity-obj-proxy',
     '\\.scss\\?inline$': '<rootDir>/redisinsight/__mocks__/scssRaw.js',
+    'uiSrc/slices/store$': '<rootDir>/redisinsight/ui/src/utils/test-store.ts',
     'uiSrc/(.*)': '<rootDir>/redisinsight/ui/src/$1',
     '@redislabsdev/redis-ui-components': '@redis-ui/components',
     '@redislabsdev/redis-ui-styles': '@redis-ui/styles',

redisinsight/ui/src/services/apiService.ts

@@ -7,7 +7,7 @@ import { isNumber } from 'lodash'
 import { sessionStorageService } from 'uiSrc/services'
 import { BrowserStorageItem } from 'uiSrc/constants'
 import { CLOUD_AUTH_API_ENDPOINTS, CustomHeaders } from 'uiSrc/constants/api'
-import { store } from 'uiSrc/slices/store-dynamic'
+import { store } from 'uiSrc/slices/store'
 import { logoutUserAction } from 'uiSrc/slices/oauth/cloud'
 import { setConnectivityError } from 'uiSrc/slices/app/connectivity'
 import { getConfig } from 'uiSrc/config'

redisinsight/ui/src/slices/store-dynamic.ts

@@ -56,7 +56,6 @@ import rdiStatisticsReducer from './rdi/statistics'
 import aiAssistantReducer from './panels/aiAssistant'
 import appDbSettingsReducer from './app/db-settings'
 import tagsReducer from './instances/tags'
-import { setStoreRef } from './store-dynamic'
 
 const riConfig = getConfig()
 
@@ -149,7 +148,6 @@ const store = configureStore({
     getDefaultMiddleware({ serializableCheck: false }),
   devTools: riConfig.app.env !== 'production',
 })
-setStoreRef(store)
 
 export { store }
 

redisinsight/ui/src/slices/store.ts

@@ -31,7 +31,6 @@ import {
   setBrowserSelectedKey,
 } from 'uiSrc/slices/app/context'
 import { MOCK_TIMESTAMP } from 'uiSrc/mocks/data/dateNow'
-import { rootReducer } from 'uiSrc/slices/store'
 import {
   setEditorType,
   setIsWithinThreshold,
@@ -46,6 +45,7 @@ import { CreateRejsonRlWithExpireDto } from 'apiSrc/modules/browser/rejson-rl/dt
 import { CreateSetWithExpireDto } from 'apiSrc/modules/browser/set/dto'
 import { CreateZSetWithExpireDto } from 'apiSrc/modules/browser/z-set/dto'
 import { SetStringWithExpireDto } from 'apiSrc/modules/browser/string/dto'
+import { rootReducer } from '../../store'
 import { getString, getStringSuccess } from '../../browser/string'
 import reducer, {
   addHashKey,

redisinsight/ui/src/slices/tests/browser/keys.spec.ts

@@ -1,5 +1,5 @@
 import { get } from 'lodash'
-import { store } from 'uiSrc/slices/store-dynamic'
+import { store } from 'uiSrc/slices/store'
 
 // Check is user give access to collect his events
 export const checkIsAnalyticsGranted = (): boolean =>

redisinsight/ui/src/telemetry/checkAnalytics.ts

@@ -14,7 +14,7 @@ import {
   RedisModulesKeyType,
 } from 'uiSrc/telemetry/interfaces'
 import { apiService } from 'uiSrc/services'
-import { store } from 'uiSrc/slices/store-dynamic'
+import { store } from 'uiSrc/slices/store'
 import { getInstanceInfo } from 'uiSrc/services/database/instancesService'
 import { AdditionalRedisModule } from 'apiSrc/modules/database/models/additional.redis.module'
 import { IRedisModulesSummary, MatchType, RedisModules } from './interfaces'

redisinsight/ui/src/telemetry/telemetryUtils.ts

@@ -1,5 +1,5 @@
 import { OAuthSocialSource, RedisDefaultModules } from 'uiSrc/slices/interfaces'
-import { store } from 'uiSrc/slices/store-dynamic'
+import { store } from 'uiSrc/slices/store'
 import { Nullable } from 'uiSrc/utils'
 import { findMarkdownPath } from 'uiSrc/utils/workbench'
 

redisinsight/ui/src/utils/capability.ts

@@ -6,7 +6,7 @@ import { serialize, unserialize } from 'php-serialize'
 import { getData } from 'rawproto'
 import { Parser } from 'pickleparser'
 import JSONBigInt from 'json-bigint'
-import { store } from 'uiSrc/slices/store-dynamic'
+import { store } from 'uiSrc/slices/store'
 
 import JSONViewer from 'uiSrc/components/json-viewer/JSONViewer'
 import {

redisinsight/ui/src/utils/formatters/valueFormatters.tsx

@@ -0,0 +1,41 @@
+import { createBrowserHistory } from 'history'
+
+import type { RootState, AppDispatch, ReduxStore } from 'uiSrc/slices/store'
+
+// Re-export all types and exports from the real store to avoid circular dependencies during tests
+
+export type { RootState, AppDispatch, ReduxStore } from 'uiSrc/slices/store'
+export const history = createBrowserHistory()
+
+// Lazy reference to avoid circular dependencies
+// The store will be set by the store module itself after it's created
+let storeRef: ReduxStore | null = null
+
+// This function will be called by the store modules to set the reference
+export const setStoreRef = (store: ReduxStore) => {
+  storeRef = store
+}
+
+const getState = (): RootState => {
+  if (!storeRef) {
+    throw new Error(
+      'Store not initialized. Make sure store-dynamic is imported after store creation.',
+    )
+  }
+  return storeRef.getState()
+}
+
+const dispatch: AppDispatch = (action: any) => {
+  if (!storeRef) {
+    throw new Error(
+      'Store not initialized. Make sure store-dynamic is imported after store creation.',
+    )
+  }
+  return storeRef.dispatch(action)
+}
+
+// Export store object that matches the real store interface
+export const store = {
+  getState,
+  dispatch,
+}