RI-6336 updated unit tests

Author: KIvanow

redisinsight/api/src/modules/browser/set/set.service.ts

@@ -36,7 +36,7 @@ const REDIS_SCAN_CONFIG = config.get('redis_scan');
 export class SetService {
   private logger = new Logger('SetService');
 
-  constructor(private databaseClientFactory: DatabaseClientFactory) {}
+  constructor(private databaseClientFactory: DatabaseClientFactory) { }
 
   public async createSet(
     clientMetadata: ClientMetadata,

redisinsight/ui/src/constants/browser.ts

@@ -29,3 +29,5 @@ export enum BrowserColumns {
   Size = 'size',
   TTL = 'ttl',
 }
+
+export const DEFAULT_SHOWN_COLUMNS = [BrowserColumns.Size, BrowserColumns.TTL]

redisinsight/ui/src/pages/browser/components/virtual-tree/components/Node/Node.spec.tsx

@@ -213,58 +213,19 @@ describe('Node', () => {
       expect(screen.queryByTestId(`size-${mockDataFullName}`)).not.toBeInTheDocument()
     })
 
-    it('should refetch metadata when TTL column is re-enabled even with existing metadata', () => {
-      const mockGetMetadata = jest.fn()
-      const mockData: TreeData = {
-        ...mockedDataWithMetadata,
-        getMetadata: mockGetMetadata,
-      }
-
-      const store = {
-        getState: () => ({
-          browser: {
-            keys: {
-              shownColumns: []
-            }
-          }
-        }),
-        subscribe: jest.fn(),
-        dispatch: jest.fn(),
-      }
-
-      const { rerender } = render(
-        <Node {...instance(mockedProps)} data={mockData} />,
-        { store }
-      )
-
-      store.getState = () => ({
-        browser: {
-          keys: {
-            shownColumns: [BrowserColumns.TTL]
-          }
-        } as any
-      })
-
-      rerender(<Node {...instance(mockedProps)} data={mockData} />)
-
-      expect(mockGetMetadata).toHaveBeenCalledWith(mockData.nameBuffer, mockData.path)
-    })
-
-    it('should refetch metadata when Size column is re-enabled even with existing metadata', () => {
+    it.each`
+      description               | initialState                                                | updatedState
+      ${'TTL column'}           | ${{ app: { context: { dbConfig: { shownColumns: [] } } } }} | ${{ app: { context: { dbConfig: { shownColumns: [BrowserColumns.TTL] } } } }}
+      ${'Size column'}          | ${{ app: { context: { dbConfig: { shownColumns: [] } } } }} | ${{ app: { context: { dbConfig: { shownColumns: [BrowserColumns.Size] } } } }}
+    `('should refetch metadata when $description is re-enabled even with existing metadata', ({ initialState, updatedState }) => {
       const mockGetMetadata = jest.fn()
       const mockData: TreeData = {
         ...mockedDataWithMetadata,
         getMetadata: mockGetMetadata,
       }
 
       const store = {
-        getState: () => ({
-          browser: {
-            keys: {
-              shownColumns: []
-            }
-          }
-        }),
+        getState: () => initialState,
         subscribe: jest.fn(),
         dispatch: jest.fn(),
       }
@@ -274,13 +235,7 @@ describe('Node', () => {
         { store }
       )
 
-      store.getState = () => ({
-        browser: {
-          keys: {
-            shownColumns: [BrowserColumns.Size]
-          }
-        } as any
-      })
+      store.getState = () => updatedState
 
       rerender(<Node {...instance(mockedProps)} data={mockData} />)
 
@@ -302,9 +257,11 @@ describe('Node', () => {
 
       const store = {
         getState: () => ({
-          browser: {
-            keys: {
-              shownColumns: columns
+          app: {
+            context: {
+              dbConfig: {
+                shownColumns: columns
+              }
             }
           }
         }),

redisinsight/ui/src/slices/app/context.ts

@@ -12,6 +12,7 @@ import {
   KeyTypes, Pages,
   SortOrder,
   BrowserColumns,
+  DEFAULT_SHOWN_COLUMNS,
 } from 'uiSrc/constants'
 import { localStorageService, setCapabilityStorageField, setDBConfigStorageField } from 'uiSrc/services'
 import { clearExpertChatHistory } from 'uiSrc/slices/panels/aiAssistant'
@@ -31,8 +32,6 @@ import { SearchMode } from '../interfaces/keys'
 import { AppWorkspace, RedisResponseBuffer, StateAppContext } from '../interfaces'
 import { AppDispatch, RootState } from '../store'
 
-const DEFAULT_SHOWN_COLUMNS = [BrowserColumns.Size, BrowserColumns.TTL]
-
 export const initialState: StateAppContext = {
   workspace: localStorageService.get(BrowserStorageItem.homePage) === Pages.rdi
     ? AppWorkspace.RDI

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

@@ -661,6 +661,7 @@ export function fetchKeyInfo(
   onSuccess?: (data: Nullable<IKeyPropTypes>) => void
 ) {
   return async (dispatch: AppDispatch, stateInit: () => RootState) => {
+    dispatch(defaultSelectedKeyAction())
     const { shownColumns } = stateInit()?.app?.context?.dbConfig
     try {
       const state = stateInit()

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

@@ -1,10 +1,10 @@
 import { cloneDeep } from 'lodash'
 import { AxiosError } from 'axios'
 import { configureStore } from '@reduxjs/toolkit'
-import { BrowserColumns, KeyTypes, KeyValueFormat, ModulesKeyTypes } from 'uiSrc/constants'
+import { BrowserColumns, DEFAULT_SHOWN_COLUMNS, KeyTypes, KeyValueFormat, ModulesKeyTypes } from 'uiSrc/constants'
 import { apiService } from 'uiSrc/services'
 import { parseKeysListResponse, stringToBuffer, UTF8ToBuffer } from 'uiSrc/utils'
-import { cleanup, clearStoreActions, initialStateDefault, mockedStore } from 'uiSrc/utils/test-utils'
+import { cleanup, clearStoreActions, initialStateDefault, mockedStore, mockStore } from 'uiSrc/utils/test-utils'
 import { addErrorNotification, addMessageNotification } from 'uiSrc/slices/app/notifications'
 import successMessages from 'uiSrc/components/notifications/success-messages'
 import { SearchHistoryItem, SearchMode } from 'uiSrc/slices/interfaces/keys'
@@ -1639,13 +1639,13 @@ describe('keys slice', () => {
         it(`success to fetch keys metadata with ${name}`, async () => {
           const initialStateWithColumns = {
             ...initialStateDefault,
-            browser: {
-              ...initialStateDefault.browser,
-              keys: {
-                ...initialStateDefault.browser.keys,
-                shownColumns,
-              }
-            }
+            app: {
+              context: {
+                dbConfig: {
+                  shownColumns,
+                },
+              },
+            },
           }
 
           const testStore = configureStore({
@@ -1717,13 +1717,13 @@ describe('keys slice', () => {
         it(`success to fetch keys metadata with ${name}`, async () => {
           const initialStateWithColumns = {
             ...initialStateDefault,
-            browser: {
-              ...initialStateDefault.browser,
-              keys: {
-                ...initialStateDefault.browser.keys,
-                shownColumns,
-              }
-            }
+            app: {
+              context: {
+                dbConfig: {
+                  shownColumns,
+                },
+              },
+            },
           }
 
           const testStore = configureStore({