Release/2.38.0 to latest

.circleci/config.yml

@@ -1619,28 +1619,28 @@ workflows:
 
       - virustotal-url:
           name: Virus check - AppImage (nightly)
-          fileName: RedisInsight-v2-linux-x86_64.AppImage
+          fileName: RedisInsight-linux-x86_64.AppImage
       - virustotal-url:
           name: Virus check - deb (nightly)
-          fileName: RedisInsight-v2-linux-amd64.deb
+          fileName: RedisInsight-linux-amd64.deb
       - virustotal-url:
           name: Virus check - rpm (nightly)
-          fileName: RedisInsight-v2-linux-x86_64.rpm
+          fileName: RedisInsight-linux-x86_64.rpm
       - virustotal-url:
           name: Virus check - snap (nightly)
-          fileName: RedisInsight-v2-linux-amd64.snap
+          fileName: RedisInsight-linux-amd64.snap
       - virustotal-url:
           name: Virus check x64 - dmg (nightly)
-          fileName: RedisInsight-v2-mac-x64.dmg
+          fileName: RedisInsight-mac-x64.dmg
       - virustotal-url:
           name: Virus check arm64 - dmg (nightly)
-          fileName: RedisInsight-v2-mac-arm64.dmg
+          fileName: RedisInsight-mac-arm64.dmg
       - virustotal-url:
           name: Virus check MAS - pkg (nightly)
           fileName: RedisInsight-mac-universal-mas.pkg
       - virustotal-url:
           name: Virus check - exe (nightly)
-          fileName: RedisInsight-v2-win-installer.exe
+          fileName: RedisInsight-win-installer.exe
       - virustotal-report:
           name: Virus check report (prod)
           requires:

.circleci/e2e/test.exe.cmd

@@ -1,7 +1,7 @@
 @echo off
 
 set COMMON_URL=%USERPROFILE%/AppData/Local/Programs/redisinsight/resources/app.asar/dist/renderer/index.html
-set ELECTRON_PATH=%USERPROFILE%/AppData/Local/Programs/redisinsight/RedisInsight-v2.exe
+set ELECTRON_PATH=%USERPROFILE%/AppData/Local/Programs/redisinsight/RedisInsight.exe
 set OSS_STANDALONE_HOST=%E2E_CLOUD_DATABASE_HOST%
 set OSS_STANDALONE_PORT=%E2E_CLOUD_DATABASE_PORT%
 set OSS_STANDALONE_USERNAME=%E2E_CLOUD_DATABASE_USERNAME%

.circleci/redisstack/app-image.repack.sh

@@ -3,9 +3,9 @@ set -e
 
 ARCH=${ARCH:-x86_64}
 WORKING_DIRECTORY=$(pwd)
-SOURCE_APP=${SOURCE_APP:-"RedisInsight-v2-linux-$ARCH.AppImage"}
-APP_FOLDER_NAME="RedisInsight-v2-linux"
-TAR_NAME="RedisInsight-v2-app-linux.$ARCH.tar.gz"
+SOURCE_APP=${SOURCE_APP:-"RedisInsight-linux-$ARCH.AppImage"}
+APP_FOLDER_NAME="RedisInsight-linux"
+TAR_NAME="RedisInsight-app-linux.$ARCH.tar.gz"
 TMP_FOLDER="/tmp/RedisInsight-app-$ARCH"
 
 rm -rf "$TMP_FOLDER"

.circleci/redisstack/build_modules.sh

@@ -5,7 +5,7 @@ PLATFORM=${PLATFORM:-'linux'}
 ELECTRON_VERSION=$(cat electron/version)
 ARCH=${ARCH:-'x64'}
 #FILENAME="RedisInsight-$PLATFORM.$VERSION.$ARCH.zip"
-FILENAME="RedisInsight-v2-web-$PLATFORM.$ARCH.tar.gz"
+FILENAME="RedisInsight-web-$PLATFORM.$ARCH.tar.gz"
 
 # reinstall backend prod dependencies only (optimise space)
 rm -rf redisinsight/api/node_modules

.circleci/redisstack/dmg.repack.sh

@@ -3,19 +3,19 @@ set -e
 
 ARCH=${ARCH:-x64}
 WORKING_DIRECTORY=$(pwd)
-TAR_NAME="RedisInsight-v2-app-darwin.$ARCH.tar.gz"
-APP_FOLDER_NAME="RedisInsight-v2.app"
+TAR_NAME="RedisInsight-app-darwin.$ARCH.tar.gz"
+APP_FOLDER_NAME="RedisInsight.app"
 TMP_FOLDER="/tmp/$APP_FOLDER_NAME"
 
 rm -rf "$TMP_FOLDER"
 
 mkdir -p "$WORKING_DIRECTORY/release/redisstack"
 mkdir -p "$TMP_FOLDER"
 
-hdiutil attach "./release/RedisInsight-v2-mac-$ARCH.dmg"
-cp -a /Volumes/RedisInsight-*/RedisInsight-v2.app "/tmp"
+hdiutil attach "./release/RedisInsight-mac-$ARCH.dmg"
+cp -a /Volumes/RedisInsight*/RedisInsight.app "/tmp"
 cd "/tmp" || exit 1
 tar -czvf "$TAR_NAME" "$APP_FOLDER_NAME"
 cp "$TAR_NAME" "$WORKING_DIRECTORY/release/redisstack/"
 cd "$WORKING_DIRECTORY" || exit 1
-hdiutil unmount /Volumes/RedisInsight-*/
+hdiutil unmount /Volumes/RedisInsight*/

.gitignore

@@ -66,6 +66,7 @@ licenses
 /tests/e2e/results
 /tests/e2e/remote
 /tests/e2e/.redisinsight-v2
+/tests/e2e/.redisinsight-app
 
 # Parcel
 .parcel-cache

docs/plugins/installation.md

@@ -9,9 +9,9 @@ authors to avoid automatic execution of malicious code.
 
 1. Download the plugin for the Workbench.
 2. Open the `plugins` folder with the following path
-   * For MacOs: `<usersHomeDir>/.redisinsight-preview/plugins`
-   * For Windows: `C:/Users/{Username}/.redisinsight-preview/plugins`
-   * For Linux: `<usersHomeDir>/.redisinsight-preview/plugins`
+   * For MacOs: `<usersHomeDir>/.redisinsight-app/plugins`
+   * For Windows: `C:/Users/{Username}/.redisinsight-app/plugins`
+   * For Linux: `<usersHomeDir>/.redisinsight-app/plugins`
 3. Add the folder with plugin to the `plugins` folder
 
 To see the uploaded plugin visualizations in the command results, reload the Workbench 

electron-builder.json

@@ -1,5 +1,5 @@
 {
-  "productName": "RedisInsight-v2",
+  "productName": "RedisInsight",
   "appId": "org.RedisLabs.RedisInsight-V2",
   "copyright": "Copyright © 2023 Redis Ltd.",
   "files": [

jest.config.cjs

@@ -39,7 +39,6 @@ module.exports = {
     'json',
   ],
   testEnvironment: 'jest-environment-jsdom',
-  // type: 'module',
   transformIgnorePatterns: [
     'node_modules/(?!(monaco-editor|react-monaco-editor)/)',
   ],
@@ -61,8 +60,5 @@ module.exports = {
       functions: 72,
       lines: 80,
     },
-    // './redisinsight/ui/src/slices/**/*.ts': {
-    //   statements: 90,
-    // },
   },
 }

package.json

@@ -33,7 +33,7 @@
     "package:mac": "yarn build:prod && electron-builder build --mac -p never",
     "package:mac:arm": "yarn build:prod && electron-builder build --mac --arm64 -p never",
     "package:linux": "yarn build:prod && electron-builder build --linux -p never",
-    "postinstall": "skip-postinstall || (electron-builder install-app-deps && cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./configs/webpack.config.renderer.dev.dll.ts && opencollective-postinstall && yarn-deduplicate yarn.lock)",
+    "postinstall": "patch-package && skip-postinstall || (electron-builder install-app-deps && cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./configs/webpack.config.renderer.dev.dll.ts && opencollective-postinstall && yarn-deduplicate yarn.lock)",
     "start": "ts-node ./scripts/check-port-in-use.js && yarn start:renderer",
     "start:renderer": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./configs/webpack.config.renderer.dev.ts",
     "start:preload": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./configs/webpack.config.preload.dev.ts",
@@ -42,7 +42,7 @@
     "start:web:public": "cross-env PUBLIC_DEV=true NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./configs/webpack.config.web.dev.ts",
     "test": "jest ./redisinsight/ui -w 1",
     "test:watch": "jest ./redisinsight/ui --watch -w 1",
-    "test:cov": "jest ./redisinsight/ui --coverage --no-cache --forceExit -w 3",
+    "test:cov": "jest ./redisinsight/ui --silent --coverage --no-cache --forceExit -w 3",
     "test:cov:unit": "jest ./redisinsight/ui --group=-component --coverage -w 1",
     "test:cov:component": "jest ./redisinsight/ui --group=component --coverage -w 1",
     "type-check:ui": "tsc --project redisinsight/ui --noEmit"
@@ -204,6 +204,8 @@
     "msw": "^1.3.2",
     "node-sass": "^8.0.0",
     "opencollective-postinstall": "^2.0.3",
+    "patch-package": "^8.0.0",
+    "postinstall-postinstall": "^2.1.0",
     "react-hot-loader": "^4.13.0",
     "react-refresh": "^0.9.0",
     "redux-mock-store": "^1.5.4",

patches/react-vtree+3.0.0-beta.3.patch

@@ -0,0 +1,49 @@
+diff --git a/node_modules/react-vtree/dist/cjs/Tree.js b/node_modules/react-vtree/dist/cjs/Tree.js
+index c46ce3e..879f0a6 100644
+--- a/node_modules/react-vtree/dist/cjs/Tree.js
++++ b/node_modules/react-vtree/dist/cjs/Tree.js
+@@ -33,6 +33,7 @@ var Row = function Row(_ref) {
+   return /*#__PURE__*/_react.default.createElement(Node, Object.assign({
+     isScrolling: isScrolling,
+     style: style,
++    index: index,
+     treeData: treeData
+   }, data));
+ };
+diff --git a/node_modules/react-vtree/dist/es/Tree.d.ts b/node_modules/react-vtree/dist/es/Tree.d.ts
+index 5e7f57e..b216b36 100644
+--- a/node_modules/react-vtree/dist/es/Tree.d.ts
++++ b/node_modules/react-vtree/dist/es/Tree.d.ts
+@@ -24,6 +24,8 @@ export declare type NodePublicState<TData extends NodeData> = Readonly<{
+     data: TData;
+     setOpen: (state: boolean) => Promise<void>;
+ }> & {
++    index: number;
++    style: object;
+     isOpen: boolean;
+ };
+ export declare type NodeRecord<TNodePublicState extends NodePublicState<any>> = Readonly<{
+diff --git a/node_modules/react-vtree/dist/es/Tree.js b/node_modules/react-vtree/dist/es/Tree.js
+index 2b1c7c0..b22e873 100644
+--- a/node_modules/react-vtree/dist/es/Tree.js
++++ b/node_modules/react-vtree/dist/es/Tree.js
+@@ -19,6 +19,7 @@ export var Row = function Row(_ref) {
+   return /*#__PURE__*/React.createElement(Node, Object.assign({
+     isScrolling: isScrolling,
+     style: style,
++    index: index,
+     treeData: treeData
+   }, data));
+ };
+diff --git a/node_modules/react-vtree/dist/lib/Tree.js b/node_modules/react-vtree/dist/lib/Tree.js
+index fb824bd..6feba4e 100644
+--- a/node_modules/react-vtree/dist/lib/Tree.js
++++ b/node_modules/react-vtree/dist/lib/Tree.js
+@@ -17,6 +17,7 @@ export const Row = ({
+   return /*#__PURE__*/React.createElement(Node, Object.assign({
+     isScrolling: isScrolling,
+     style: style,
++    index: index,
+     treeData: treeData
+   }, data));
+ };

redisinsight/api/config/default.ts

@@ -60,7 +60,7 @@ export default {
     tlsKey: process.env.SERVER_TLS_KEY,
     staticContent: !!process.env.SERVER_STATIC_CONTENT || false,
     buildType: process.env.BUILD_TYPE || 'ELECTRON',
-    appVersion: process.env.APP_VERSION || '2.36.0',
+    appVersion: process.env.APP_VERSION || '2.38.0',
     requestTimeout: parseInt(process.env.REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],
@@ -77,7 +77,7 @@ export default {
   redis_clients: {
     idleSyncInterval: parseInt(process.env.CLIENTS_IDLE_SYNC_INTERVAL, 10) || 1000 * 60 * 60, // 1hr
     maxIdleThreshold: parseInt(process.env.CLIENTS_MAX_IDLE_THRESHOLD, 10) || 1000 * 60 * 60, // 1hr
-    retryTimes: parseInt(process.env.CLIENTS_RETRY_TIMES, 10) || 5,
+    retryTimes: parseInt(process.env.CLIENTS_RETRY_TIMES, 10) || 3,
     retryDelay: parseInt(process.env.CLIENTS_RETRY_DELAY, 10) || 500,
     maxRetriesPerRequest: parseInt(process.env.CLIENTS_MAX_RETRIES_PER_REQUEST, 10) || 1,
   },

redisinsight/api/config/production.ts

@@ -2,9 +2,9 @@ import { join } from 'path';
 import * as os from 'os';
 
 const homedir = process.env.APP_FOLDER_ABSOLUTE_PATH
-  || (join(os.homedir(), process.env.APP_FOLDER_NAME || '.redisinsight-v2'));
+  || (join(os.homedir(), process.env.APP_FOLDER_NAME || '.redisinsight-app'));
 
-const prevHomedir = join(os.homedir(), '.redisinsight-preview');
+const prevHomedir = join(os.homedir(), '.redisinsight-v2');
 
 export default {
   dir_path: {

redisinsight/api/config/staging.ts

@@ -2,9 +2,9 @@ import { join } from 'path';
 import * as os from 'os';
 
 const homedir = process.env.APP_FOLDER_ABSOLUTE_PATH
-  || (join(os.homedir(), process.env.APP_FOLDER_NAME || '.redisinsight-v2-stage'));
+  || (join(os.homedir(), process.env.APP_FOLDER_NAME || '.redisinsight-app-stage'));
 
-const prevHomedir = join(os.homedir(), '.redisinsight-v2.0-stage');
+const prevHomedir = join(os.homedir(), '.redisinsight-v2-stage');
 
 export default {
   dir_path: {

redisinsight/api/config/swagger.ts

@@ -5,7 +5,7 @@ const SWAGGER_CONFIG: Omit<OpenAPIObject, 'paths'> = {
   info: {
     title: 'RedisInsight Backend API',
     description: 'RedisInsight Backend API',
-    version: '2.36.0',
+    version: '2.38.0',
   },
   tags: [],
 };

redisinsight/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redisinsight-api",
-  "version": "2.36.0",
+  "version": "2.38.0",
   "description": "RedisInsight API",
   "private": true,
   "author": {
@@ -42,7 +42,8 @@
     "word-wrap": "1.2.4",
     "mocha/minimatch": "^3.0.5",
     "@nestjs/platform-socket.io/socket.io": "^4.7.1",
-    "**/semver": "^7.5.2"
+    "**/semver": "^7.5.2",
+    "winston-daily-rotate-file/**/file-stream-rotator": "^1.0.0"
   },
   "dependencies": {
     "@nestjs/common": "^9.0.11",

redisinsight/api/src/constants/error-messages.ts

@@ -16,6 +16,8 @@ export default {
   CONNECTION_TIMEOUT:
     'The connection has timed out, please check the connection details.',
   SERVER_CLOSED_CONNECTION: 'Server closed the connection.',
+  UNABLE_TO_ESTABLISH_CONNECTION: 'Unable to establish connection.',
+  RECONNECTING_TO_DATABASE: 'Reconnecting to the redis database.',
   AUTHENTICATION_FAILED: () => 'Failed to authenticate, please check the username or password.',
   INCORRECT_DATABASE_URL: (url) => `Could not connect to ${url}, please check the connection details.`,
   INCORRECT_CERTIFICATES: (url) => `Could not connect to ${url}, please check the CA or Client certificate.`,

redisinsight/api/src/init-helper.ts

@@ -28,6 +28,7 @@ export const migrateHomeFolder = async () => {
       await Promise.all([
         'redisinsight.db',
         'plugins',
+        'custom-tutorials',
       ].map((target) => copySource(
         join(PATH_CONFIG.prevHomedir, target),
         join(PATH_CONFIG.homedir, target),

redisinsight/api/src/modules/analytics/analytics.service.spec.ts

@@ -10,6 +10,7 @@ import { AppType } from 'src/modules/server/models/server';
 import { SettingsService } from 'src/modules/settings/settings.service';
 import {
   AnalyticsService,
+  Telemetry,
   NON_TRACKING_ANONYMOUS_ID,
 } from './analytics.service';
 
@@ -95,6 +96,11 @@ describe('AnalyticsService', () => {
         anonymousId: mockAnonymousId,
         integrations: { Amplitude: { session_id: sessionId } },
         event: TelemetryEvents.ApplicationStarted,
+        context: {
+          traits: {
+            telemetry: Telemetry.Enabled,
+          },
+        },
         properties: {
           anonymousId: mockAnonymousId,
           buildType: AppType.Electron,
@@ -128,6 +134,11 @@ describe('AnalyticsService', () => {
         anonymousId: NON_TRACKING_ANONYMOUS_ID,
         integrations: { Amplitude: { session_id: sessionId } },
         event: TelemetryEvents.ApplicationStarted,
+        context: {
+          traits: {
+            telemetry: Telemetry.Disabled,
+          },
+        },
         properties: {
           anonymousId: mockAnonymousId,
           buildType: AppType.Electron,
@@ -150,6 +161,11 @@ describe('AnalyticsService', () => {
         anonymousId: mockAnonymousId,
         integrations: { Amplitude: { session_id: sessionId } },
         event: TelemetryEvents.ApplicationStarted,
+        context: {
+          traits: {
+            telemetry: Telemetry.Enabled,
+          },
+        },
         properties: {
           anonymousId: mockAnonymousId,
           buildType: AppType.Electron,
@@ -186,6 +202,11 @@ describe('AnalyticsService', () => {
         anonymousId: mockAnonymousId,
         integrations: { Amplitude: { session_id: sessionId } },
         name: TelemetryEvents.ApplicationStarted,
+        context: {
+          traits: {
+            telemetry: Telemetry.Enabled,
+          },
+        },
         properties: {
           anonymousId: mockAnonymousId,
           buildType: AppType.Electron,
@@ -219,6 +240,11 @@ describe('AnalyticsService', () => {
         anonymousId: NON_TRACKING_ANONYMOUS_ID,
         integrations: { Amplitude: { session_id: sessionId } },
         name: TelemetryEvents.ApplicationStarted,
+        context: {
+          traits: {
+            telemetry: Telemetry.Disabled,
+          },
+        },
         properties: {
           anonymousId: mockAnonymousId,
           buildType: AppType.Electron,
@@ -241,6 +267,11 @@ describe('AnalyticsService', () => {
         anonymousId: mockAnonymousId,
         integrations: { Amplitude: { session_id: sessionId } },
         name: TelemetryEvents.ApplicationStarted,
+        context: {
+          traits: {
+            telemetry: Telemetry.Enabled,
+          },
+        },
         properties: {
           anonymousId: mockAnonymousId,
           buildType: AppType.Electron,