#RI-5280 - Rename application

Author: egor-zalenski

.gitignore

@@ -67,6 +67,7 @@ licenses
 /tests/e2e/remote
 /tests/e2e/.redisinsight-v2
 /tests/e2e/.redisinsight-app
+/tests/e2e/.redisinsight-insight
 
 # 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-app/plugins`
-   * For Windows: `C:/Users/{Username}/.redisinsight-app/plugins`
-   * For Linux: `<usersHomeDir>/.redisinsight-app/plugins`
+   * For MacOs: `<usersHomeDir>/.redis-insight/plugins`
+   * For Windows: `C:/Users/{Username}/.redis-insight/plugins`
+   * For Linux: `<usersHomeDir>/.redis-insight/plugins`
 3. Add the folder with plugin to the `plugins` folder
 
 To see the uploaded plugin visualizations in the command results, reload the Workbench 

redisinsight/api/config/production.ts

@@ -2,9 +2,9 @@ import { join } from 'path';
 import * as os from 'os';
 
 const homedir = process.env.RI_APP_FOLDER_ABSOLUTE_PATH
-  || (join(os.homedir(), process.env.RI_APP_FOLDER_NAME || '.redisinsight-app'));
+  || (join(os.homedir(), process.env.RI_APP_FOLDER_NAME || '.redis-insight'));
 
-const prevHomedir = join(os.homedir(), '.redisinsight-v2');
+const prevHomedir = join(os.homedir(), '.redisinsight-app');
 
 export default {
   dir_path: {
@@ -14,11 +14,15 @@ export default {
     customPlugins: join(homedir, 'plugins'),
     customTutorials: join(homedir, 'custom-tutorials'),
     commands: join(homedir, 'commands'),
-    guides: process.env.RI_GUIDES_PATH || join(homedir, 'guides'),
     tutorials: process.env.RI_TUTORIALS_PATH || join(homedir, 'tutorials'),
     content: process.env.RI_CONTENT_PATH || join(homedir, 'content'),
     caCertificates: join(homedir, 'ca_certificates'),
     clientCertificates: join(homedir, 'client_certificates'),
+    oldFolders: [
+      join(os.homedir(), '.redisinsight-preview'),
+      join(os.homedir(), '.redisinsight-v2'),
+      process.env.RI_GUIDES_PATH || join(homedir, 'guides'),
+    ]
   },
   server: {
     env: 'production',

redisinsight/api/src/init-helper.ts

@@ -34,20 +34,35 @@ export const migrateHomeFolder = async () => {
         join(PATH_CONFIG.homedir, target),
       )));
     }
+
+    return true
   } catch (e) {
     // continue initialization even without migration
+    return false
   }
 };
 
 /**
- * Remove old guides folder
+ * Remove old folders
  */
-export const removeGuidesFolder = async () => {
+export const removeOldFolders = async () => {
   try {
-    if (await fs.pathExists(PATH_CONFIG.guides)) {
-      await fs.rm(PATH_CONFIG.guides, { recursive: true, force: true });
+    // remove old folders
+    await PATH_CONFIG.oldFolders?.map(removeFolder)
+  } catch (e) {
+    // continue initialization even without removing
+  }
+};
+
+/**
+ * Remove a folder
+ */
+export const removeFolder = async (path: string) => {
+  try {
+    if (await fs.pathExists(path)) {
+      await fs.rm(path, { recursive: true, force: true });
     }
   } catch (e) {
-    // continue initialization even without migration
+    // continue initialization even without removing
   }
 };

redisinsight/api/src/main.ts

@@ -7,7 +7,7 @@ import * as bodyParser from 'body-parser';
 import { WinstonModule } from 'nest-winston';
 import { GlobalExceptionFilter } from 'src/exceptions/global-exception.filter';
 import { get, Config } from 'src/utils';
-import { migrateHomeFolder, removeGuidesFolder } from 'src/init-helper';
+import { migrateHomeFolder, removeOldFolders } from 'src/init-helper';
 import { LogFileProvider } from 'src/modules/profiler/providers/log-file.provider';
 import { WindowsAuthAdapter } from 'src/modules/auth/window-auth/adapters/window-auth.adapter';
 import { AppModule } from './app.module';
@@ -23,8 +23,7 @@ interface IApp {
 }
 
 export default async function bootstrap(apiPort?: number): Promise<IApp> {
-  await migrateHomeFolder();
-  await removeGuidesFolder();
+  await migrateHomeFolder() && await removeOldFolders();
 
   const { port, host } = serverConfig;
   const logger = WinstonModule.createLogger(LOGGER_CONFIG);