Merge pull request #2751 from RedisInsight/feature/RI-4437

vlad-dargel · web-flow · commit 94a818d0e4a8 · 2023-11-14T12:00:48.000+01:00
#RI-4437 - Rename RedisInsight application
diff --git a/.circleci/config.yml b/.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:
diff --git a/.circleci/e2e/test.exe.cmd b/.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%
diff --git a/.circleci/redisstack/app-image.repack.sh b/.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"
diff --git a/.circleci/redisstack/build_modules.sh b/.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
diff --git a/.circleci/redisstack/dmg.repack.sh b/.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*/
diff --git a/.gitignore b/.gitignore
@@ -66,6 +66,7 @@ licenses
 /tests/e2e/results
 /tests/e2e/remote
 /tests/e2e/.redisinsight-v2
+/tests/e2e/.redisinsight-app
 
 # Parcel
 .parcel-cache
diff --git a/docs/plugins/installation.md b/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 
diff --git a/electron-builder.json b/electron-builder.json
@@ -1,5 +1,5 @@
 {
-  "productName": "RedisInsight-v2",
+  "productName": "RedisInsight",
   "appId": "org.RedisLabs.RedisInsight-V2",
   "copyright": "Copyright © 2023 Redis Ltd.",
   "files": [
diff --git a/redisinsight/api/config/production.ts b/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: {
diff --git a/redisinsight/api/config/staging.ts b/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: {
diff --git a/redisinsight/api/src/init-helper.ts b/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),
diff --git a/redisinsight/api/src/modules/custom-tutorial/providers/custom-tutorial.fs.provider.spec.ts b/redisinsight/api/src/modules/custom-tutorial/providers/custom-tutorial.fs.provider.spec.ts
@@ -74,7 +74,7 @@ describe('CustomTutorialFsProvider', () => {
 
         prepareTmpFolderSpy.mockRestore();
         const result = await service.unzipFromMemoryStoredFile(mockCustomTutorialZipFile);
-        expect(result).toContain(`${PATH_CONFIG.tmpDir}/RedisInsight-v2/custom-tutorials`);
+        expect(result).toContain(`${PATH_CONFIG.tmpDir}/RedisInsight/custom-tutorials`);
         expect(mFs.copy).toHaveBeenCalled();
       });
     });
diff --git a/redisinsight/api/src/modules/custom-tutorial/providers/custom-tutorial.fs.provider.ts b/redisinsight/api/src/modules/custom-tutorial/providers/custom-tutorial.fs.provider.ts
@@ -11,7 +11,7 @@ import ERROR_MESSAGES from 'src/constants/error-messages';
 
 const PATH_CONFIG = config.get('dir_path');
 
-const TMP_FOLDER = `${PATH_CONFIG.tmpDir}/RedisInsight-v2/custom-tutorials`;
+const TMP_FOLDER = `${PATH_CONFIG.tmpDir}/RedisInsight/custom-tutorials`;
 
 @Injectable()
 export class CustomTutorialFsProvider {
diff --git a/redisinsight/desktop/src/lib/aboutPanel/aboutPanel.ts b/redisinsight/desktop/src/lib/aboutPanel/aboutPanel.ts
@@ -7,7 +7,7 @@ const ICON_PATH = app.isPackaged
   : path.join(__dirname, '../resources', 'icon.png')
 
 export const AboutPanelOptions = {
-  applicationName: 'RedisInsight-v2',
+  applicationName: 'RedisInsight',
   applicationVersion: `${app.getVersion() || '2.36.0'}${
     !config.isProduction ? `-dev-${process.getCreationTime()}` : ''
   }`,
diff --git a/tests/e2e/.desktop.env b/tests/e2e/.desktop.env
@@ -1,7 +1,7 @@
 COMMON_URL=https://localhost:5530
 API_URL=https://localhost:5530/api
 OSS_SENTINEL_PASSWORD=password
-APP_FOLDER_NAME=.redisinsight-v2-stage
+APP_FOLDER_NAME=.redisinsight-app-stage
 
 OSS_STANDALONE_HOST=localhost
 OSS_STANDALONE_PORT=8100
diff --git a/tests/e2e/.env b/tests/e2e/.env
@@ -1,7 +1,7 @@
 COMMON_URL=https://app:5000
 API_URL=https://app:5000/api
 OSS_SENTINEL_PASSWORD=password
-APP_FOLDER_NAME=.redisinsight-v2
+APP_FOLDER_NAME=.redisinsight-app
 NOTIFICATION_UPDATE_URL=https://s3.amazonaws.com/redisinsight.test/public/tests/e2e/notifications.json
 NOTIFICATION_SYNC_INTERVAL=30000
 RI_FEATURES_CONFIG_URL=http://static-server:5551/remote/features-config.json
diff --git a/tests/e2e/.gitignore b/tests/e2e/.gitignore
@@ -2,4 +2,6 @@ plugins
 report
 results
 remote
-.redisinsight-v2
+.redisinsight
+.redisinsight-v2
+.redisinsight-app
diff --git a/tests/e2e/docker.web.docker-compose.yml b/tests/e2e/docker.web.docker-compose.yml
@@ -10,7 +10,7 @@ services:
       - ./results:/usr/src/app/results
       - ./report:/usr/src/app/report
       - ./plugins:/usr/src/app/plugins
-      - .redisinsight-v2:/root/.redisinsight-v2
+      - .redisinsight-app:/root/.redisinsight-app
       - .ritmp:/tmp
       - ./test-data/certs:/root/certs
       - ./test-data/ssh:/root/ssh
@@ -44,7 +44,7 @@ services:
     env_file:
       - ./.env
     volumes:
-      - .redisinsight-v2:/root/.redisinsight-v2
+      - .redisinsight-app:/root/.redisinsight-app
       - .ritmp:/tmp
       - ./test-data/certs:/root/certs
       - ./test-data/ssh:/root/ssh
diff --git a/tests/e2e/helpers/conf.ts b/tests/e2e/helpers/conf.ts
@@ -9,7 +9,7 @@ export const commonUrl = process.env.COMMON_URL || 'https://localhost:5000';
 export const apiUrl = process.env.API_URL || 'https://localhost:5000/api';
 
 export const workingDirectory = process.env.APP_FOLDER_ABSOLUTE_PATH
-    || (joinPath(os.homedir(), process.env.APP_FOLDER_NAME || '.redisinsight-v2'));
+    || (joinPath(os.homedir(), process.env.APP_FOLDER_NAME || '.redisinsight-app'));
 export const fileDownloadPath = joinPath(os.homedir(), 'Downloads');
 const uniqueId = chance.string({ length: 10 });
 
diff --git a/tests/e2e/local.web.docker-compose.yml b/tests/e2e/local.web.docker-compose.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - ./results:/usr/src/app/results
       - ./plugins:/usr/src/app/plugins
-      - .redisinsight-v2:/root/.redisinsight-v2
+      - .redisinsight-app:/root/.redisinsight-app
       - ./test-data/certs:/root/certs
       - ./test-data/ssh:/root/ssh
       - ./remote:/root/remote
@@ -46,7 +46,7 @@ services:
       context: ./../../
       dockerfile: Dockerfile
     volumes:
-      - .redisinsight-v2:/root/.redisinsight-v2
+      - .redisinsight-app:/root/.redisinsight-app
       - ./test-data/certs:/root/certs
       - ./test-data/ssh:/root/ssh
     ports:
diff --git a/tests/e2e/upload-custom-plugins.sh b/tests/e2e/upload-custom-plugins.sh
@@ -6,8 +6,8 @@ curl --request GET -sL \
 
 echo "Custom plugins archive was downloaded"
 
-mkdir -p .redisinsight-v2
-unzip -o plugins.zip -d ./.redisinsight-v2/plugins
+mkdir -p .redisinsight-app
+unzip -o plugins.zip -d ./.redisinsight-app/plugins
 
 echo "Custom plugins were unarchived"
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "productName": "RedisInsight-v2",`
	`2`	`+ "productName": "RedisInsight",`
`3`	`3`	`"appId": "org.RedisLabs.RedisInsight-V2",`
`4`	`4`	`"copyright": "Copyright © 2023 Redis Ltd.",`
`5`	`5`	`"files": [`