#RI-3822,3742,3788_fixed

Author: AmirAllayarovSofteq

redisinsight/ui/src/components/query-card/QueryCard.tsx

@@ -179,7 +179,7 @@ const QueryCard = (props: Props) => {
         />
         {isOpen && (
           <>
-            {React.isValidElement(commonError)
+            {React.isValidElement(commonError) && !isGroupMode(resultsMode)
               ? <QueryCardCommonResult loading={loading} result={commonError} />
               : (
                 <>

redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.tsx

@@ -291,7 +291,7 @@ const QueryCardHeader = (props: Props) => {
         <EuiFlexItem grow={false} className={styles.executionTime} data-testid="command-execution-time">
           {isNumber(executionTime) && (
             <EuiToolTip
-              title="Execution Time"
+              title="Processing Time"
               content={getExecutionTimeString(executionTime)}
               position="left"
               anchorClassName={cx(styles.tooltipIcon, styles.alignCenter)}

redisinsight/ui/src/pages/databaseAnalysis/components/top-namespace/TopNamespace.tsx

@@ -1,5 +1,6 @@
 import { EuiButton, EuiLink, EuiSwitch, EuiTitle } from '@elastic/eui'
 import cx from 'classnames'
+import { isNull } from 'lodash'
 import React, { useEffect, useState } from 'react'
 import { useDispatch } from 'react-redux'
 import { useHistory, useParams } from 'react-router-dom'
@@ -46,6 +47,10 @@ const TopNamespace = (props: Props) => {
     history.push(Pages.browser(instanceId))
   }
 
+  if (isNull(data)) {
+    return null
+  }
+
   if (!data?.topMemoryNsp?.length && !data?.topKeysNsp?.length) {
     return (
       <div className={cx('section', styles.wrapper)} data-testid="top-namespaces-empty">

redisinsight/ui/src/slices/tests/workbench/wb-results.spec.ts

@@ -17,6 +17,7 @@ import reducer, {
   sendWBCommand,
   sendWBCommandSuccess,
   processWBCommandFailure,
+  processWBCommandsFailure,
   workbenchResultsSelector,
   sendWBCommandAction,
   sendWBCommandClusterAction,
@@ -207,6 +208,32 @@ describe('workbench results slice', () => {
     })
   })
 
+  describe('processWBCommandsFailure', () => {
+    it('should properly remove from items', () => {
+      // Arrange
+      const data = 'error'
+      const mockCommandExecution = {
+        commandsId: [mockItemId + 0],
+        error: data,
+      }
+      const state = {
+        ...initialStateWithItems,
+        items: []
+      }
+
+      // Act
+      const nextState = reducer(initialStateWithItems, processWBCommandsFailure(mockCommandExecution))
+
+      // Assert
+      const rootState = Object.assign(initialStateDefault, {
+        workbench: {
+          results: nextState,
+        },
+      })
+      expect(workbenchResultsSelector(rootState)).toEqual(state)
+    })
+  })
+
   describe('loadWBHistorySuccess', () => {
     it('should properly set history items', () => {
       // Arrange
@@ -323,7 +350,7 @@ describe('workbench results slice', () => {
         expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions))
       })
 
-      it('call both sendWBCommandAction and processWBCommandFailure when fetch is fail', async () => {
+      it('call both sendWBCommandAction and processWBCommandsFailure when fetch is fail', async () => {
         // Arrange
         const commands = ['keys *']
         const commandId = `${Date.now()}`
@@ -344,7 +371,10 @@ describe('workbench results slice', () => {
         const expectedActions = [
           sendWBCommand({ commands, commandId }),
           addErrorNotification(responsePayload as AxiosError),
-          processWBCommandFailure({ id: commandId, error: responsePayload.response.data.message }),
+          processWBCommandsFailure({
+            commandsId: commands.map((_, i) => commandId + i),
+            error: responsePayload.response.data.message
+          }),
         ]
         expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions))
       })
@@ -438,7 +468,10 @@ describe('workbench results slice', () => {
         const expectedActions = [
           sendWBCommand({ commands, commandId }),
           addErrorNotification(responsePayload as AxiosError),
-          processWBCommandFailure({ id: commandId, error: responsePayload.response.data.message }),
+          processWBCommandsFailure({
+            commandsId: commands.map((_, i) => commandId + i),
+            error: responsePayload.response.data.message
+          }),
         ]
         expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions))
       })

redisinsight/ui/src/slices/workbench/wb-results.ts

@@ -63,6 +63,13 @@ const workbenchResultsSlice = createSlice({
       })
     },
 
+    // temporary solution, need improve on BE how we handle errors
+    processWBCommandsFailure: (state, { payload }: { payload: { commandsId: string[], error: string } }) => {
+      state.items = [...state.items].filter((item) => payload.commandsId.indexOf(item?.id as string) === -1)
+      state.loading = false
+      state.processing = false
+    },
+
     processWBCommandFailure: (state, { payload }: { payload: { id: string, error: string } }) => {
       state.items = [...state.items].map((item) => {
         if (item.id === payload.id) {
@@ -155,6 +162,7 @@ export const {
   processWBCommand,
   fetchWBCommandSuccess,
   processWBCommandFailure,
+  processWBCommandsFailure,
   sendWBCommand,
   sendWBCommandSuccess,
   toggleOpenWBResult,
@@ -242,7 +250,10 @@ export function sendWBCommandAction({
       const error = _err as AxiosError
       const errorMessage = getApiErrorMessage(error)
       dispatch(addErrorNotification(error))
-      dispatch(processWBCommandFailure({ id: commandId, error: errorMessage }))
+      dispatch(processWBCommandsFailure({
+        commandsId: commands.map((_, i) => commandId + i),
+        error: errorMessage
+      }))
       onFailAction?.()
     }
   }
@@ -300,7 +311,10 @@ export function sendWBCommandClusterAction({
       const error = _err as AxiosError
       const errorMessage = getApiErrorMessage(error)
       dispatch(addErrorNotification(error))
-      dispatch(processWBCommandFailure({ id: commandId, error: errorMessage }))
+      dispatch(processWBCommandsFailure({
+        commandsId: commands.map((_, i) => commandId + i),
+        error: errorMessage
+      }))
       onFailAction?.()
     }
   }