Merge pull request #706 from RedisInsight/release/2.2.0

Release/2.2.0

Author: egor-zalenski

.circleci/e2e/test.app-image.sh

@@ -1,3 +1,6 @@
+#!/bin/bash
+set -e
+
 yarn --cwd tests/e2e install
 
 # mount app resources

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

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 ARCH=${ARCH:-x86_64}
 WORKING_DIRECTORY=$(pwd)

.circleci/redisstack/build.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # install deps
 yarn

.circleci/redisstack/build_modules.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 PLATFORM=${PLATFORM:-'linux'}
 ELECTRON_VERSION=$(cat electron/version)

.circleci/redisstack/dmg.repack.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 ARCH=${ARCH:-x64}
 WORKING_DIRECTORY=$(pwd)

Dockerfile

@@ -11,6 +11,10 @@ COPY scripts ./scripts
 COPY redisinsight ./redisinsight
 RUN SKIP_POSTINSTALL=1 yarn install
 RUN yarn --cwd redisinsight/api
+ARG SERVER_TLS_CERT
+ARG SERVER_TLS_KEY
+ENV SERVER_TLS_CERT=${SERVER_TLS_CERT}
+ENV SERVER_TLS_KEY=${SERVER_TLS_KEY}
 RUN yarn build:web
 RUN yarn build:statics
 

package.json

@@ -14,8 +14,8 @@
     "build:main:stage": "webpack --config ./configs/webpack.config.main.stage.babel.js",
     "build:web": "webpack --config ./configs/webpack.config.web.prod.babel.js",
     "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: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/about-panel.ts

@@ -7,7 +7,7 @@ const ICON_PATH = app.isPackaged
 
 export default {
   applicationName: 'RedisInsight-v2',
-  applicationVersion: app.getVersion() || '2.0',
+  applicationVersion: app.getVersion() || '2.2.0',
   copyright: `Copyright © ${new Date().getFullYear()} Redis Ltd.`,
   iconPath: ICON_PATH,
 };

redisinsight/api/src/app.module.ts

@@ -11,6 +11,7 @@ import config from 'src/utils/config';
 import { PluginModule } from 'src/modules/plugin/plugin.module';
 import { CommandsModule } from 'src/modules/commands/commands.module';
 import { WorkbenchModule } from 'src/modules/workbench/workbench.module';
+import { SlowLogModule } from 'src/modules/slow-log/slow-log.module';
 import { SharedModule } from './modules/shared/shared.module';
 import { InstancesModule } from './modules/instances/instances.module';
 import { BrowserModule } from './modules/browser/browser.module';
@@ -42,6 +43,7 @@ const PATH_CONFIG = config.get('dir_path');
     PluginModule,
     CommandsModule,
     ProfilerModule,
+    SlowLogModule,
     EventEmitterModule.forRoot(),
     ...(SERVER_CONFIG.staticContent
       ? [

redisinsight/api/src/app.routes.ts

@@ -5,6 +5,7 @@ import { RedisEnterpriseModule } from 'src/modules/redis-enterprise/redis-enterp
 import { RedisSentinelModule } from 'src/modules/redis-sentinel/redis-sentinel.module';
 import { CliModule } from 'src/modules/cli/cli.module';
 import { WorkbenchModule } from 'src/modules/workbench/workbench.module';
+import { SlowLogModule } from 'src/modules/slow-log/slow-log.module';
 
 export const routes: Routes = [
   {
@@ -23,6 +24,10 @@ export const routes: Routes = [
         path: '/:dbInstance',
         module: WorkbenchModule,
       },
+      {
+        path: '/:dbInstance',
+        module: SlowLogModule,
+      },
     ],
   },
   {