Merge branch 'main' of https://github.com/RedisInsight/RedisInsight into feature/RI-2509-wb-group-mode

Author: AmirAllayarovSofteq

.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,7 +399,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 \
@@ -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 \
@@ -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

.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",
@@ -216,6 +217,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",