Merge branch 'main' into feature/RI-2743_Enhanced_overview

Author: Artem

.circleci/config.yml

@@ -311,7 +311,7 @@ jobs:
       - run:
           name: .AppImage tests
           command: |
-            cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split) && cd ../..
+            cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
             .circleci/e2e/test.app-image.sh
       - when:
           condition:
@@ -348,7 +348,7 @@ jobs:
       - run: choco install nodejs --version=16.15.1
       - run:
           command: |
-            cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split) && cd ../..
+            cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
             .circleci/e2e/test.exe.cmd
           shell: bash.exe
       - when:
@@ -399,12 +399,12 @@ jobs:
             - run:
                 name: Run tests
                 command: |
-                  cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split) && cd ../..
+                  cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
                   TEST_BIG_DB_DUMP=$TEST_BIG_DB_DUMP \
                   docker-compose \
                   -f tests/e2e/rte.docker-compose.yml \
                   -f tests/e2e/docker.web.docker-compose.yml \
-                  up --abort-on-container-exit --force-recreate
+                  up --abort-on-container-exit --force-recreate --build
                 no_output_timeout: 5m
       - when:
           condition:
@@ -413,7 +413,7 @@ jobs:
             - run:
                 name: Run tests
                 command: |
-                  cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split) && cd ../..
+                  cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
                   TEST_BIG_DB_DUMP=$TEST_BIG_DB_DUMP \
                   docker-compose \
                   -f tests/e2e/rte.docker-compose.yml \
@@ -675,7 +675,7 @@ jobs:
       - <<: *scan
       - <<: *validate
   docker:
-    executor: linux-executor-dlc
+    executor: linux-executor
     parameters:
       env:
         type: enum
@@ -1218,12 +1218,12 @@ workflows:
           requires:
             - Build docker image
       # e2e desktop tests on AppImage build
-      - e2e-app-image:
-          name: E2ETest (AppImage) - Nightly
-          parallelism: 4
-          report: true
-          requires:
-            - Build app - Linux (stage)
+      # - e2e-app-image:
+      #     name: E2ETest (AppImage) - Nightly
+      #     parallelism: 4
+      #     report: true
+      #     requires:
+      #       - Build app - Linux (stage)
       # # e2e desktop tests on exe build
       # - e2e-exe:
       #     name: E2ETest (exe) - Nightly

README.md

@@ -39,12 +39,10 @@ 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',

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": {

package.json

@@ -226,6 +226,7 @@
     "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",

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/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",
@@ -63,21 +63,21 @@
     "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.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/jest": "^26.0.15",

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(),
 });