Release/2.10.0

.eslintignore

@@ -57,3 +57,7 @@ package.json
 *.css.d.ts
 *.sass.d.ts
 *.scss.d.ts
+
+# temp folders - remove in future after fix all issues
+redisinsight/ui/src/packages/redisgraph
+redisinsight/ui/src/packages/redistimeseries-app

.gitignore

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

README.md

@@ -20,28 +20,29 @@ RedisInsight is an intuitive and efficient GUI for Redis, allowing you to intera
 
 ### RedisInsight Highlights:
 
-* Browse, filter and visualise your key-value Redis data structures
-* CRUD support for Lists, Hashes, Strings, Sets, Sorted Sets 
+* Browse, filter, visualise your key-value Redis data structures and see key values in different formats (including JSON, Hex, ASCII, etc.)
+* CRUD support for Lists, Hashes, Strings, Sets, Sorted Sets, and Streams
 * CRUD support for [RedisJSON](https://oss.redis.com/redisjson/)
-* Profiler - analyze every command sent to Redis in real-time 
-* Introducing Workbench - advanced command line interface with intelligent command auto-complete and complex data visualizations
+* Profiler - analyze every command sent to Redis in real-time
+* SlowLog - analyze slow operations in Redis instances based on the [Slowlog](https://github.com/RedisInsight/RedisInsight/releases#:~:text=results%20of%20the-,Slowlog,-command%20to%20analyze) command
+* Pub/Sub - support for [Redis pub/sub](https://redis.io/docs/manual/pubsub/), enabling subscription to channels and posting messages to channels
+* Bulk actions - Delete the keys in bulk based on the filters set in Browser or Tree view
+* Introducing Workbench - advanced command line interface with intelligent command auto-complete, complex data visualizations and support for the raw mode
 * Command auto-complete support for [RediSearch](https://oss.redis.com/redisearch/), [RedisJSON](https://oss.redis.com/redisjson/), [RedisGraph](https://oss.redis.com/redisgraph/), [RedisTimeSeries](https://oss.redis.com/redistimeseries/), [RedisAI](https://oss.redis.com/redisai/)
 * Visualizations of your [RediSearch](https://oss.redis.com/redisearch/) index, queries, and aggregations
 * Ability to build your own data visualization plugins
 * Built-in click-through guides for Redis capabilities
 * Oficially supported for Redis OSS, [Redis Cloud](https://redis.com/try-free/). Works with Microsoft Azure Cache for Redis (official support upcoming).
-* Available for macOS, Windows and Linux 
+* Available for macOS (including M1), Windows and Linux 
 
 Check out the [release notes](https://docs.redis.com/latest/ri/release-notes/). 
 
 ## Get started with RedisInsight
 
-This repository includes the code for RedisInsight 2.0, Currently available in public preview. Check out the [blogpost](https://redis.com/blog/introducing-redisinsight-2/) announcing it. 
-
-The current GA version of RedisInsight is 1.11. You can install RedisInsight 2.0 along with the GA version. 
+This repository includes the code for the GA version of RedisInsight 2.0. Check out the [blogpost](https://redis.com/blog/introducing-redisinsight-2/) announcing it. 
 
 ### Installable 
-Available to download for free from [here](https://redis.com/redis-enterprise/redis-insight/#insight-form). 
+Available to download for free from [here](https://redis.com/redis-enterprise/redis-insight/#insight-form).
 
 ### Build 
 Alternatively you can also build from source. See our wiki for instructions.

configs/webpack.config.base.js

@@ -54,7 +54,7 @@ export default {
           // 'pnpapi',
           'cache-manager',
           // 'class-validator',
-          'fastify-static',
+          '@fastify/static',
           'fastify-swagger',
           // 'hiredis',
           // 'reflect-metadata',

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: [

electron-builder.json

@@ -75,8 +75,7 @@
     "desktop": {
       "Name": "RedisInsight",
       "Type": "Application",
-      "Comment": "Redis GUI by Redis Ltd",
-      "Terminal": "true"
+      "Comment": "Redis GUI by Redis Ltd"
     }
   },
   "directories": {

jest.config.js

@@ -16,7 +16,11 @@ 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',
+  ],
   setupFilesAfterEnv: [
     '<rootDir>/redisinsight/ui/src/setup-tests.ts',
   ],
@@ -35,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

@@ -38,7 +38,8 @@
     "start:web:public": "cross-env PUBLIC_DEV=true webpack serve --config ./configs/webpack.config.web.dev.babel.js",
     "test": "jest ./redisinsight/ui -w 1",
     "test:watch": "jest ./redisinsight/ui --watch -w 1",
-    "test:cov": "jest ./redisinsight/ui --coverage -w 1"
+    "test:cov": "jest ./redisinsight/ui --coverage -w 1",
+    "type-check:ui": "tsc --project redisinsight/ui --noEmit"
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx}": [
@@ -106,8 +107,10 @@
     "@teamsupercell/typings-for-css-modules-loader": "^2.4.0",
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^13.3.0",
+    "@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",
@@ -119,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",
@@ -174,6 +178,7 @@
     "mini-css-extract-plugin": "^1.3.1",
     "moment": "^2.29.3",
     "monaco-editor-webpack-plugin": "^6.0.0",
+    "msw": "^0.45.0",
     "node-sass": "^6.0.1",
     "opencollective-postinstall": "^2.0.3",
     "react-hot-loader": "^4.13.0",
@@ -201,6 +206,7 @@
     "webpack-cli": "^4.3.0",
     "webpack-dev-server": "^3.11.0",
     "webpack-merge": "^5.4.0",
+    "whatwg-fetch": "^3.6.2",
     "yarn-deduplicate": "^3.1.0"
   },
   "dependencies": {
@@ -212,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",
@@ -221,8 +228,12 @@
     "formik": "^2.2.9",
     "html-entities": "^2.3.2",
     "html-react-parser": "^1.2.4",
+    "java-object-serialization": "^0.1.1",
+    "jpickle": "^0.4.1",
     "jsonpath": "^1.1.1",
     "lodash": "^4.17.21",
+    "php-serialize": "^4.0.2",
+    "rawproto": "^0.7.6",
     "react": "^18.2.0",
     "react-contenteditable": "^3.3.5",
     "react-dom": "^18.2.0",

redisinsight/api/config/ormconfig.ts

@@ -29,9 +29,6 @@ const ormConfig: TypeOrmModuleOptions = {
     NotificationEntity,
   ],
   migrations,
-  cli: {
-    migrationsDir: 'migration',
-  },
 };
 
 export default ormConfig;

redisinsight/api/config/production.ts

@@ -22,6 +22,9 @@ export default {
   server: {
     env: 'production',
   },
+  analytics: {
+    writeKey: process.env.SEGMENT_WRITE_KEY || 'lK5MNZgHbxj6vQwFgqZxygA0BiDQb32n',
+  },
   db: {
     database: join(homedir, 'redisinsight.db'),
   },

redisinsight/api/config/staging.ts

@@ -22,6 +22,9 @@ export default {
   server: {
     env: 'staging',
   },
+  analytics: {
+    writeKey: process.env.SEGMENT_WRITE_KEY || 'Ba1YuGnxzsQN9zjqTSvzPc6f3AvmH1mj',
+  },
   db: {
     database: join(homedir, 'redisinsight.db'),
   },

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/package.json

@@ -38,15 +38,15 @@
     "typeorm:run": "yarn typeorm migration:run"
   },
   "dependencies": {
-    "@nestjs/common": "^7.6.15",
-    "@nestjs/core": "^7.0.0",
-    "@nestjs/event-emitter": "^1.0.0",
-    "@nestjs/platform-express": "^7.0.0",
-    "@nestjs/platform-socket.io": "^8.2.3",
-    "@nestjs/serve-static": "^2.1.3",
-    "@nestjs/swagger": "^4.6.1",
-    "@nestjs/typeorm": "^7.1.5",
-    "@nestjs/websockets": "^8.2.3",
+    "@nestjs/common": "^9.0.11",
+    "@nestjs/core": "^9.0.11",
+    "@nestjs/event-emitter": "^1.3.1",
+    "@nestjs/platform-express": "^9.0.11",
+    "@nestjs/platform-socket.io": "^9.0.11",
+    "@nestjs/serve-static": "^3.0.0",
+    "@nestjs/swagger": "^6.1.2",
+    "@nestjs/typeorm": "^9.0.1",
+    "@nestjs/websockets": "^9.0.11",
     "adm-zip": "^0.5.9",
     "analytics-node": "^4.0.1",
     "axios": "^0.25.0",
@@ -56,31 +56,30 @@
     "dotenv": "^16.0.0",
     "express": "^4.17.1",
     "fs-extra": "^10.0.0",
-    "ioredis": "^4.27.1",
+    "ioredis": "^5.2.2",
     "is-glob": "^4.0.1",
-    "keytar": "^7.7.0",
+    "keytar": "^7.9.0",
     "lodash": "^4.17.20",
     "nest-router": "^1.0.9",
     "nest-winston": "^1.4.0",
     "reflect-metadata": "^0.1.13",
-    "rxjs": "^6.6.7",
+    "rxjs": "^7.5.6",
     "socket.io": "^4.4.0",
     "source-map-support": "^0.5.19",
-    "sqlite3": "^5.0.2",
+    "sqlite3": "^5.0.11",
     "swagger-ui-express": "^4.1.4",
-    "typeorm": "^0.2.29",
+    "typeorm": "^0.3.9",
     "uuid": "^8.3.2",
     "winston": "^3.3.3",
     "winston-daily-rotate-file": "^4.5.0"
   },
   "devDependencies": {
     "@mochajs/json-file-reporter": "^1.3.0",
-    "@nestjs/cli": "^7.5.4",
-    "@nestjs/schematics": "^7.0.0",
-    "@nestjs/testing": "^7.0.0",
+    "@nestjs/cli": "^9.1.2",
+    "@nestjs/schematics": "^9.0.3",
+    "@nestjs/testing": "^9.0.11",
     "@types/axios": "^0.14.0",
     "@types/express": "^4.17.3",
-    "@types/ioredis": "^4.22.3",
     "@types/jest": "^26.0.15",
     "@types/lodash": "^4.14.167",
     "@types/node": "14.14.10",
@@ -96,7 +95,7 @@
     "eslint-config-prettier": "^6.10.0",
     "eslint-plugin-import": "^2.20.1",
     "eslint-plugin-sonarjs": "^0.9.1",
-    "ioredis-mock": "^5.5.4",
+    "ioredis-mock": "^8.2.2",
     "jest": "^26.6.3",
     "jest-when": "^3.2.1",
     "joi": "^17.4.0",

redisinsight/api/src/__mocks__/analytics.ts

@@ -19,6 +19,7 @@ export const mockCliAnalyticsService = () => ({
 });
 
 export const mockWorkbenchAnalyticsService = () => ({
+  sendCommandExecutedEvents: jest.fn(),
   sendCommandExecutedEvent: jest.fn(),
   sendCommandDeletedEvent: jest.fn(),
 });

redisinsight/api/src/__mocks__/common.ts

@@ -46,6 +46,7 @@ export const mockCreateQueryBuilder = jest.fn(() => ({
 
 export const mockRepository = jest.fn(() => ({
   findOne: jest.fn(),
+  findOneBy: jest.fn(),
   find: jest.fn(),
   findByIds: jest.fn(),
   create: jest.fn(),

redisinsight/api/src/app.module.ts

@@ -15,6 +15,7 @@ import { SlowLogModule } from 'src/modules/slow-log/slow-log.module';
 import { PubSubModule } from 'src/modules/pub-sub/pub-sub.module';
 import { NotificationModule } from 'src/modules/notification/notification.module';
 import { BulkActionsModule } from 'src/modules/bulk-actions/bulk-actions.module';
+import { ClusterMonitorModule } from 'src/modules/cluster-monitor/cluster-monitor.module';
 import { SharedModule } from './modules/shared/shared.module';
 import { InstancesModule } from './modules/instances/instances.module';
 import { BrowserModule } from './modules/browser/browser.module';
@@ -50,6 +51,7 @@ const PATH_CONFIG = config.get('dir_path');
     SlowLogModule,
     NotificationModule,
     BulkActionsModule,
+    ClusterMonitorModule,
     EventEmitterModule.forRoot(),
     ...(SERVER_CONFIG.staticContent
       ? [

redisinsight/api/src/app.routes.ts

@@ -7,6 +7,7 @@ import { CliModule } from 'src/modules/cli/cli.module';
 import { WorkbenchModule } from 'src/modules/workbench/workbench.module';
 import { SlowLogModule } from 'src/modules/slow-log/slow-log.module';
 import { PubSubModule } from 'src/modules/pub-sub/pub-sub.module';
+import { ClusterMonitorModule } from 'src/modules/cluster-monitor/cluster-monitor.module';
 
 export const routes: Routes = [
   {
@@ -33,6 +34,10 @@ export const routes: Routes = [
         path: '/:dbInstance',
         module: PubSubModule,
       },
+      {
+        path: '/:dbInstance',
+        module: ClusterMonitorModule,
+      },
     ],
   },
   {