a new release candidate

.circleci/config.yml

@@ -432,7 +432,7 @@ jobs:
               exit 0;
             fi
 
-            SEGMENT_WRITE_KEY=$SEGMENT_WRITE_KEY_STAGE yarn package:<< parameters.env >>
+            UPGRADES_LINK=$UPGRADES_LINK_STAGE SEGMENT_WRITE_KEY=$SEGMENT_WRITE_KEY_STAGE yarn package:<< parameters.env >>
       - persist_to_workspace:
           root: .
           paths:
@@ -474,7 +474,7 @@ jobs:
               exit 0;
             fi
 
-            SEGMENT_WRITE_KEY=$SEGMENT_WRITE_KEY_STAGE yarn package:<< parameters.env >>
+            UPGRADES_LINK=$UPGRADES_LINK_STAGE SEGMENT_WRITE_KEY=$SEGMENT_WRITE_KEY_STAGE yarn package:<< parameters.env >>
             rm -rf release/mac
           no_output_timeout: 15m
       - persist_to_workspace:
@@ -514,7 +514,7 @@ jobs:
               exit 0;
             fi
 
-            SEGMENT_WRITE_KEY=$SEGMENT_WRITE_KEY_STAGE yarn package:<< parameters.env >>
+            UPGRADES_LINK=$UPGRADES_LINK_STAGE SEGMENT_WRITE_KEY=$SEGMENT_WRITE_KEY_STAGE yarn package:<< parameters.env >>
             rm -rf release/win-unpacked
           shell: bash.exe
           no_output_timeout: 20m

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main, latest, release/*, codeql ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main ]
+  schedule:
+    - cron: '37 11 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

configs/webpack.config.main.prod.babel.js

@@ -1,7 +1,6 @@
 import path from 'path';
 import webpack from 'webpack';
 import { merge } from 'webpack-merge';
-import TerserPlugin from 'terser-webpack-plugin';
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
 import baseConfig from './webpack.config.base';
 import DeleteSourceMaps from '../scripts/DeleteSourceMaps';

package.json

@@ -13,8 +13,9 @@
     "build:main": "webpack --config ./configs/webpack.config.main.prod.babel.js",
     "build:main:stage": "webpack --config ./configs/webpack.config.main.stage.babel.js",
     "build:web": "webpack --config ./configs/webpack.config.web.prod.babel.js",
-    "build:statics": "sh ./scripts/build-statics.sh",
-    "build:statics:win": "./scripts/build-statics.cmd",
+    "build:defaults": "yarn --cwd redisinsight/api build:defaults",
+    "build:statics": "yarn build:defaults & sh ./scripts/build-statics.sh",
+    "build:statics:win": "yarn build:defaults & ./scripts/build-statics.cmd",
     "build:renderer": "webpack --config ./configs/webpack.config.renderer.prod.babel.js",
     "build:renderer:stage": "webpack --config ./configs/webpack.config.renderer.stage.babel.js",
     "rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir redisinsight/ui",

redisinsight/api/.gitignore

@@ -1,7 +1,8 @@
 # compiled output
 /dist
 /node_modules
-/src/static
+/static
+/defaults
 
 # Logs
 logs

redisinsight/api/config/default.ts

@@ -6,15 +6,21 @@ const staticDir = process.env.BUILD_TYPE === 'ELECTRON' && process['resourcesPat
   ? join(process['resourcesPath'], 'static')
   : join(__dirname, '..', 'static');
 
+const defaultsDir = process.env.BUILD_TYPE === 'ELECTRON' && process['resourcesPath']
+  ? join(process['resourcesPath'], 'defaults')
+  : join(__dirname, '..', 'defaults');
+
 export default {
   dir_path: {
     homedir,
     staticDir,
+    defaultsDir,
     logs: join(homedir, 'logs'),
     defaultPlugins: join(staticDir, 'plugins'),
     customPlugins: join(homedir, 'plugins'),
     pluginsAssets: join(staticDir, 'resources', 'plugins'),
     commands: join(homedir, 'commands'),
+    defaultCommandsDir: join(defaultsDir, 'commands'),
     caCertificates: join(homedir, 'ca_certificates'),
     clientCertificates: join(homedir, 'client_certificates'),
   },
@@ -72,18 +78,36 @@ export default {
     omitSensitiveData: process.env.LOGGER_OMIT_DATA ? process.env.LOGGER_OMIT_DATA === 'true' : true,
     pipelineSummaryLimit: parseInt(process.env.LOGGER_PIPELINE_SUMMARY_LIMIT, 10) || 5,
   },
-  commands: {
-    mainUrl: process.env.COMMANDS_MAIN_URL
-      || 'https://raw.githubusercontent.com/redis/redis-doc/master/commands.json',
-    redisearchUrl: process.env.COMMANDS_REDISEARCH_URL
-      || 'https://raw.githubusercontent.com/RediSearch/RediSearch/master/commands.json',
-    redijsonUrl: process.env.COMMANDS_REDIJSON_URL
-      || 'https://raw.githubusercontent.com/RedisJSON/RedisJSON/master/commands.json',
-    redistimeseriesUrl: process.env.COMMANDS_REDISTIMESERIES_URL
-      || 'https://raw.githubusercontent.com/RedisTimeSeries/RedisTimeSeries/master/commands.json',
-    redisaiUrl: process.env.COMMANDS_REDISAI_URL
-      || 'https://raw.githubusercontent.com/RedisAI/RedisAI/master/commands.json',
-    redisgraphUrl: process.env.COMMANDS_REDISGRAPH_URL
-      || 'https://raw.githubusercontent.com/RedisGraph/RedisGraph/master/commands.json',
-  },
+  commands: [
+    {
+      name: 'main',
+      url: process.env.COMMANDS_MAIN_URL
+        || 'https://raw.githubusercontent.com/redis/redis-doc/master/commands.json',
+    },
+    {
+      name: 'redisearch',
+      url: process.env.COMMANDS_REDISEARCH_URL
+        || 'https://raw.githubusercontent.com/RediSearch/RediSearch/master/commands.json',
+    },
+    {
+      name: 'redijson',
+      url: process.env.COMMANDS_REDIJSON_URL
+        || 'https://raw.githubusercontent.com/RedisJSON/RedisJSON/master/commands.json',
+    },
+    {
+      name: 'redistimeseries',
+      url: process.env.COMMANDS_REDISTIMESERIES_URL
+        || 'https://raw.githubusercontent.com/RedisTimeSeries/RedisTimeSeries/master/commands.json',
+    },
+    {
+      name: 'redisai',
+      url: process.env.COMMANDS_REDISAI_URL
+        || 'https://raw.githubusercontent.com/RedisAI/RedisAI/master/commands.json',
+    },
+    {
+      name: 'redisgraph',
+      url: process.env.COMMANDS_REDISGRAPH_URL
+        || 'https://raw.githubusercontent.com/RedisGraph/RedisGraph/master/commands.json',
+    },
+  ],
 };

redisinsight/api/config/production.ts

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

redisinsight/api/nest-cli.json

@@ -3,7 +3,14 @@
   "sourceRoot": "src",
   "compilerOptions": {
     "assets": [
-      "static/**/*"
+      {
+        "include": "../static/**/*",
+        "outDir": "dist/static"
+      },
+      {
+        "include": "../defaults/**/*",
+        "outDir": "dist/defaults"
+      }
     ]
   }
 }

redisinsight/api/package.json

@@ -9,6 +9,8 @@
     "url": "https://redis.com/redis-enterprise/redis-insight"
   },
   "scripts": {
+    "build:defaults:commands": "ts-node ./scripts/default-commands.ts",
+    "build:defaults": "yarn build:defaults:commands",
     "prebuild": "rimraf dist",
     "build": "nest build",
     "build:prod": "rimraf dist && nest build -p ./tsconfig.build.prod.json && cross-env NODE_ENV=production",
@@ -46,6 +48,7 @@
     "class-transformer": "^0.2.3",
     "class-validator": "^0.12.2",
     "express": "^4.17.1",
+    "fs-extra": "^10.0.0",
     "ioredis": "^4.27.1",
     "is-glob": "^4.0.1",
     "jsonpath": "^1.1.1",

redisinsight/api/scripts/default-commands.ts

@@ -0,0 +1,40 @@
+import axios from 'axios';
+import * as fs from 'fs';
+import * as path from 'path';
+import { get } from '../src/utils/config';
+
+const PATH_CONFIG = get('dir_path');
+const COMMANDS_CONFIG = get('commands');
+
+async function init() {
+  try {
+    await Promise.all(COMMANDS_CONFIG.map(async ({ name, url }) => {
+      try {
+        console.log(`Trying to get ${name} commands...`);
+        const { data } = await axios.get(url, {
+          responseType: 'text',
+          transformResponse: [(raw) => raw],
+        });
+
+        if (!fs.existsSync(PATH_CONFIG.defaultCommandsDir)) {
+          fs.mkdirSync(PATH_CONFIG.defaultCommandsDir, { recursive: true });
+        }
+
+        fs.writeFileSync(
+          path.join(PATH_CONFIG.defaultCommandsDir, `${name}.json`),
+          JSON.stringify(JSON.parse(data)), // check that we received proper json object
+        );
+        console.log(`Successfully generated default ${name} commands`);
+      } catch (error) {
+        console.error(`Unable to update ${name} commands`, error);
+      }
+    }));
+
+    process.exit(0);
+  } catch (e) {
+    console.error('Something went wrong trying to get default commands jsons', e);
+    process.exit(1);
+  }
+}
+
+init();

redisinsight/api/src/__mocks__/commands.ts

@@ -165,5 +165,7 @@ export const mockRedisgraphCommands = {
 };
 
 export const mockCommandsJsonProvider = () => ({
+  updateLatestJson: jest.fn(),
   getCommands: jest.fn(),
+  getDefaultCommands: jest.fn(),
 });