Merge pull request #1421 from RedisInsight/bugfix/RI-3822/3742/3788_regression_bugs

AlenaSY · web-flow · commit 7f1a0a7d29ae · 2022-11-23T12:46:42.000+03:00
#RI-3822,3742,3788_fixed
diff --git a/redisinsight/api/src/constants/telemetry-events.ts b/redisinsight/api/src/constants/telemetry-events.ts
@@ -61,3 +61,5 @@ export enum CommandType {
   Core = 'core',
   Module = 'module',
 }
+
+export const unknownCommand = 'unknown';
diff --git a/redisinsight/api/src/modules/cli/services/cli-business/cli-business.service.spec.ts b/redisinsight/api/src/modules/cli/services/cli-business/cli-business.service.spec.ts
@@ -28,6 +28,7 @@ import {
   CommandParsingError,
   WrongDatabaseTypeError,
 } from 'src/modules/cli/constants/errors';
+import { unknownCommand } from 'src/constants';
 import { CliAnalyticsService } from 'src/modules/cli/services/cli-analytics/cli-analytics.service';
 import { KeytarUnavailableException } from 'src/modules/encryption/exceptions';
 import { RedisToolService } from 'src/modules/redis/redis-tool.service';
@@ -330,6 +331,7 @@ describe('CliBusinessService', () => {
           ERROR_MESSAGES.CLI_UNTERMINATED_QUOTES(),
         ),
         {
+          command: unknownCommand,
           outputFormat: CliOutputFormatterTypes.Raw,
         },
       );
@@ -591,6 +593,7 @@ describe('CliBusinessService', () => {
         mockClientOptions.instanceId,
         new CommandParsingError(ERROR_MESSAGES.CLI_UNTERMINATED_QUOTES()),
         {
+          command: unknownCommand,
           outputFormat: CliOutputFormatterTypes.Raw,
         },
       );
@@ -920,6 +923,7 @@ describe('CliBusinessService', () => {
         mockClientOptions.instanceId,
         new CommandParsingError(ERROR_MESSAGES.CLI_UNTERMINATED_QUOTES()),
         {
+          command: unknownCommand,
           outputFormat: CliOutputFormatterTypes.Raw,
         },
       );
diff --git a/redisinsight/api/src/modules/cli/services/cli-business/cli-business.service.ts b/redisinsight/api/src/modules/cli/services/cli-business/cli-business.service.ts
@@ -5,6 +5,7 @@ import {
   Logger,
 } from '@nestjs/common';
 import { IFindRedisClientInstanceByOptions } from 'src/modules/redis/redis.service';
+import { unknownCommand } from 'src/constants';
 import { CommandsService } from 'src/modules/commands/commands.service';
 import {
   ClusterNodeRole,
@@ -143,7 +144,7 @@ export class CliBusinessService {
   ): Promise<SendCommandResponse> {
     this.logger.log('Executing redis CLI command.');
     const { command: commandLine } = dto;
-    let command: string;
+    let command: string = unknownCommand;
     let args: string[] = [];
 
     const outputFormat = dto.outputFormat || CliOutputFormatterTypes.Raw;
@@ -229,7 +230,7 @@ export class CliBusinessService {
     outputFormat: CliOutputFormatterTypes = CliOutputFormatterTypes.Raw,
   ): Promise<SendClusterCommandResponse[]> {
     this.logger.log(`Executing redis.cluster CLI command for [${role}] nodes.`);
-    let command: string;
+    let command: string = unknownCommand;
     let args: string[] = [];
 
     try {
@@ -298,7 +299,7 @@ export class CliBusinessService {
     outputFormat: CliOutputFormatterTypes = CliOutputFormatterTypes.Raw,
   ): Promise<SendClusterCommandResponse> {
     this.logger.log(`Executing redis.cluster CLI command for single node ${JSON.stringify(nodeOptions)}`);
-    let command: string;
+    let command: string = unknownCommand;
     let args: string[] = [];
 
     try {
diff --git a/redisinsight/api/src/modules/workbench/providers/workbench-commands.executor.spec.ts b/redisinsight/api/src/modules/workbench/providers/workbench-commands.executor.spec.ts
@@ -5,6 +5,8 @@ import {
   mockDatabase,
   mockWorkbenchAnalyticsService,
 } from 'src/__mocks__';
+import ERROR_MESSAGES from 'src/constants/error-messages';
+import { unknownCommand } from 'src/constants';
 import { IFindRedisClientInstanceByOptions } from 'src/modules/redis/redis.service';
 import { WorkbenchCommandsExecutor } from 'src/modules/workbench/providers/workbench-commands.executor';
 import {
@@ -17,6 +19,7 @@ import { CommandExecutionStatus } from 'src/modules/cli/dto/cli.dto';
 import { BadRequestException, InternalServerErrorException, ServiceUnavailableException } from '@nestjs/common';
 import {
   CommandNotSupportedError,
+  CommandParsingError,
   ClusterNodeNotFoundError,
   WrongDatabaseTypeError,
 } from 'src/modules/cli/constants/errors';
@@ -49,6 +52,7 @@ const mockCliNodeResponse: ICliExecResultFromNode = {
 };
 
 const mockSetCommand = 'set';
+const mockGetEscapedKeyCommand = 'get "\\\\key';
 const mockCreateCommandExecutionDto: CreateCommandExecutionDto = {
   command: `${mockSetCommand} foo bar`,
   nodeOptions: {
@@ -564,5 +568,35 @@ describe('WorkbenchCommandsExecutor', () => {
         }
       });
     });
+    describe('CommandParsingError', () => {
+      it('should return response with [CLI_UNTERMINATED_QUOTES] error for sendCommandForNodes', async () => {
+        const mockResult = [
+          {
+            response: ERROR_MESSAGES.CLI_UNTERMINATED_QUOTES(),
+            status: CommandExecutionStatus.Fail,
+          },
+        ];
+
+        const result = await service.sendCommand(mockClientOptions, {
+          command: mockGetEscapedKeyCommand,
+          role: mockCreateCommandExecutionDto.role,
+          mode: RunQueryMode.ASCII,
+        });
+
+        expect(result).toEqual(mockResult);
+        expect(mockAnalyticsService.sendCommandExecutedEvent).toHaveBeenCalledWith(
+          mockClientOptions.instanceId,
+          {
+            response: ERROR_MESSAGES.CLI_UNTERMINATED_QUOTES(),
+            error: new CommandParsingError(ERROR_MESSAGES.CLI_UNTERMINATED_QUOTES()),
+            status: CommandExecutionStatus.Fail,
+          },
+          {
+            command: unknownCommand,
+            rawMode: false,
+          },
+        );
+      });
+    });
   });
 });
diff --git a/redisinsight/api/src/modules/workbench/providers/workbench-commands.executor.ts b/redisinsight/api/src/modules/workbench/providers/workbench-commands.executor.ts
@@ -18,6 +18,7 @@ import {
   ClusterNodeNotFoundError,
   WrongDatabaseTypeError,
 } from 'src/modules/cli/constants/errors';
+import { unknownCommand } from 'src/constants';
 import { CommandExecutionResult } from 'src/modules/workbench/models/command-execution-result';
 import { CreateCommandExecutionDto, RunQueryMode } from 'src/modules/workbench/dto/create-command-execution.dto';
 import { RedisToolService } from 'src/modules/redis/redis-tool.service';
@@ -62,17 +63,18 @@ export class WorkbenchCommandsExecutor {
     dto: CreateCommandExecutionDto,
   ): Promise<CommandExecutionResult[]> {
     let result;
+    let command = unknownCommand;
+    let commandArgs: string[] = [];
 
     const {
       command: commandLine,
       role,
       nodeOptions,
       mode,
     } = dto;
-
-    const [command, ...commandArgs] = splitCliCommandLine(commandLine);
-
     try {
+      [command, ...commandArgs] = splitCliCommandLine(commandLine);
+
       if (nodeOptions) {
         result = [await this.sendCommandForSingleNode(
           clientOptions,
diff --git a/redisinsight/ui/src/components/query-card/QueryCard.tsx b/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} />
               : (
                 <>
diff --git a/redisinsight/ui/src/components/query-card/QueryCardCliGroupResult/QueryCardCliGroupResult.tsx b/redisinsight/ui/src/components/query-card/QueryCardCliGroupResult/QueryCardCliGroupResult.tsx
@@ -2,8 +2,9 @@ import { flatten } from 'lodash'
 import React from 'react'
 
 import { CommandExecutionResult } from 'uiSrc/slices/interfaces'
-import { cliParseCommandsGroupResult, Maybe } from 'uiSrc/utils'
+import { cliParseCommandsGroupResult, wbSummaryCommand, Maybe } from 'uiSrc/utils'
 import QueryCardCliDefaultResult from '../QueryCardCliDefaultResult'
+import { CommonErrorResponse } from '../QueryCardCommonResult'
 
 export interface Props {
   result?: Maybe<CommandExecutionResult[]>
@@ -12,12 +13,18 @@ export interface Props {
 
 const QueryCardCliGroupResult = (props: Props) => {
   const { result = [], isFullScreen } = props
+
   return (
     <div data-testid="query-cli-default-result" className="query-card-output-response-success">
       <QueryCardCliDefaultResult
         isFullScreen={isFullScreen}
-        items={flatten(result?.[0]?.response.map((item: any) =>
-          flatten(cliParseCommandsGroupResult(item))))}
+        items={flatten(result?.[0]?.response.map((item: any) => {
+          const commonError = CommonErrorResponse(item.command, item.response)
+          if (React.isValidElement(commonError)) {
+            return ([wbSummaryCommand(item.command), commonError])
+          }
+          return flatten(cliParseCommandsGroupResult(item))
+        }))}
       />
     </div>
   )
diff --git a/redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.tsx b/redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.tsx
@@ -292,7 +292,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)}
diff --git a/redisinsight/ui/src/components/query-card/QueryCardHeader/styles.module.scss b/redisinsight/ui/src/components/query-card/QueryCardHeader/styles.module.scss
@@ -41,24 +41,27 @@ $marginIcon: 12px;
 
 .titleWrapper {
   width: calc(100% - 490px);
+  min-width: calc(100% - 490px);
 
-  @media (min-width: $breakpoint-s) {
-    width: calc(100% - 529px);
+  @media (min-width: $breakpoint-m) {
+    width: calc(100% - 582px);
+    min-width: calc(100% - 582px);
   }
 
-  @media (min-width: $breakpoint-m) {
-    width: calc(100% - 651px);
+  @media (min-width: $breakpoint-l) {
+    width: calc(100% - 633px);
+    min-width: calc(100% - 633px);
   }
 }
 
 :global(.fullscreen) .titleWrapper {
   width: calc(100% - 402px);
 
-  @media (min-width: $breakpoint-s) {
-    width: calc(100% - 447px);
+  @media (min-width: $breakpoint-m) {
+    width: calc(100% - 474px);
   }
 
-  @media (min-width: $breakpoint-m) {
+  @media (min-width: $breakpoint-l) {
     width: calc(100% - 519px);
   }
 }
@@ -146,21 +149,16 @@ $marginIcon: 12px;
   min-width: 13px;
   width: 13px;
 
-  @media (min-width: $breakpoint-s) {
+  @media (min-width: $breakpoint-l) {
     min-width: 58px;
     width: 58px;
   }
-
-  @media (min-width: $breakpoint-m) {
-    min-width: 70px;
-    width: 70px;
-  }
 }
 
 .executionTimeValue {
   display: none;
 
-  @media (min-width: $breakpoint-s) {
+  @media (min-width: $breakpoint-l) {
     display: initial;
     overflow: hidden;
     text-overflow: ellipsis;
diff --git a/redisinsight/ui/src/components/query-card/styles.module.scss b/redisinsight/ui/src/components/query-card/styles.module.scss
@@ -2,8 +2,17 @@
 @import "@elastic/eui/src/components/table/mixins";
 @import "@elastic/eui/src/global_styling/index";
 
+$breakpoint-l: 1300px;
+$breakpoint-m: 1050px;
+
 .containerWrapper {
-  min-width: 590px;
+  min-width: 560px;
+  @media (min-width: $breakpoint-m) {
+    min-width: 650px;
+  }
+  @media (min-width: $breakpoint-l) {
+    min-width: 720px;
+  }
   &:nth-of-type(even) {
     background-color: var(--euiColorEmptyShade) !important;
   }
diff --git a/redisinsight/ui/src/pages/databaseAnalysis/components/top-namespace/TopNamespace.tsx b/redisinsight/ui/src/pages/databaseAnalysis/components/top-namespace/TopNamespace.tsx
@@ -46,6 +46,10 @@ const TopNamespace = (props: Props) => {
     history.push(Pages.browser(instanceId))
   }
 
+  if (!data?.topMemoryNsp || data?.totalKeys?.total === 0) {
+    return null
+  }
+
   if (!data?.topMemoryNsp?.length && !data?.topKeysNsp?.length) {
     return (
       <div className={cx('section', styles.wrapper)} data-testid="top-namespaces-empty">
diff --git a/redisinsight/ui/src/slices/tests/workbench/wb-results.spec.ts b/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,41 @@ 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: [{
+          id: mockItemId + 0,
+          loading: false,
+          isOpen: true,
+          error: '',
+          result: [{
+            response: data,
+            status: 'fail',
+          }]
+        }]
+      }
+
+      // 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 +359,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 +380,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 +477,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))
       })
diff --git a/redisinsight/ui/src/slices/workbench/wb-results.ts b/redisinsight/ui/src/slices/workbench/wb-results.ts
diff --git a/redisinsight/ui/src/utils/cliHelper.tsx b/redisinsight/ui/src/utils/cliHelper.tsx

Original file line number	Diff line number	Diff line change
`@@ -61,3 +61,5 @@ export enum CommandType {`
`61`	`61`	`Core = 'core',`
`62`	`62`	`Module = 'module',`
`63`	`63`	`}`
	`64`	`+`
	`65`	`+export const unknownCommand = 'unknown';`