Merge branch 'main' into fe/bugfix/RI-5610

Author: rsergeenko

.circleci/build/build.Dockerfile

@@ -28,8 +28,8 @@ RUN mkdir -p /data && chown -R node:node /data
 COPY --chown=node:node ./docker-entry.sh ./
 RUN chmod +x docker-entry.sh
 
-# since RI is hard-code to port 5000, expose it from the container
-EXPOSE 5000
+# since RI is hard-code to port 5540, expose it from the container
+EXPOSE 5540
 
 # don't run the node process as root
 USER node

.circleci/build/release-docker.sh

@@ -2,7 +2,7 @@
 set -e
 
 HELP="Args:
--v - Semver (2.64.0)
+-v - Semver (2.64.1)
 -d - Build image repository (Ex: -d redisinsight)
 -r - Target repository (Ex: -r redis/redisinsight)
 "

.github/build/build.Dockerfile

@@ -28,8 +28,8 @@ RUN mkdir -p /data && chown -R node:node /data
 COPY --chown=node:node ./docker-entry.sh ./
 RUN chmod +x docker-entry.sh
 
-# since RI is hard-code to port 5000, expose it from the container
-EXPOSE 5000
+# since RI is hard-code to port 5540, expose it from the container
+EXPOSE 5540
 
 # don't run the node process as root
 USER node

.github/build/release-docker.sh

@@ -2,7 +2,7 @@
 set -e
 
 HELP="Args:
--v - Semver (2.64.0)
+-v - Semver (2.64.1)
 -d - Build image repository (Ex: -d redisinsight)
 -r - Target repository (Ex: -r redis/redisinsight)
 "

.github/workflows/tests-integration.yml

@@ -114,6 +114,10 @@ jobs:
       run: |
         docker image load -i ./release/docker/docker-linux-alpine.amd64.tar
 
+    - name: Make sure coverage dir exists
+      # Important: this directory is mounted on both the `app` and `test` Docker containers.
+      run: mkdir -p ./redisinsight/api/test/test-runs/coverage
+
     - name: Run tests
       timeout-minutes: 20
       run: |
@@ -122,7 +126,7 @@ jobs:
         fi
 
         ./redisinsight/api/test/test-runs/start-test-run.sh -r ${{ matrix.rte }} -t ${{ inputs.build }}
-        mkdir -p mkdir itest/coverages && mkdir -p itest/results
+        mkdir -p itest/coverages && mkdir -p itest/results
 
         cp ./redisinsight/api/test/test-runs/coverage/test-run-result.json ./itest/results/${{ matrix.rte }}.result.json
         cp ./redisinsight/api/test/test-runs/coverage/test-run-result.xml ./itest/results/${{ matrix.rte }}.result.xml

babel.config.cjs

@@ -8,6 +8,7 @@ module.exports = (api) => {
       require('@babel/preset-env'),
       require('@babel/preset-typescript'),
       [require('@babel/preset-react'), { development }],
+      [require('babel-preset-vite'), { env: true, glob: false }],
     ],
   }
 }

jest.config.cjs

@@ -25,6 +25,7 @@ module.exports = {
     d3: '<rootDir>/node_modules/d3/dist/d3.min.js',
     '^uuid$': require.resolve('uuid'),
     msgpackr: require.resolve('msgpackr'),
+    'brotli-dec-wasm': '<rootDir>/redisinsight/__mocks__/brotli-dec-wasm.js',
   },
   setupFiles: [
     'construct-style-sheets-polyfill',
@@ -35,7 +36,7 @@ module.exports = {
   moduleFileExtensions: ['js', 'jsx', 'ts', 'tsx', 'json'],
   testEnvironment: 'jest-environment-jsdom',
   transformIgnorePatterns: [
-    'node_modules/(?!(monaco-editor|react-monaco-editor)/)',
+    'node_modules/(?!(monaco-editor|react-monaco-editor|brotli-dec-wasm)/)',
   ],
   // TODO: add tests for plugins
   modulePathIgnorePatterns: [
@@ -70,4 +71,4 @@ module.exports = {
   globals: {
     riConfig: {}
   }
-};
+}

package.json

@@ -87,6 +87,7 @@
     "word-wrap": "1.2.4",
     "**/semver": "^7.5.2",
     "rawproto/protobufjs": "^7.2.5",
+    "@electron/notarize": "2.3.2",
     "webpack-bundle-analyzer/ws": "^7.5.10",
     "msw/path-to-regexp": "^6.3.0",
     "msw/cookie": "^0.7.0",
@@ -139,6 +140,7 @@
     "@vitejs/plugin-react": "^4.2.1",
     "@vitejs/plugin-react-swc": "^3.6.0",
     "assert": "^2.1.0",
+    "babel-preset-vite": "^1.1.3",
     "concurrently": "^9.0.1",
     "construct-style-sheets-polyfill": "^3.1.0",
     "copyfiles": "^2.4.1",
@@ -197,7 +199,7 @@
     "supertest": "^4.0.2",
     "terser-webpack-plugin": "^5.3.10",
     "text-encoding": "^0.7.0",
-    "ts-jest": "27.1.5",
+    "ts-jest": "^29.2.5",
     "ts-loader": "^9.5.1",
     "ts-mockito": "^2.6.1",
     "ts-node": "^10.9.1",
@@ -225,7 +227,7 @@
     "@reduxjs/toolkit": "^1.6.2",
     "@stablelib/snappy": "^1.0.2",
     "axios": "^1.7.4",
-    "brotli-unicode": "^1.0.2",
+    "brotli-dec-wasm": "^2.3.0",
     "buffer": "^6.0.3",
     "classnames": "^2.3.1",
     "connection-string": "^4.3.2",

redisinsight/__mocks__/brotli-dec-wasm.js

@@ -0,0 +1 @@
+export default () => Promise.resolve()

redisinsight/api/config/default.ts

@@ -80,7 +80,7 @@ export default {
     migrateOldFolders: process.env.RI_MIGRATE_OLD_FOLDERS ? process.env.RI_MIGRATE_OLD_FOLDERS === 'true' : true,
     autoBootstrap: process.env.RI_AUTO_BOOTSTRAP ? process.env.RI_AUTO_BOOTSTRAP === 'true' : true,
     buildType: process.env.RI_BUILD_TYPE || 'DOCKER_ON_PREMISE',
-    appVersion: process.env.RI_APP_VERSION || '2.64.0',
+    appVersion: process.env.RI_APP_VERSION || '2.64.1',
     requestTimeout: parseInt(process.env.RI_REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],