#RI-4437 - changed folder from .redisinsight to .redisinsight-app

Author: egor-zalenski

redisinsight/api/config/default.ts

@@ -20,7 +20,6 @@ export default {
     tmpDir: os.tmpdir(),
     homedir,
     prevHomedir: homedir,
-    v2Homedir: homedir,
     staticDir,
     defaultsDir,
     logs: join(homedir, 'logs'),

redisinsight/api/config/production.ts

@@ -1,19 +1,15 @@
 import { join } from 'path';
 import * as os from 'os';
-import { getHomedir } from '../src/config-helper';
 
-const homedirInit = process.env.APP_FOLDER_ABSOLUTE_PATH
-  || (join(os.homedir(), process.env.APP_FOLDER_NAME || '.redisinsight'));
+const homedir = process.env.APP_FOLDER_ABSOLUTE_PATH
+  || (join(os.homedir(), process.env.APP_FOLDER_NAME || '.redisinsight-app'));
 
-const prevHomedir = join(os.homedir(), '.redisinsight-preview');
-const v2Homedir = join(os.homedir(), '.redisinsight-v2');
-const homedir = getHomedir(homedirInit, v2Homedir);
+const prevHomedir = join(os.homedir(), '.redisinsight-v2');
 
 export default {
   dir_path: {
     homedir,
     prevHomedir,
-    v2Homedir,
     logs: join(homedir, 'logs'),
     customPlugins: join(homedir, 'plugins'),
     customTutorials: join(homedir, 'custom-tutorials'),

redisinsight/api/config/staging.ts

@@ -1,19 +1,15 @@
 import { join } from 'path';
 import * as os from 'os';
-import { getHomedir } from '../src/config-helper';
 
-const homedirInit = process.env.APP_FOLDER_ABSOLUTE_PATH
-  || (join(os.homedir(), process.env.APP_FOLDER_NAME || '.redisinsight-stage'));
+const homedir = process.env.APP_FOLDER_ABSOLUTE_PATH
+  || (join(os.homedir(), process.env.APP_FOLDER_NAME || '.redisinsight-app-stage'));
 
-const prevHomedir = join(os.homedir(), '.redisinsight-v2.0-stage');
-const v2Homedir = join(os.homedir(), '.redisinsight-v2-stage');
-const homedir = getHomedir(homedirInit, v2Homedir);
+const prevHomedir = join(os.homedir(), '.redisinsight-v2-stage');
 
 export default {
   dir_path: {
     homedir,
     prevHomedir,
-    v2Homedir,
     logs: join(homedir, 'logs'),
     customPlugins: join(homedir, 'plugins'),
     customTutorials: join(homedir, 'custom-tutorials'),

redisinsight/api/src/init-helper.ts

@@ -4,6 +4,7 @@ import { join } from 'path';
 import config from 'src/utils/config';
 
 const PATH_CONFIG = config.get('dir_path');
+const DB_CONFIG = config.get('db');
 
 /**
  * Copy source if exists
@@ -16,37 +17,22 @@ const copySource = async (source, destination) => {
   }
 };
 
-/**
- * Conditional data migration to new 'homedir' location
- * @param homedir
- * @param prevHomedir
- */
-const migrateData = async (homedir: string, prevHomedir: string) => {
-  if (await fs.pathExists(prevHomedir)) {
-    await fs.ensureDir(homedir);
-
-    await Promise.all([
-      'redisinsight.db',
-      'plugins',
-      'custom-tutorials',
-    ].map((target) => copySource(
-      join(prevHomedir, target),
-      join(homedir, target),
-    )));
-
-    // remove previous folder
-    await fs.rm(prevHomedir, { recursive: true, force: true });
-  }
-};
-
 /**
  * Migrate data from previous home folder defined in configs
  */
 export const migrateHomeFolder = async () => {
   try {
-    if(!(await fs.pathExists(join(PATH_CONFIG.homedir, 'plugins')))) {
-      await migrateData(PATH_CONFIG.homedir, PATH_CONFIG.prevHomedir); // from .redisinsight-preview folder
-      await migrateData(PATH_CONFIG.homedir, PATH_CONFIG.v2Homedir); // from .redisinsight-v2 folder
+    if (!(await fs.pathExists(DB_CONFIG.database)) && await fs.pathExists(PATH_CONFIG.prevHomedir)) {
+      await fs.ensureDir(PATH_CONFIG.homedir);
+
+      await Promise.all([
+        'redisinsight.db',
+        'plugins',
+        'custom-tutorials',
+      ].map((target) => copySource(
+        join(PATH_CONFIG.prevHomedir, target),
+        join(PATH_CONFIG.homedir, target),
+      )));
     }
   } catch (e) {
     // continue initialization even without migration