add last changes\fixes from recording branch

Author: Artem

.circleci/config.yml

@@ -497,8 +497,8 @@ jobs:
           root: .
           paths:
             - release/RedisInsight*.deb
-            - release/RedisInsight*.AppImage
             - release/RedisInsight*.rpm
+            - release/RedisInsight*.AppImage
             - release/*-linux.yml
             - release/redisstack
   macosx:

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

@@ -3,6 +3,7 @@
 ARCH=${ARCH:-x64}
 WORKING_DIRECTORY=$(pwd)
 SOURCE_APP=${SOURCE_APP:-"RedisInsight-preview-linux.AppImage"}
+APP_FOLDER_NAME="RedisInsight-preview-linux"
 TAR_NAME="RedisInsight-preview-app-linux.$ARCH.tar.gz"
 TMP_FOLDER="/tmp/RedisInsight-app-$ARCH"
 
@@ -15,8 +16,9 @@ cp "./release/$SOURCE_APP" "$TMP_FOLDER"
 cd "$TMP_FOLDER" || exit 1
 
 ./"$SOURCE_APP" --appimage-extract
-cd squashfs-root || exit 1
+mv squashfs-root "$APP_FOLDER_NAME"
+
+tar -czvf "$TAR_NAME" "$APP_FOLDER_NAME"
 
-tar -czvf "$TAR_NAME" ./*
 cp "$TAR_NAME" "$WORKING_DIRECTORY/release/redisstack/"
 cd "$WORKING_DIRECTORY" || exit 1

.circleci/redisstack/build_modules.sh

@@ -19,10 +19,14 @@ cp redisinsight/api/.yarnclean.prod redisinsight/api/.yarnclean
 yarn --cwd ./redisinsight/api autoclean --force
 
 rm -rf redisinsight/build.zip
+
+cp LICENSE ./redisinsight
+
 cd redisinsight && tar -czvf build.tar.gz \
 api/node_modules \
 api/dist \
 ui/dist \
+LICENSE \
 && cd ..
 
 mkdir -p release/redisstack

.circleci/redisstack/dmg.repack.sh

@@ -3,17 +3,18 @@
 ARCH=${ARCH:-x64}
 WORKING_DIRECTORY=$(pwd)
 TAR_NAME="RedisInsight-preview-app-darwin.$ARCH.tar.gz"
-TMP_FOLDER="/tmp/RedisInsight-app-$ARCH"
+APP_FOLDER_NAME="RedisInsight-preview.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-preview-mac-$ARCH.dmg"
-cp -r /Volumes/RedisInsight-*/RedisInsight-preview.app/* "$TMP_FOLDER"
-cd "$TMP_FOLDER" || exit 1
-tar -czvf "$TAR_NAME" ./*
+cp -a /Volumes/RedisInsight-*/RedisInsight-preview.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-*/

electron-builder.json

@@ -94,7 +94,7 @@
     },
     {
       "from": "./resources/app",
-      "to": "../app",
+      "to": "./app",
       "filter": ["**/*"]
     }
   ]

redisinsight/api/config/production.ts

@@ -1,6 +1,8 @@
 import { join } from 'path';
+import * as os from 'os';
 
-const homedir = join(require('os').homedir(), process.env.APP_FOLDER_NAME || '.redisinsight-preview');
+const homedir = process.env.APP_FOLDER_ABSOLUTE_PATH
+  || (join(os.homedir(), process.env.APP_FOLDER_NAME || '.redisinsight-preview'));
 
 export default {
   dir_path: {

redisinsight/api/config/staging.ts

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

redisinsight/api/src/modules/shared/services/instances-business/auto-discovery.service.ts

@@ -34,6 +34,12 @@ export class AutoDiscoveryService implements OnModuleInit {
         return;
       }
 
+      // additional check for existing databases
+      // We should not start auto discover if any database already exists
+      if ((await this.databaseProvider.getAll()).length) {
+        return;
+      }
+
       const settings = await this.settingsService.getSettings();
       // check agreements to understand if it is first launch
       if (!settings.agreements) {

redisinsight/main.dev.ts

@@ -102,7 +102,7 @@ const launchApiServer = async () => {
     const detectPortConst = await detectPort(port);
     process.env.API_PORT = detectPortConst?.toString();
     log.info('Available port:', detectPortConst);
-    server();
+    await server();
   } catch (error) {
     log.error('Catch server error:', error);
   }