Merge branch 'main' into e2e/feature/RI-3932_import-ssh-parameters

Author: vlad-dargel

redisinsight/api/config/default.ts

@@ -108,14 +108,14 @@ export default {
   },
   guides: {
     updateUrl: process.env.GUIDES_UPDATE_URL
-      || 'https://github.com/RedisInsight/Guides/releases/download/latest',
+      || 'https://github.com/RedisInsight/Guides/releases/download/release',
     zip: process.env.GUIDES_ZIP || dataZipFileName,
     buildInfo: process.env.GUIDES_CHECKSUM || buildInfoFileName,
     devMode: !!process.env.GUIDES_DEV_PATH,
   },
   tutorials: {
     updateUrl: process.env.TUTORIALS_UPDATE_URL
-      || 'https://github.com/RedisInsight/Tutorials/releases/download/latest',
+      || 'https://github.com/RedisInsight/Tutorials/releases/download/release',
     zip: process.env.TUTORIALS_ZIP || dataZipFileName,
     buildInfo: process.env.TUTORIALS_CHECKSUM || buildInfoFileName,
     devMode: !!process.env.TUTORIALS_DEV_PATH,

redisinsight/api/src/modules/workbench/dto/create-command-execution.dto.ts

@@ -19,6 +19,7 @@ export enum RunQueryMode {
 export enum ResultsMode {
   Default = 'DEFAULT',
   GroupMode = 'GROUP_MODE',
+  Silent = 'SILENT',
 }
 
 export class CreateCommandExecutionDto {

redisinsight/api/src/modules/workbench/workbench.service.spec.ts

@@ -51,6 +51,18 @@ const mockCreateCommandExecutionDtoWithGroupMode: CreateCommandExecutionsDto = {
   resultsMode: ResultsMode.GroupMode,
 };
 
+const mockCreateCommandExecutionDtoWithSilentMode: CreateCommandExecutionsDto = {
+  commands: mockCommands,
+  nodeOptions: {
+    host: '127.0.0.1',
+    port: 7002,
+    enableRedirection: true,
+  },
+  role: ClusterNodeRole.All,
+  mode: RunQueryMode.ASCII,
+  resultsMode: ResultsMode.Silent,
+};
+
 const mockCreateCommandExecutionsDto: CreateCommandExecutionsDto = {
   commands: [
     mockCreateCommandExecutionDto.command,
@@ -101,6 +113,21 @@ const mockCommandExecutionWithGroupMode = {
   }],
 };
 
+const mockCommandExecutionWithSilentMode = {
+  mode: 'ASCII',
+  commands: mockCommands,
+  resultsMode: 'GROUP_MODE',
+  databaseId: 'd05043d0 - 0d12- 4ce1-9ca3 - 30c6d7e391ea',
+  summary: { total: 2, success: 1, fail: 1 },
+  command: 'set 1 1\r\nget 1',
+  result: [{
+    status: 'success',
+    response: [
+      { response: 'error', status: 'fail', command: 'get 1' },
+    ],
+  }],
+};
+
 const mockCommandExecutionProvider = () => ({
   createMany: jest.fn(),
   getList: jest.fn(),
@@ -215,6 +242,21 @@ describe('WorkbenchService', () => {
       expect(result).toEqual([mockCommandExecutionWithGroupMode]);
     });
 
+    it('should successfully execute commands and save in silent mode view', async () => {
+      when(workbenchCommandsExecutor.sendCommand)
+        .calledWith(mockWorkbenchClientMetadata, expect.anything())
+        .mockResolvedValue([mockSendCommandResultSuccess]);
+
+      commandExecutionProvider.createMany.mockResolvedValueOnce([mockCommandExecutionWithSilentMode]);
+
+      const result = await service.createCommandExecutions(
+        mockWorkbenchClientMetadata,
+        mockCreateCommandExecutionDtoWithSilentMode,
+      );
+
+      expect(result).toEqual([mockCommandExecutionWithSilentMode]);
+    });
+
     it('should successfully execute commands with error and save summary', async () => {
       when(workbenchCommandsExecutor.sendCommand)
         .calledWith(mockWorkbenchClientMetadata, {
@@ -240,6 +282,31 @@ describe('WorkbenchService', () => {
       expect(result).toEqual([mockCommandExecutionWithGroupMode]);
     });
 
+    it('should successfully execute commands with error and save summary in silent mode view', async () => {
+      when(workbenchCommandsExecutor.sendCommand)
+        .calledWith(mockWorkbenchClientMetadata, {
+          ...mockCreateCommandExecutionDtoWithSilentMode,
+          command: mockCommands[0],
+        })
+        .mockResolvedValue([mockSendCommandResultSuccess]);
+
+      when(workbenchCommandsExecutor.sendCommand)
+        .calledWith(mockWorkbenchClientMetadata, {
+          ...mockCreateCommandExecutionDtoWithSilentMode,
+          command: mockCommands[1],
+        })
+        .mockResolvedValue([mockSendCommandResultFail]);
+
+      commandExecutionProvider.createMany.mockResolvedValueOnce([mockCommandExecutionWithSilentMode]);
+
+      const result = await service.createCommandExecutions(
+        mockWorkbenchClientMetadata,
+        mockCreateCommandExecutionDtoWithSilentMode,
+      );
+
+      expect(result).toEqual([mockCommandExecutionWithSilentMode]);
+    });
+
     it('should throw an error when command execution failed', async () => {
       workbenchCommandsExecutor.sendCommand.mockRejectedValueOnce(new BadRequestException('error'));
 

redisinsight/api/src/modules/workbench/workbench.service.ts

@@ -63,11 +63,13 @@ export class WorkbenchService {
    * @param clientMetadata
    * @param dto
    * @param commands
+   * @param onlyErrorResponse
    */
   async createCommandsExecution(
     clientMetadata: ClientMetadata,
     dto: Partial<CreateCommandExecutionDto>,
     commands: string[],
+    onlyErrorResponse: boolean = false,
   ): Promise<Partial<CommandExecution>> {
     const commandExecution: Partial<CommandExecution> = {
       ...dto,
@@ -114,7 +116,7 @@ export class WorkbenchService {
     commandExecution.command = commands.join('\r\n');
     commandExecution.result = [{
       status: CommandExecutionStatus.Success,
-      response: executionResults,
+      response: onlyErrorResponse ? failedCommands : executionResults,
     }];
 
     return commandExecution;
@@ -134,9 +136,9 @@ export class WorkbenchService {
     // temporary workaround. Just create client before any command execution precess
     await this.databaseConnectionService.getOrCreateClient(clientMetadata);
 
-    if (dto.resultsMode === ResultsMode.GroupMode) {
+    if (dto.resultsMode === ResultsMode.GroupMode || dto.resultsMode === ResultsMode.Silent) {
       return this.commandExecutionProvider.createMany(
-        [await this.createCommandsExecution(clientMetadata, dto, dto.commands)],
+        [await this.createCommandsExecution(clientMetadata, dto, dto.commands, dto.resultsMode === ResultsMode.Silent)],
       );
     }
     // todo: rework to support pipeline

redisinsight/api/test/api/plugins/POST-databases-id-plugins-command_executions.test.ts

@@ -21,7 +21,7 @@ const dataSchema = Joi.object({
   command: Joi.string().required(),
   role: Joi.string().valid('ALL', 'MASTER', 'SLAVE').allow(null),
   mode: Joi.string().valid('RAW', 'ASCII').allow(null),
-  resultsMode: Joi.string().valid('DEFAULT', 'GROUP_MODE').allow(null),
+  resultsMode: Joi.string().valid('DEFAULT', 'GROUP_MODE', 'SILENT').allow(null),
   nodeOptions: Joi.object().keys({
     host: Joi.string().required(),
     // todo: fix BE transform to avoid handle boolean as number

redisinsight/ui/src/assets/img/icons/group_mode.svg

@@ -20,7 +20,8 @@
 }
 
 .overview {
-  &.noModules, &.RediStack {
+  &.noModules,
+  &.RediStack {
     .overviewItem {
       &:last-child {
         border-right: 1px solid var(--separatorColor);
@@ -74,9 +75,9 @@
 .commandsPerSecTip {
   margin-bottom: 8px;
 
-    &:last-child {
-      margin-bottom: 0;
-    }
+  &:last-child {
+    margin-bottom: 0;
+  }
   .moreInfoOverviewIcon {
     margin-right: 8px;
     width: auto !important;
@@ -99,6 +100,13 @@
 
 .RediStackLogoWrapper {
   padding: 0 6px;
+  cursor: pointer;
+  transition: transform 250ms ease-in-out;
+
+  &:hover {
+    transform: translateY(-1px);
+  }
+
   .redistackLogoIcon {
     width: 24px;
     height: 24px;
@@ -124,4 +132,3 @@
     display: none !important;
   }
 }
-

redisinsight/ui/src/assets/img/icons/silent_mode.svg

@@ -10,7 +10,8 @@ import {
   getWBQueryType,
   getVisualizationsByCommand,
   Maybe,
-  isGroupMode
+  isGroupResults,
+  isSilentModeWithoutError,
 } from 'uiSrc/utils'
 import { appPluginsSelector } from 'uiSrc/slices/app/plugins'
 import { CommandExecutionResult, IPluginVisualization } from 'uiSrc/slices/interfaces'
@@ -47,10 +48,14 @@ export interface Props {
 const getDefaultPlugin = (views: IPluginVisualization[], query: string) =>
   getVisualizationsByCommand(query, views).find((view) => view.default)?.uniqId || ''
 
-export const getSummaryText = (summary?: ResultsSummary) => {
+export const getSummaryText = (summary?: ResultsSummary, mode?: ResultsMode) => {
   if (summary) {
     const { total, success, fail } = summary
-    return `${total} Command(s) - ${success} success, ${fail} error(s)`
+    const summaryText = `${total} Command(s) - ${success} success`
+    if (!isSilentModeWithoutError(mode, summary?.fail)) {
+      return `${summaryText}, ${fail} error(s)`
+    }
+    return summaryText
   }
   return summary
 }
@@ -82,7 +87,7 @@ const QueryCard = (props: Props) => {
   const [isFullScreen, setIsFullScreen] = useState<boolean>(false)
   const [queryType, setQueryType] = useState<WBQueryType>(getWBQueryType(command, visualizations))
   const [viewTypeSelected, setViewTypeSelected] = useState<WBQueryType>(queryType)
-  const [summaryText, setSummaryText] = useState<string>('')
+  const [message, setMessage] = useState<string>('')
   const [selectedViewValue, setSelectedViewValue] = useState<string>(
     getDefaultPlugin(visualizations, command || '') || queryType
   )
@@ -130,7 +135,7 @@ const QueryCard = (props: Props) => {
   }, [visualizations])
 
   const toggleOpen = () => {
-    if (isFullScreen) return
+    if (isFullScreen || isSilentModeWithoutError(resultsMode, summary?.fail)) return
 
     dispatch(toggleOpenWBResult(id))
 
@@ -162,14 +167,16 @@ const QueryCard = (props: Props) => {
           query={command}
           loading={loading}
           createdAt={createdAt}
-          summaryText={summaryText}
+          message={message}
           queryType={queryType}
           selectedValue={selectedViewValue}
           activeMode={activeMode}
           mode={mode}
+          resultsMode={resultsMode}
           activeResultsMode={activeResultsMode}
           emptyCommand={emptyCommand}
-          summary={getSummaryText(summary)}
+          summary={summary}
+          summaryText={getSummaryText(summary, resultsMode)}
           executionTime={executionTime}
           toggleOpen={toggleOpen}
           toggleFullScreen={toggleFullScreen}
@@ -179,11 +186,11 @@ const QueryCard = (props: Props) => {
         />
         {isOpen && (
           <>
-            {React.isValidElement(commonError) && !isGroupMode(resultsMode)
+            {React.isValidElement(commonError) && !isGroupResults(resultsMode)
               ? <QueryCardCommonResult loading={loading} result={commonError} />
               : (
                 <>
-                  {isGroupMode(resultsMode) && (
+                  {isGroupResults(resultsMode) && (
                     <QueryCardCliResultWrapper
                       loading={loading}
                       query={command}
@@ -203,7 +210,7 @@ const QueryCard = (props: Props) => {
                               id={selectedViewValue}
                               result={result}
                               query={command}
-                              setSummaryText={setSummaryText}
+                              setMessage={setMessage}
                               commandId={id}
                             />
                           ) : (

redisinsight/ui/src/components/database-overview/styles.module.scss

@@ -25,7 +25,7 @@ export interface Props {
   result: CommandExecutionResult[]
   query: any
   id: string
-  setSummaryText: (text: string) => void
+  setMessage: (text: string) => void
   commandId: string
 }
 
@@ -43,7 +43,7 @@ enum ActionTypes {
 const baseUrl = getBaseApiUrl()
 
 const QueryCardCliPlugin = (props: Props) => {
-  const { query, id, result, setSummaryText, commandId } = props
+  const { query, id, result, setMessage, commandId } = props
   const { visualizations = [], staticPath } = useSelector(appPluginsSelector)
   const { modules = [] } = useSelector(connectedInstanceSelector)
   const serverInfo = useSelector(appServerInfoSelector)
@@ -177,7 +177,7 @@ const QueryCardCliPlugin = (props: Props) => {
     })
 
     pluginApi.onEvent(generatedIframeNameRef.current, PluginEvents.setHeaderText, (text: string) => {
-      setSummaryText(text)
+      setMessage(text)
     })
 
     pluginApi.onEvent(generatedIframeNameRef.current, PluginEvents.executeRedisCommand, sendRedisCommand)