#RI-2509-resolve comments

Author: AmirAllayarovSofteq

redisinsight/api/src/modules/workbench/providers/command-execution.provider.spec.ts

@@ -140,6 +140,33 @@ describe('CommandExecutionProvider', () => {
         }),
       ]));
     });
+    it('should return with flag isNotStored="true" even if size limit exceeded', async () => {
+      repository.save.mockReturnValueOnce([mockCommandExecutionEntity]);
+      encryptionService.encrypt.mockReturnValue(mockEncryptResult);
+
+      const executionResult = [new CommandExecutionResult({
+        status: CommandExecutionStatus.Success,
+        response: `${Buffer.alloc(WORKBENCH_CONFIG.maxResultSize, 'a').toString()}`,
+      })];
+
+      expect(await service.createMany([{
+        ...mockCommandExecutionPartial,
+        result: executionResult,
+      }])).toEqual([new CommandExecution({
+        ...mockCommandExecutionPartial,
+        id: mockCommandExecutionEntity.id,
+        createdAt: mockCommandExecutionEntity.createdAt,
+        result: executionResult,
+        isNotStored: true,
+      })]);
+
+      expect(encryptionService.encrypt).toHaveBeenLastCalledWith(JSON.stringify([
+        new CommandExecutionResult({
+          status: CommandExecutionStatus.Success,
+          response: 'Results have been deleted since they exceed 1 MB. Re-run the command to see new results.',
+        }),
+      ]));
+    })
   });
   describe('getList', () => {
     it('should return list (2) of command execution', async () => {

redisinsight/api/src/modules/workbench/providers/command-execution.provider.ts

@@ -31,19 +31,19 @@ export class CommandExecutionProvider {
    */
   async createMany(commandExecutions: Partial<CommandExecution>[]): Promise<CommandExecution[]> {
     // todo: limit by 30 max to insert
-    const notStoredIndexes = {};
     let entities = await Promise.all(commandExecutions.map(async (commandExecution, idx) => {
       const entity = plainToClass(CommandExecutionEntity, commandExecution);
 
       // Do not store command execution result that exceeded limitation
       if (JSON.stringify(entity.result).length > WORKBENCH_CONFIG.maxResultSize) {
-        notStoredIndexes[idx] = true;
         entity.result = JSON.stringify([
           {
             status: CommandExecutionStatus.Success,
             response: ERROR_MESSAGES.WORKBENCH_RESPONSE_TOO_BIG(),
           },
         ]);
+        // Hack, do not store isNotStored. Send once to show warning
+        entity['isNotStored'] = true;
       }
 
       return this.encryptEntity(entity);
@@ -61,7 +61,6 @@ export class CommandExecutionProvider {
           result: commandExecutions[idx].result,
           nodeOptions: commandExecutions[idx].nodeOptions,
           summary: commandExecutions[idx].summary,
-          isNotStored: notStoredIndexes[idx] || false,
         },
       )),
     );

redisinsight/ui/src/components/query-card/QueryCardCliResultWrapper/QueryCardCliResultWrapper.spec.tsx

@@ -1,7 +1,7 @@
 import { cloneDeep } from 'lodash'
 import React from 'react'
 import { instance, mock } from 'ts-mockito'
-import { cleanup, mockedStore, render } from 'uiSrc/utils/test-utils'
+import { cleanup, mockedStore, render, screen } from 'uiSrc/utils/test-utils'
 import { ResultsMode } from 'uiSrc/slices/interfaces/workbench'
 import QueryCardCliResultWrapper, { Props } from './QueryCardCliResultWrapper'
 import QueryCardCliDefaultResult, { Props as QueryCardCliDefaultResultProps } from '../QueryCardCliDefaultResult'
@@ -37,14 +37,12 @@ describe('QueryCardCliResultWrapper', () => {
       status: 'success'
     }]
 
-    const { queryByTestId } = render(
+    render(
       <QueryCardCliResultWrapper {...instance(mockedProps)} result={mockResult} />
     )
 
-    const resultEl = queryByTestId('query-cli-result')
-
-    expect(resultEl).toBeInTheDocument()
-    expect(resultEl).toHaveTextContent(mockResult?.[0]?.response)
+    expect(screen.queryByTestId('query-cli-result')).toBeInTheDocument()
+    expect(screen.queryByTestId('query-cli-result')).toHaveTextContent(mockResult?.[0]?.response)
   })
 
   it('Result element should render (nil) result', () => {
@@ -53,13 +51,11 @@ describe('QueryCardCliResultWrapper', () => {
       status: 'success'
     }]
 
-    const { queryByTestId } = render(
+    render(
       <QueryCardCliResultWrapper {...instance(mockedProps)} result={mockResult} />
     )
 
-    const resultEl = queryByTestId('query-cli-result')
-
-    expect(resultEl).toHaveTextContent('(nil)')
+    expect(screen.queryByTestId('query-cli-result')).toHaveTextContent('(nil)')
   })
 
   it('should render QueryCardCliDefaultResult', () => {
@@ -93,22 +89,18 @@ describe('QueryCardCliResultWrapper', () => {
   })
 
   it('Should render loader', () => {
-    const { queryByTestId } = render(
+    render(
       <QueryCardCliResultWrapper {...instance(mockedProps)} loading />
     )
 
-    const loader = queryByTestId('query-cli-loader')
-
-    expect(loader).toBeInTheDocument()
+    expect(screen.queryByTestId('query-cli-loader')).toBeInTheDocument()
   })
 
   it('should render warning', () => {
-    const { queryByTestId } = render(
+    render(
       <QueryCardCliResultWrapper {...instance(mockedProps)} isNotStored />
     )
 
-    const warning = queryByTestId('query-cli-warning')
-
-    expect(warning).toBeInTheDocument()
+    expect(screen.queryByTestId('query-cli-warning')).toBeInTheDocument()
   })
 })

redisinsight/ui/src/utils/tests/cliHelper.spec.ts

@@ -4,7 +4,7 @@ import {
   cliParseCommandsGroupResult,
 } from 'uiSrc/utils'
 import { MOCK_COMMANDS_SPEC } from 'uiSrc/constants'
-import { render } from 'uiSrc/utils/test-utils'
+import { render, screen } from 'uiSrc/utils/test-utils'
 
 const getDbIndexFromSelectQueryTests = [
   { input: 'select 0', expected: 0 },
@@ -62,14 +62,10 @@ describe('cliParseCommandsGroupResult', () => {
     status: 'success'
   }
   const mockIndex = 0
-  const { queryByTestId, getByText } = render(cliParseCommandsGroupResult(mockResult, mockIndex))
-  const cliCommandEl = queryByTestId('wb-command')
-  const cliCommandResultEl = queryByTestId('wb-command-result')
-  const cliCommandTextEl = getByText('> command')
-  const cliCommandResultTextEl = getByText('response')
+  render(cliParseCommandsGroupResult(mockResult, mockIndex))
 
-  expect(cliCommandEl).toBeInTheDocument()
-  expect(cliCommandResultEl).toBeInTheDocument()
-  expect(cliCommandTextEl).toBeInTheDocument()
-  expect(cliCommandResultTextEl).toBeInTheDocument()
+  expect(screen.queryByTestId('wb-command')).toBeInTheDocument()
+  expect(screen.queryByTestId('wb-command-result')).toBeInTheDocument()
+  expect(screen.getByText('> command')).toBeInTheDocument()
+  expect(screen.getByText('response')).toBeInTheDocument()
 })