Merge branch 'main' into feature/RI-2743_Enhanced_overview

# Conflicts:
#	redisinsight/ui/src/mocks/handlers/app/infoHandlers.ts

Author: egor-zalenski

redisinsight/ui/src/components/cli/CliWrapper.spec.tsx

@@ -1,16 +1,15 @@
 import { cloneDeep } from 'lodash'
 import React from 'react'
-import { processCliClient, setCliEnteringCommand } from 'uiSrc/slices/cli/cli-settings'
-import { cleanup, mockedStore, render } from 'uiSrc/utils/test-utils'
+import { InitOutputText } from 'uiSrc/constants/cliOutput'
+import { concatToOutput } from 'uiSrc/slices/cli/cli-output'
+import { setCliEnteringCommand } from 'uiSrc/slices/cli/cli-settings'
+import { cleanup, clearStoreActions, mockedStore, render } from 'uiSrc/utils/test-utils'
 import CliWrapper from './CliWrapper'
 
-jest.mock('uiSrc/slices/cli/cli-output', () => ({
-  ...jest.requireActual('uiSrc/slices/cli/cli-output'),
-  concatToOutput: () => jest.fn(),
-}))
-
 const redisCommandsPath = 'uiSrc/slices/app/redis-commands'
 
+let mathRandom: jest.SpyInstance<number>
+const random = 0.91911
 let store: typeof mockedStore
 beforeEach(() => {
   cleanup()
@@ -32,6 +31,14 @@ jest.mock(redisCommandsPath, () => {
 })
 
 describe('CliWrapper', () => {
+  beforeAll(() => {
+    mathRandom = jest.spyOn(Math, 'random').mockImplementation(() => random)
+  })
+
+  afterAll(() => {
+    mathRandom.mockRestore()
+  })
+
   it('should render', () => {
     expect(render(<CliWrapper />)).toBeTruthy()
   })
@@ -40,7 +47,12 @@ describe('CliWrapper', () => {
 
     unmount()
 
-    const expectedActions = [processCliClient(), setCliEnteringCommand()]
-    expect(store.getActions().slice(-2)).toEqual(expectedActions)
+    const handleWorkbenchClick = () => {}
+
+    const expectedActions = [
+      concatToOutput(InitOutputText('', 0, 0, true, handleWorkbenchClick)),
+      setCliEnteringCommand(),
+    ]
+    expect(clearStoreActions(store.getActions().slice(-2))).toEqual(clearStoreActions(expectedActions))
   })
 })

redisinsight/ui/src/components/cli/components/cli-body/CliBodyWrapper.tsx

@@ -53,7 +53,7 @@ const CliBodyWrapper = () => {
   const { db: currentDbIndex } = useSelector(outputSelector)
 
   useEffect(() => {
-    !cliClientUuid && dispatch(createCliClientAction(handleWorkbenchClick))
+    !cliClientUuid && dispatch(createCliClientAction(instanceId, handleWorkbenchClick))
   }, [])
 
   useEffect(() => {

redisinsight/ui/src/mocks/handlers/app/infoHandlers.ts

@@ -12,7 +12,7 @@ export const APP_INFO_DATA_MOCK = {
 }
 
 const handlers: RestHandler[] = [
-  // useGetClusterDetailsQuery
+  // fetchServerInfo
   rest.get<DatabaseInstanceResponse[]>(getMswURL(ApiEndpoints.INFO), async (req, res, ctx) => res(
     ctx.status(200),
     ctx.json(APP_INFO_DATA_MOCK),

redisinsight/ui/src/mocks/handlers/instances/instancesHandlers.ts

@@ -4,6 +4,8 @@ import { ApiEndpoints } from 'uiSrc/constants'
 import { ConnectionType } from 'uiSrc/slices/interfaces'
 import { getMswURL } from 'uiSrc/utils/test-utils'
 
+export const INSTANCE_ID_MOCK = 'instanceId'
+
 const handlers: RestHandler[] = [
   // fetchInstancesAction
   rest.get<DatabaseInstanceResponse[]>(getMswURL(ApiEndpoints.INSTANCE), async (req, res, ctx) => res(

redisinsight/ui/src/slices/cli/cli-settings.ts

@@ -182,6 +182,7 @@ export default cliSettingsSlice.reducer
 
 // Asynchronous thunk action
 export function createCliClientAction(
+  instanceId: string,
   onWorkbenchClick: () => void,
   onSuccessAction?: () => void,
   onFailAction?: (message: string) => void
@@ -195,7 +196,7 @@ export function createCliClientAction(
 
     try {
       const { data, status } = await apiService.post<CreateCliClientResponse>(
-        getUrl(state.connections.instances.connectedInstance?.id ?? '', ApiEndpoints.CLI)
+        getUrl(instanceId ?? '', ApiEndpoints.CLI)
       )
 
       if (isStatusSuccessful(status)) {

redisinsight/ui/src/slices/tests/cli/cli-output.spec.ts

@@ -8,7 +8,7 @@ import { apiService } from 'uiSrc/services'
 import { cliTexts } from 'uiSrc/constants/cliOutput'
 import { cliParseTextResponseWithOffset, cliParseTextResponseWithRedirect } from 'uiSrc/utils/cliHelper'
 import ApiErrors from 'uiSrc/constants/apiErrors'
-import { updateCliClientAction } from 'uiSrc/slices/cli/cli-settings'
+import { processCliClient, updateCliClientAction } from 'uiSrc/slices/cli/cli-settings'
 import reducer, {
   concatToOutput,
   initialState,
@@ -354,10 +354,8 @@ describe('cliOutput slice', () => {
           sendCliCommand(),
           sendCliCommandFailure(responsePayload.response.data.message),
           concatToOutput(cliParseTextResponseWithOffset(errorMessage, command, CommandExecutionStatus.Fail)),
-          concatToOutput(['\n']),
-          concatToOutput(['\n'])
+          processCliClient(),
         ]
-        expect(updateCliClientAction).toHaveBeenCalled()
         expect(clearStoreActions(tempStore.getActions())).toEqual(clearStoreActions(expectedActions))
       })
     })
@@ -484,10 +482,8 @@ describe('cliOutput slice', () => {
           sendCliCommand(),
           sendCliCommandFailure(responsePayload.response.data.message),
           concatToOutput(cliParseTextResponseWithOffset(errorMessage, command, CommandExecutionStatus.Fail)),
-          concatToOutput(['\n']),
-          concatToOutput(['\n'])
+          processCliClient(),
         ]
-        expect(updateCliClientAction).toHaveBeenCalled()
         expect(clearStoreActions(tempStore.getActions())).toEqual(clearStoreActions(expectedActions))
       })
     })

redisinsight/ui/src/slices/tests/cli/cli-settings.spec.ts

@@ -7,6 +7,7 @@ import {
   ConnectionSuccessOutputText,
   InitOutputText,
 } from 'uiSrc/constants/cliOutput'
+import { INSTANCE_ID_MOCK } from 'uiSrc/mocks/handlers/instances/instancesHandlers'
 import reducer, {
   initialState,
   toggleCli,
@@ -32,11 +33,8 @@ import reducer, {
   resetCliHelperSettings, goBackFromCommand,
 } from '../../cli/cli-settings'
 
-jest.mock('uiSrc/constants/cliOutput', () => ({
-  ...jest.requireActual('uiSrc/constants/cliOutput'),
-  InitOutputText: jest.fn().mockReturnValue([]),
-}))
-
+let mathRandom: jest.SpyInstance<number>
+const random = 0.91911
 let store: typeof mockedStore
 beforeEach(() => {
   cleanup()
@@ -53,6 +51,14 @@ jest.mock('uiSrc/services', () => ({
 }))
 
 describe('cliSettings slice', () => {
+  beforeAll(() => {
+    mathRandom = jest.spyOn(Math, 'random').mockImplementation(() => random)
+  })
+
+  afterAll(() => {
+    mathRandom.mockRestore()
+  })
+
   describe('toggleCliHelper', () => {
     it('default state.isShowHelper should be falsy', () => {
       // Arrange
@@ -479,17 +485,17 @@ describe('cliSettings slice', () => {
       apiService.post = jest.fn().mockResolvedValue(responsePayload)
 
       // Act
-      await store.dispatch<any>(createCliClientAction())
+      await store.dispatch<any>(createCliClientAction(INSTANCE_ID_MOCK, () => {}))
 
       // Assert
       const expectedActions = [
         processCliClient(),
-        concatToOutput(InitOutputText()),
+        concatToOutput(InitOutputText('', 0, 0, true, () => {})),
         processCliClientSuccess(responsePayload.data?.uuid),
         concatToOutput(ConnectionSuccessOutputText),
         setCliDbIndex(0)
       ]
-      expect(store.getActions()).toEqual(expectedActions)
+      expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions))
     })
 
     it('call both createCliClientAction and processCliClientFailure when fetch is fail', async () => {
@@ -505,12 +511,12 @@ describe('cliSettings slice', () => {
       apiService.post = jest.fn().mockRejectedValueOnce(responsePayload)
 
       // Act
-      await store.dispatch<any>(createCliClientAction())
+      await store.dispatch<any>(createCliClientAction(INSTANCE_ID_MOCK, () => {}))
 
       // Assert
       const expectedActions = [
         processCliClient(),
-        concatToOutput(InitOutputText()),
+        concatToOutput(InitOutputText('', 0, 0, true, () => {})),
         processCliClientFailure(responsePayload.response.data.message),
         concatToOutput(cliTexts.CLI_ERROR_MESSAGE(errorMessage))
       ]