#RI-3432-reverse commands in workbench execution (#1107)

* #RI-3432-reverse commands in workbench execution

Author: AmirAllayarovSofteq

redisinsight/ui/src/pages/workbench/components/wb-view/WBViewWrapper.tsx

@@ -3,7 +3,7 @@ import { useDispatch, useSelector } from 'react-redux'
 import { decode } from 'html-entities'
 import { useParams } from 'react-router-dom'
 import * as monacoEditor from 'monaco-editor/esm/vs/editor/editor.api'
-import { chunk, reverse, without } from 'lodash'
+import { chunk, without } from 'lodash'
 
 import {
   Nullable,
@@ -159,7 +159,7 @@ const WBViewWrapper = () => {
 
     isNewCommand() && scrollResults('start')
 
-    sendCommand(reverse(commandLine), multiCommands)
+    sendCommand(commandLine, multiCommands)
   }
 
   const sendCommand = (

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

@@ -206,21 +206,33 @@ describe('workbench results slice', () => {
   })
 
   describe('thunks', () => {
-    describe('Standalone Cli command', () => {
+    describe('Standalone Cli commands', () => {
       it('call both sendWBCommandAction and sendWBCommandSuccess when response status is successed', async () => {
         // Arrange
-        const commands = ['keys *']
+        const commands = ['keys *', 'set 1 1']
         const commandId = `${Date.now()}`
-        const data = [{
-          command: 'command',
-          databaseId: '123',
-          id: commandId + (commands.length - 1),
-          createdAt: new Date(),
-          result: [{
-            response: 'test',
-            status: CommandExecutionStatus.Success
-          }]
-        }]
+        const data = [
+          {
+            command: 'keys *',
+            databaseId: '123',
+            id: commandId + (commands.length - 1),
+            createdAt: new Date(),
+            result: [{
+              response: 'test',
+              status: CommandExecutionStatus.Success
+            }]
+          },
+          {
+            command: 'set 1 1',
+            databaseId: '123',
+            id: commandId + (commands.length - 1),
+            createdAt: new Date(),
+            result: [{
+              response: 'test',
+              status: CommandExecutionStatus.Success
+            }]
+          }
+        ]
         const responsePayload = { data, status: 200 }
 
         apiService.post = jest.fn().mockResolvedValue(responsePayload)
@@ -238,9 +250,9 @@ describe('workbench results slice', () => {
 
       it('call both sendWBCommandAction and sendWBCommandSuccess when response status is fail', async () => {
         // Arrange
-        const command = 'keys *'
+        const commands = ['keys *']
         const commandId = `${Date.now()}`
-        const data = {
+        const data = [{
           command: 'command',
           databaseId: '123',
           id: commandId,
@@ -249,17 +261,17 @@ describe('workbench results slice', () => {
             response: 'test',
             status: CommandExecutionStatus.Fail
           }]
-        }
+        }]
         const responsePayload = { data, status: 200 }
 
         apiService.post = jest.fn().mockResolvedValue(responsePayload)
 
         // Act
-        await store.dispatch<any>(sendWBCommandAction({ command, commandId }))
+        await store.dispatch<any>(sendWBCommandAction({ commands, commandId }))
 
         // Assert
         const expectedActions = [
-          sendWBCommand({ command, commandId }),
+          sendWBCommand({ commands, commandId }),
           sendWBCommandSuccess({ data, commandId })
         ]
 
@@ -268,7 +280,7 @@ describe('workbench results slice', () => {
 
       it('call both sendWBCommandAction and processWBCommandFailure when fetch is fail', async () => {
         // Arrange
-        const command = 'keys *'
+        const commands = ['keys *']
         const commandId = `${Date.now()}`
         const errorMessage = 'Could not connect to aoeu:123, please check the connection details.'
         const responsePayload = {
@@ -281,13 +293,13 @@ describe('workbench results slice', () => {
         apiService.post = jest.fn().mockRejectedValueOnce(responsePayload)
 
         // Act
-        await store.dispatch<any>(sendWBCommandAction({ command, commandId }))
+        await store.dispatch<any>(sendWBCommandAction({ commands, commandId }))
 
         // Assert
         const expectedActions = [
-          sendWBCommand({ command, commandId }),
+          sendWBCommand({ commands, commandId }),
           addErrorNotification(responsePayload as AxiosError),
-          processWBCommandFailure({ command, error: responsePayload.response.data.message }),
+          processWBCommandFailure({ id: commandId, error: responsePayload.response.data.message }),
         ]
         expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions))
       })
@@ -335,8 +347,8 @@ describe('workbench results slice', () => {
 
       it('call both sendWBCommandClusterAction and sendWBCommandSuccess when response status is fail', async () => {
         // Arrange
-        const command = 'keys *'
-        const data = {
+        const commands = ['keys *']
+        const data = [{
           command: 'command',
           databaseId: '123',
           id: commandId,
@@ -345,25 +357,25 @@ describe('workbench results slice', () => {
             response: 'test',
             status: CommandExecutionStatus.Fail
           }]
-        }
+        }]
         const responsePayload = { data, status: 200 }
 
         apiService.post = jest.fn().mockResolvedValue(responsePayload)
 
         // Act
-        await store.dispatch<any>(sendWBCommandClusterAction({ command, options, commandId }))
+        await store.dispatch<any>(sendWBCommandClusterAction({ commands, options, commandId }))
 
         // Assert
         const expectedActions = [
-          sendWBCommand({ command, commandId }),
+          sendWBCommand({ commands, commandId }),
           sendWBCommandSuccess({ data, commandId })
         ]
         expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions))
       })
 
       it('call both sendWBCommandClusterAction and processWBCommandFailure when fetch is fail', async () => {
         // Arrange
-        const command = 'keys *'
+        const commands = ['keys *']
         const errorMessage = 'Could not connect to aoeu:123, please check the connection details.'
         const responsePayload = {
           response: {
@@ -375,13 +387,13 @@ describe('workbench results slice', () => {
         apiService.post = jest.fn().mockRejectedValueOnce(responsePayload)
 
         // Act
-        await store.dispatch<any>(sendWBCommandAction({ command, options, commandId }))
+        await store.dispatch<any>(sendWBCommandAction({ commands, options, commandId }))
 
         // Assert
         const expectedActions = [
-          sendWBCommand({ command, commandId }),
+          sendWBCommand({ commands, commandId }),
           addErrorNotification(responsePayload as AxiosError),
-          processWBCommandFailure({ command, error: responsePayload.response.data.message }),
+          processWBCommandFailure({ id: commandId, error: responsePayload.response.data.message }),
         ]
         expect(clearStoreActions(store.getActions())).toEqual(clearStoreActions(expectedActions))
       })

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

@@ -1,5 +1,6 @@
 import { createSlice } from '@reduxjs/toolkit'
 import { AxiosError } from 'axios'
+import { reverse } from 'lodash'
 import { apiService } from 'uiSrc/services'
 import { ApiEndpoints } from 'uiSrc/constants'
 import { addErrorNotification } from 'uiSrc/slices/app/notifications'
@@ -204,7 +205,7 @@ export function sendWBCommandAction({
   commands: string[]
   multiCommands?: string[]
   commandId?: string
-  mode: RunQueryMode
+  mode?: RunQueryMode
   onSuccessAction?: (multiCommands: string[]) => void
   onFailAction?: () => void
 }) {
@@ -227,7 +228,7 @@ export function sendWBCommandAction({
       )
 
       if (isStatusSuccessful(status)) {
-        dispatch(sendWBCommandSuccess({ commandId, data, processing: !!multiCommands?.length }))
+        dispatch(sendWBCommandSuccess({ commandId, data: reverse(data), processing: !!multiCommands?.length }))
 
         onSuccessAction?.(multiCommands)
       }
@@ -255,7 +256,7 @@ export function sendWBCommandClusterAction({
   options: CreateCommandExecutionDto
   commandId?: string
   multiCommands?: string[]
-  mode: RunQueryMode,
+  mode?: RunQueryMode,
   onSuccessAction?: (multiCommands: string[]) => void
   onFailAction?: () => void
 }) {
@@ -280,7 +281,7 @@ export function sendWBCommandClusterAction({
       )
 
       if (isStatusSuccessful(status)) {
-        dispatch(sendWBCommandSuccess({ commandId, data }))
+        dispatch(sendWBCommandSuccess({ commandId, data: reverse(data) }))
 
         onSuccessAction?.(multiCommands)
       }