Merge branch 'main' into e2e/feature/RI-2904-enablement-area

# Conflicts:
#	tests/e2e/pageObjects/workbench-page.ts

Author: ALENA NABOKA

.gitignore

@@ -58,3 +58,6 @@ vendor
 
 # Parcel
 .parcel-cache
+
+# caches
+.temp_cache

configs/webpack.config.web.dev.babel.js

@@ -5,6 +5,7 @@
  * https://webpack.js.org/concepts/hot-module-replacement/
  */
 
+import path from 'path';
 import webpack from 'webpack';
 import { merge } from 'webpack-merge';
 import ip from 'ip';
@@ -21,6 +22,18 @@ export default merge(commonConfig, {
 
   mode: 'development',
 
+  cache: {
+    type: 'filesystem',
+    allowCollectingMemory: true,
+    cacheDirectory: path.resolve(__dirname, '../.temp_cache'),
+    name: 'webpack',
+    maxAge: 86_400_000, // 1 day
+    buildDependencies: {
+      // This makes all dependencies of this file - build dependencies
+      config: [__filename],
+    }
+  },
+
   devtool: 'source-map',
 
   entry: [

jest.config.js

@@ -16,6 +16,7 @@ module.exports = {
     'rehype-stringify': '<rootDir>/redisinsight/__mocks__/rehypeStringify.js',
     'unist-util-visit': '<rootDir>/redisinsight/__mocks__/unistUtilsVisit.js',
     'react-children-utilities': '<rootDir>/redisinsight/__mocks__/react-children-utilities.js',
+    d3: '<rootDir>/node_modules/d3/dist/d3.min.js',
   },
   setupFiles: [
     '<rootDir>/redisinsight/ui/src/setup-env.ts',
@@ -38,6 +39,11 @@ module.exports = {
   transformIgnorePatterns: [
     'node_modules/(?!(monaco-editor|react-monaco-editor)/)',
   ],
+  // TODO: add tests for plugins
+  modulePathIgnorePatterns: [
+    '<rootDir>/redisinsight/ui/src/packages',
+    '<rootDir>/redisinsight/ui/src/mocks',
+  ],
   coverageThreshold: {
     global: {
       statements: 70,

package.json

@@ -110,6 +110,7 @@
     "@testing-library/user-event": "^14.4.3",
     "@types/axios": "^0.14.0",
     "@types/classnames": "^2.2.11",
+    "@types/d3": "^7.4.0",
     "@types/date-fns": "^2.6.0",
     "@types/detect-port": "^1.3.0",
     "@types/electron-store": "^3.2.0",
@@ -121,6 +122,7 @@
     "@types/jsonpath": "^0.2.0",
     "@types/lodash": "^4.14.171",
     "@types/node": "14.14.10",
+    "@types/react": "^18.0.20",
     "@types/react-dom": "^18.0.5",
     "@types/react-monaco-editor": "^0.16.0",
     "@types/react-redux": "^7.1.12",
@@ -216,6 +218,7 @@
     "buffer": "^6.0.3",
     "classnames": "^2.3.1",
     "connection-string": "^4.3.2",
+    "d3": "^7.6.1",
     "date-fns": "^2.16.1",
     "detect-port": "^1.3.0",
     "electron-context-menu": "^3.1.0",

redisinsight/api/migration/1663093411715-workbench-group-mode.ts

@@ -0,0 +1,24 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class workbenchGroupMode1663093411715 implements MigrationInterface {
+    name = 'workbenchGroupMode1663093411715'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DROP INDEX "IDX_5cd90dd6def1fd7c521e53fb2c"`);
+        await queryRunner.query(`CREATE TABLE "temporary_command_execution" ("id" varchar PRIMARY KEY NOT NULL, "databaseId" varchar NOT NULL, "command" text NOT NULL, "result" text NOT NULL, "role" varchar, "nodeOptions" varchar, "encryption" varchar, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "mode" varchar, "resultsMode" varchar, "summary" varchar, CONSTRAINT "FK_ea8adfe9aceceb79212142206b8" FOREIGN KEY ("databaseId") REFERENCES "database_instance" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
+        await queryRunner.query(`INSERT INTO "temporary_command_execution"("id", "databaseId", "command", "result", "role", "nodeOptions", "encryption", "createdAt", "mode") SELECT "id", "databaseId", "command", "result", "role", "nodeOptions", "encryption", "createdAt", "mode" FROM "command_execution"`);
+        await queryRunner.query(`DROP TABLE "command_execution"`);
+        await queryRunner.query(`ALTER TABLE "temporary_command_execution" RENAME TO "command_execution"`);
+        await queryRunner.query(`CREATE INDEX "IDX_5cd90dd6def1fd7c521e53fb2c" ON "command_execution" ("createdAt") `);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`DROP INDEX "IDX_5cd90dd6def1fd7c521e53fb2c"`);
+        await queryRunner.query(`ALTER TABLE "command_execution" RENAME TO "temporary_command_execution"`);
+        await queryRunner.query(`CREATE TABLE "command_execution" ("id" varchar PRIMARY KEY NOT NULL, "databaseId" varchar NOT NULL, "command" text NOT NULL, "result" text NOT NULL, "role" varchar, "nodeOptions" varchar, "encryption" varchar, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "mode" varchar, CONSTRAINT "FK_ea8adfe9aceceb79212142206b8" FOREIGN KEY ("databaseId") REFERENCES "database_instance" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`);
+        await queryRunner.query(`INSERT INTO "command_execution"("id", "databaseId", "command", "result", "role", "nodeOptions", "encryption", "createdAt", "mode") SELECT "id", "databaseId", "command", "result", "role", "nodeOptions", "encryption", "createdAt", "mode" FROM "temporary_command_execution"`);
+        await queryRunner.query(`DROP TABLE "temporary_command_execution"`);
+        await queryRunner.query(`CREATE INDEX "IDX_5cd90dd6def1fd7c521e53fb2c" ON "command_execution" ("createdAt") `);
+    }
+
+}

redisinsight/api/migration/index.ts

@@ -16,6 +16,7 @@ import { sni1650278664000 } from "./1650278664000-sni";
 import { notification1655821010349 } from './1655821010349-notification';
 import { notificationCategory1659687030433 } from './1659687030433-notification-category';
 import { workbenchMode1660664717573 } from './1660664717573-workbench-mode';
+import { workbenchGroupMode1663093411715 } from './1663093411715-workbench-group-mode';
 
 export default [
   initialMigration1614164490968,
@@ -36,4 +37,5 @@ export default [
   notification1655821010349,
   notificationCategory1659687030433,
   workbenchMode1660664717573,
+  workbenchGroupMode1663093411715,
 ];

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

@@ -16,6 +16,11 @@ export enum RunQueryMode {
   ASCII = 'ASCII',
 }
 
+export enum ResultsMode {
+  Default = 'DEFAULT',
+  GroupMode = 'GROUP_MODE',
+}
+
 export class CreateCommandExecutionDto {
   @ApiProperty({
     type: String,
@@ -38,6 +43,19 @@ export class CreateCommandExecutionDto {
   })
   mode?: RunQueryMode = RunQueryMode.ASCII;
 
+  @ApiPropertyOptional({
+    description: 'Workbench group mode',
+    default: ResultsMode.Default,
+    enum: ResultsMode,
+  })
+  @IsOptional()
+  @IsEnum(ResultsMode, {
+    message: `resultsMode must be a valid enum value. Valid values: ${Object.values(
+      ResultsMode,
+    )}.`,
+  })
+  resultsMode?: ResultsMode;
+
   @ApiPropertyOptional({
     description: 'Execute command for nodes with defined role',
     default: ClusterNodeRole.All,

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

@@ -4,7 +4,7 @@ import {
 } from 'class-validator';
 import { Type } from 'class-transformer';
 import { ClusterSingleNodeOptions } from 'src/modules/cli/dto/cli.dto';
-import { ClusterNodeRole, RunQueryMode } from './create-command-execution.dto';
+import { ClusterNodeRole, RunQueryMode, ResultsMode } from './create-command-execution.dto';
 
 export class CreateCommandExecutionsDto {
   @ApiProperty({
@@ -29,6 +29,14 @@ export class CreateCommandExecutionsDto {
   })
   mode?: RunQueryMode = RunQueryMode.ASCII;
 
+  @IsOptional()
+  @IsEnum(ResultsMode, {
+    message: `resultsMode must be a valid enum value. Valid values: ${Object.values(
+      ResultsMode,
+    )}.`,
+  })
+  resultsMode?: ResultsMode;
+
   @ApiPropertyOptional({
     description: 'Execute command for nodes with defined role',
     default: ClusterNodeRole.All,

redisinsight/api/src/modules/workbench/entities/command-execution.entity.ts

@@ -2,7 +2,7 @@ import {
   Column, CreateDateColumn, Entity, ManyToOne, PrimaryGeneratedColumn, JoinColumn, Index,
 } from 'typeorm';
 import { DatabaseInstanceEntity } from 'src/modules/core/models/database-instance.entity';
-import { RunQueryMode } from 'src/modules/workbench/dto/create-command-execution.dto';
+import { RunQueryMode, ResultsMode } from 'src/modules/workbench/dto/create-command-execution.dto';
 import { Transform } from 'class-transformer';
 
 @Entity('command_execution')
@@ -43,6 +43,20 @@ export class CommandExecutionEntity {
   @Column({ nullable: true })
   role?: string;
 
+  @Column({ nullable: true })
+  resultsMode?: string = ResultsMode.Default;
+
+  @Column({ nullable: true })
+  @Transform((object) => JSON.stringify(object), { toClassOnly: true })
+  @Transform((string) => {
+    try {
+      return JSON.parse(string);
+    } catch (e) {
+      return undefined;
+    }
+  }, { toPlainOnly: true })
+  summary?: string;
+
   @Column({ nullable: true })
   @Transform((object) => JSON.stringify(object), { toClassOnly: true })
   @Transform((string) => {

redisinsight/api/src/modules/workbench/models/command-execution.ts

@@ -1,9 +1,33 @@
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import { IsDefined } from 'class-validator';
 import { CommandExecutionResult } from 'src/modules/workbench/models/command-execution-result';
-import { ClusterNodeRole, RunQueryMode } from 'src/modules/workbench/dto/create-command-execution.dto';
+import { ClusterNodeRole, RunQueryMode, ResultsMode } from 'src/modules/workbench/dto/create-command-execution.dto';
 import { ClusterSingleNodeOptions } from 'src/modules/cli/dto/cli.dto';
 import { Expose } from 'class-transformer';
 
+export class ResultsSummary {
+  @ApiProperty({
+    description: 'Total number of commands executed',
+    type: Number,
+  })
+  @IsDefined()
+  total: number;
+
+  @ApiProperty({
+    description: 'Total number of successful commands executed',
+    type: Number,
+  })
+  @IsDefined()
+  success: number;
+
+  @ApiProperty({
+    description: 'Total number of failed commands executed',
+    type: Number,
+  })
+  @IsDefined()
+  fail: number;
+}
+
 export class CommandExecution {
   @ApiProperty({
     description: 'Command execution id',
@@ -34,6 +58,21 @@ export class CommandExecution {
   @Expose()
   mode?: RunQueryMode = RunQueryMode.ASCII;
 
+  @ApiPropertyOptional({
+    description: 'Workbench result mode',
+    default: ResultsMode.Default,
+    enum: ResultsMode,
+  })
+  @Expose()
+  resultsMode?: ResultsMode = ResultsMode.Default;
+
+  @ApiPropertyOptional({
+    description: 'Workbench executions summary',
+    type: () => ResultsSummary,
+  })
+  @Expose()
+  summary?: ResultsSummary;
+
   @ApiProperty({
     description: 'Command execution result',
     type: () => CommandExecutionResult,
@@ -42,6 +81,13 @@ export class CommandExecution {
   @Expose()
   result: CommandExecutionResult[];
 
+  @ApiPropertyOptional({
+    description: 'Result did not stored in db',
+    type: Boolean,
+  })
+  @Expose()
+  isNotStored?: boolean;
+
   @ApiPropertyOptional({
     description: 'Nodes roles where command was executed',
     default: ClusterNodeRole.All,