Merge pull request #177 from RedisInsight/feature/bugfix

bugfixing

Author: egor-zalenski

.circleci/config.yml

@@ -182,14 +182,18 @@ jobs:
       - run:
           name: Build .vsix package
           command: |
-            packagePath=./release/redis-for-vscode-extension-linux-x64.vsix
+            envFile=".env"
+            packagePath="./release/redis-for-vscode-extension-linux-x64.vsix"
             yarn download:backend
 
             if [ << parameters.env >> == 'prod' ]; then
+              echo "RI_SEGMENT_WRITE_KEY='$RI_SEGMENT_WRITE_KEY'" >> $envFile
               yarn package:prod --out ${packagePath}
               exit 0;
             fi
 
+            echo "RI_SEGMENT_WRITE_KEY='$RI_SEGMENT_WRITE_KEY_STAGE'" >> $envFile
+            sed -i "s/^RI_APP_FOLDER_NAME=.*/RI_APP_FOLDER_NAME='.redis-for-vscode-stage'/" $envFile
             yarn package:stage --out ${packagePath}
       - persist_to_workspace:
           root: .

.env

@@ -5,6 +5,7 @@
 NODE_ENV='production'
 RI_BASE_APP_URL='http://localhost'
 RI_APP_PORT=5541
+RI_APP_VERSION='0.0.1'
 RI_APP_PREFIX='api'
 RI_APP_FOLDER_NAME='.redis-for-vscode'
 RI_CDN_PATH='https://s3.amazonaws.com/redisinsight.download/public/releases/2.54.1/web-mini'

.vscodeignore

@@ -22,6 +22,8 @@ node_modules
 !node_modules/debug
 vite.config.mjs
 *.zip
+.eslintignore
+.env.stage
 
 # test
 coverage

l10n/bundle.l10n.json

@@ -10,8 +10,7 @@
   "Last Refresh": "Last Refresh",
   "- Welcome": "- Welcome",
   "About Redis for VS Code": "About Redis for VS Code",
-  "Take your productivity to the next level when developing with Redis or Redis Stack! Use Redis for VS Code to visualize and optimize Redis data.": "Take your productivity to the next level when developing with Redis or Redis Stack! Use Redis for VS Code to visualize and optimize Redis data.",
-  "A powerful desktop manager, Redis for VS Code provides an intuitive and efficient UI for Redis and Redis Stack and supports CLI interaction in a fully-featured desktop UI client.": "A powerful desktop manager, Redis for VS Code provides an intuitive and efficient UI for Redis and Redis Stack and supports CLI interaction in a fully-featured desktop UI client.",
+  "Redis for VS Code provides an intuitive and efficient UI to visualize and optimize your Redis data.": "Redis for VS Code provides an intuitive and efficient UI to visualize and optimize your Redis data.",
   "Start": "Start",
   "Connect your database": "Connect your database",
   "Create new database": "Create new database",
@@ -53,6 +52,9 @@
   "Score": "Score",
   "Use CLI to edit the score": "Use CLI to edit the score",
   "Enter Score": "Enter Score",
+  "This data type is not currently supported.": "This data type is not currently supported.",
+  "We are constantly working to launch support for more data types. If you have any ideas or suggestions, please ": "We are constantly working to launch support for more data types. If you have any ideas or suggestions, please ",
+  "contact us.": "contact us.",
   "Edit value": "Edit value",
   "Empty": "Empty",
   "loading...": "loading...",
@@ -100,11 +102,11 @@
   "TTL: No limit": "TTL: No limit",
   "Key name*": "Key name*",
   "Encrypted data": "Encrypted data",
-  "RedisJSON module should be loaded to add this key. Find ": "RedisJSON module should be loaded to add this key. Find ",
-  "more information": "more information",
-  " about RedisJSON or create your ": " about RedisJSON or create your ",
-  "free Redis database": "free Redis database",
-  " with RedisJSON on Redis Cloud.": " with RedisJSON on Redis Cloud.",
+  "This database does not support the JSON data structure. Learn more about JSON support ": "This database does not support the JSON data structure. Learn more about JSON support ",
+  "here.": "here.",
+  "You can also create a ": "You can also create a ",
+  "free Redis Cloud database": "free Redis Cloud database",
+  " with built-in JSON support.": " with built-in JSON support.",
   "If you remove the single {0}, the whole Key will be deleted.": "If you remove the single {0}, the whole Key will be deleted.",
   "Removing multiple elements is available for Redis databases v. 6.2 or later. Update your Redis database or create a new ": "Removing multiple elements is available for Redis databases v. 6.2 or later. Update your Redis database or create a new ",
   "free up-to-date": "free up-to-date",
@@ -313,4 +315,4 @@
   "Add": "Add",
   "Release Notes": "Release Notes",
   "Redis for VS Code extension updated to {0}.": "Redis for VS Code extension updated to {0}."
-}
+}

package.json

@@ -15,8 +15,8 @@
   "icon": "dist/webviews/resources/256x256.png",
   "author": {
     "name": "Redis Ltd.",
-    "email": "support@redis.com",
-    "url": "https://redis.com/redis-enterprise/redis-insight"
+    "email": "support@redis.io",
+    "url": "https://redis.io/insight/"
   },
   "repository": {
     "type": "git",

scripts/downloadBackend.ts

@@ -13,7 +13,7 @@ dotenv.config({
 const target = process.argv[2];
 const cdnPath = process.env.RI_CDN_PATH
 const backendPath = path.join(__dirname, '..', 'dist', 'redis-backend')
-const staticPath = path.join(backendPath, 'static')
+const tutorialsPath = path.join(backendPath, 'dist-minified', 'defaults', 'tutorials')
 
 const downloadBackend = async () => {
   if (fs.existsSync(backendPath)) {
@@ -86,8 +86,8 @@ function unzipRedisServer(redisInsideArchivePath: string, extractDir: string) {
 
   cp.spawnSync('tar', ['-xf', redisInsideArchivePath, '-C', extractDir, '--strip-components', '1', 'api'])
 
-  // remove plugins
-  fs.rmSync(staticPath, { recursive: true, force: true });
+  // remove tutorials
+  fs.rmSync(tutorialsPath, { recursive: true, force: true });
 }
 
 downloadBackend()

src/constants.ts

@@ -12,5 +12,5 @@ export const MAX_TITLE_KEY_LENGTH = 30
 export const EXTENSION_ID = 'Redis.redis-for-vscode'
 
 export const EXTERNAL_LINKS = {
-  releaseNotes: 'https://github.com/RedisInsight/RedisInsight/releases',
+  releaseNotes: 'https://github.com/RedisInsight/Redis-for-VS-Code/releases',
 }

src/resources/256x256.png

@@ -9,7 +9,8 @@ import { sleep } from '../utils'
 let gracefulShutdown: Function
 let beApp: any
 
-const backendPath = path.join(__dirname, '..', 'redis-backend/dist-minified')
+const backendPath = path.join(__dirname, '..', 'redis-backend', 'dist-minified')
+process.env.RI_DEFAULTS_DIR = path.join(backendPath, 'defaults')
 
 export async function startBackend(logger: CustomLogger): Promise<any> {
   const appPort = process.env.RI_APP_PORT

src/server/bootstrapBackend.ts

@@ -17,7 +17,8 @@ const appPrefix = process.env.RI_APP_PREFIX
 const appFolder = process.env.RI_APP_FOLDER
 const appHost = process.env.RI_APP_HOST
 
-const backendPath = path.join(__dirname, '..', 'redis-backend/dist-minified')
+const backendPath = path.join(__dirname, '..', 'redis-backend', 'dist-minified')
+const defaultDirPath = path.join(backendPath, 'defaults')
 let PSinst: ChildProcessWithoutNullStreams
 
 export async function startBackendE2E(logger: CustomLogger): Promise<any> {
@@ -52,6 +53,7 @@ export async function startBackendE2E(logger: CustomLogger): Promise<any> {
           + `$env:RI_BUILD_TYPE=${process.env.RI_BUILD_TYPE};`
           + `$env:RI_SEGMENT_WRITE_KEY=${process.env.RI_SEGMENT_WRITE_KEY};`
           + `$env:RI_MIGRATE_OLD_FOLDERS=${process.env.RI_MIGRATE_OLD_FOLDERS};`
+          + `$env:RI_DEFAULTS_DIR=${defaultDirPath};`
           + '$env:RI_AUTO_BOOTSTRAP=true;'
           + `node ${backendSrcPath}`,
         ])
@@ -69,6 +71,7 @@ export async function startBackendE2E(logger: CustomLogger): Promise<any> {
               RI_BUILD_TYPE: process.env.RI_BUILD_TYPE,
               RI_SEGMENT_WRITE_KEY: process.env.RI_SEGMENT_WRITE_KEY,
               RI_MIGRATE_OLD_FOLDERS: process.env.RI_MIGRATE_OLD_FOLDERS,
+              RI_DEFAULTS_DIR: defaultDirPath,
               RI_AUTO_BOOTSTRAP: 'true',
               PATH: process.env.PATH,
             },