Merge pull request #962 from RedisInsight/release/2.6.0

Release/2.6.0

Author: egor-zalenski

.circleci/config.yml

@@ -122,7 +122,7 @@ aliases:
 
 orbs:
   win: circleci/[email protected]
-  node: circleci/node@4.4.0
+  node: circleci/node@5.0.2
   aws: circleci/[email protected]
 
 executors:
@@ -134,7 +134,7 @@ jobs:
   # Test jobs
   unit-tests-ui:
     docker:
-      - image: circleci/node:15.14.0
+      - image: cimg/node:16.15.1
     steps:
       - checkout
       - restore_cache:
@@ -178,7 +178,7 @@ jobs:
             - ./node_modules
   unit-tests-api:
     docker:
-      - image: circleci/node:15.14.0
+      - image: cimg/node:16.15.1
     steps:
       - checkout
       - restore_cache:
@@ -333,7 +333,7 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
-      - run: choco install nodejs --version=15.14.0
+      - run: choco install nodejs --version=16.15.1
       - run:
           command: |
             cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/**/*.e2e.ts" | circleci tests split) && cd ../..
@@ -436,12 +436,12 @@ jobs:
   setup-build:
     parameters:
       env:
-        description: Build environemtnt (stage || prod)
+        description: Build environment (stage || prod)
         type: enum
         default: stage
         enum: [ 'dev', 'stage', 'prod' ]
     docker:
-      - image: cibuilds/github:0.13
+      - image: cibuilds/docker:19.03.5
     steps:
       - checkout
       - run:
@@ -483,7 +483,7 @@ jobs:
     steps:
       - checkout
       - node/install:
-          node-version: '14.17'
+          node-version: '16.15.1'
       - attach_workspace:
           at: .
       - run:
@@ -549,7 +549,7 @@ jobs:
     steps:
       - checkout
       - node/install:
-          node-version: '15.14.0'
+          node-version: '16.15.1'
       - attach_workspace:
           at: .
       - run:
@@ -614,7 +614,7 @@ jobs:
       - run:
           name: Build windows exe
           command: |
-            choco install nodejs --version=15.14.0
+            choco install nodejs --version=16.15.1
             # set ALL_REDIS_COMMANDS=$(curl $ALL_REDIS_COMMANDS_RAW_URL)
             yarn install
             yarn --cwd redisinsight/api/ install
@@ -686,32 +686,6 @@ jobs:
       - store_artifacts:
           path: release
           destination: release
-  release-github:
-    parameters:
-      env:
-        description: Release environment (stage || prod)
-        type: enum
-        default: stage
-        enum: [ 'stage', 'prod' ]
-    docker:
-      - image: cibuilds/github:0.13
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - store_artifacts:
-          path: release
-          destination: release
-      - run:
-          name: prepare release
-          command: |
-            rm release/._* ||:
-      - run:
-          name: publish to prerelease Github
-          command: |
-            applicationVersion=$(jq -r '.version' electron/package.json)
-            echo "APP VERSION $applicationVersion"
-            ghr -n ${applicationVersion} -t ${GH_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -prerelease -delete ${applicationVersion}
 
   release-aws-test:
     executor: linux-executor
@@ -1069,7 +1043,7 @@ workflows:
           requires:
             - Build app - Windows (prod)
 
-      # upload release to AWS and GitHub
+      # upload release to AWS
       - release-aws-private:
           name: Release AWS S3 Private (prod)
           requires:
@@ -1079,23 +1053,12 @@ workflows:
             - Virus check arm64 - dmg (prod)
             - Virus check - exe (prod)
 
-      - release-github:
-          name: Release Github (prod)
-          env: prod
-          requires:
-            - Virus check - AppImage (prod)
-            - Virus check - deb (prod)
-            - Virus check x64 - dmg (prod)
-            - Virus check arm64 - dmg (prod)
-            - Virus check - exe (prod)
-
       # Manual approve for publish release
       - approve-publish:
           name: Approve Publish Release (prod)
           type: approval
           requires:
             - Release AWS S3 Private (prod)
-            - Release Github (prod)
           <<: *prodFilter # double check for "latest"
 
       # Publish release
@@ -1159,10 +1122,10 @@ workflows:
           report: true
           requires:
             - Build app - Linux (stage)
-      # e2e desktop tests on exe build
-      - e2e-exe:
-          name: E2ETest (exe) - Nightly
-          parallelism: 4
-          report: true
-          requires:
-            - Build app - Windows (stage)
+      # # e2e desktop tests on exe build
+      # - e2e-exe:
+      #     name: E2ETest (exe) - Nightly
+      #     parallelism: 4
+      #     report: true
+      #     requires:
+      #       - Build app - Windows (stage)

.dockerignore

@@ -5,7 +5,7 @@
 
 coverage
 dll
-node_modules
+**/node_modules
 release
 
 redisinsight/dist

.eslintignore

@@ -6,6 +6,9 @@ tests/e2e
 logs
 *.log
 
+# Tests coverage results
+redisinsight/api/test/test-runs/coverage
+
 # Runtime data
 pids
 *.pid

Dockerfile

@@ -1,15 +1,15 @@
-FROM node:14.17-alpine as front
+FROM node:16.15.1-alpine as front
 RUN apk update
 RUN apk add --no-cache --virtual .gyp \
-        python \
+        python3 \
         make \
         g++
 WORKDIR /usr/src/app
 COPY package.json yarn.lock babel.config.js tsconfig.json ./
+RUN SKIP_POSTINSTALL=1 yarn install
 COPY configs ./configs
 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
@@ -18,7 +18,7 @@ ENV SERVER_TLS_KEY=${SERVER_TLS_KEY}
 RUN yarn build:web
 RUN yarn build:statics
 
-FROM node:14.17-alpine as back
+FROM node:16.15.1-alpine as back
 WORKDIR /usr/src/app
 COPY redisinsight/api/package.json redisinsight/api/yarn.lock ./
 RUN yarn install
@@ -27,7 +27,7 @@ COPY --from=front /usr/src/app/redisinsight/api/static ./static
 COPY --from=front /usr/src/app/redisinsight/api/defaults ./defaults
 RUN yarn run build:prod
 
-FROM node:14.17-slim
+FROM node:16.15.1-slim
 # Set up mDNS functionality, to play well with Redis Enterprise
 # clusters on the network.
 RUN set -ex \

README.md

@@ -12,7 +12,7 @@ Query, analyse and interact with your Redis data. [Download it here](https://red
 
 ![RedisInsight Browser screenshot](/.github/redisinsight_browser.png)
 
-Built with love using [Electron](https://www.electronjs.org/), [Elastic UI](https://elastic.github.io/eui/#/), [Monaco Editor](https://microsoft.github.io/monaco-editor/) and NodeJS.
+Built with love using [Electron](https://www.electronjs.org/), [Monaco Editor](https://microsoft.github.io/monaco-editor/) and NodeJS.
 
 ## Overview
 

api.Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14.17-alpine as build
+FROM node:16.15.1-alpine as build
 
 RUN apk update && apk add bash libsecret dbus-x11 gnome-keyring
 RUN dbus-uuidgen > /var/lib/dbus/machine-id
@@ -19,7 +19,7 @@ RUN yarn install --production
 RUN cp .yarnclean.prod .yarnclean && yarn autoclean --force
 
 # Production image
-FROM node:14.17-alpine as production
+FROM node:16.15.1-alpine as production
 
 RUN apk update && apk add bash libsecret dbus-x11 gnome-keyring
 RUN dbus-uuidgen > /var/lib/dbus/machine-id

configs/webpack.config.renderer.dev.babel.js

@@ -210,6 +210,7 @@ export default merge(baseConfig, {
       RESOURCES_BASE_URL: 'http://localhost',
       SCAN_COUNT_DEFAULT: '500',
       SCAN_TREE_COUNT_DEFAULT: '10000',
+      PIPELINE_COUNT_DEFAULT: '5',
       BUILD_TYPE: 'ELECTRON',
       APP_VERSION: version,
       SEGMENT_WRITE_KEY:

configs/webpack.config.renderer.dev.dll.babel.js

@@ -52,6 +52,7 @@ export default merge(baseConfig, {
       RESOURCES_BASE_URL: 'http://localhost',
       SCAN_COUNT_DEFAULT: '500',
       SCAN_TREE_COUNT_DEFAULT: '10000',
+      PIPELINE_COUNT_DEFAULT: '5',
       SEGMENT_WRITE_KEY:
         'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
     }),

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

@@ -198,6 +198,7 @@ export default merge(baseConfig, {
       APP_ENV: 'electron',
       SCAN_COUNT_DEFAULT: '500',
       SCAN_TREE_COUNT_DEFAULT: '10000',
+      PIPELINE_COUNT_DEFAULT: '5',
       SEGMENT_WRITE_KEY:
         'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
     }),

configs/webpack.config.web.dev.babel.js

@@ -7,12 +7,15 @@
 
 import webpack from 'webpack';
 import { merge } from 'webpack-merge';
+import ip from 'ip';
 import commonConfig from './webpack.config.web.common.babel';
 
 function employCache(loaders) {
   return ['cache-loader'].concat(loaders);
 }
 
+const HOST = process.env.PUBLIC_DEV ? ip.address(): 'localhost'
+
 export default merge(commonConfig, {
   target: 'web',
 
@@ -22,7 +25,7 @@ export default merge(commonConfig, {
 
   entry: [
     'regenerator-runtime/runtime',
-    'webpack-dev-server/client?http://localhost:8080',
+    `webpack-dev-server/client?http://${HOST}:8080`,
     'webpack/hot/only-dev-server',
     require.resolve('../redisinsight/ui/index.tsx'),
   ],
@@ -156,6 +159,8 @@ export default merge(commonConfig, {
   },
 
   devServer: {
+    host: HOST,
+    disableHostCheck: true,
     port: 8080,
     hot: true, // enable HMR on the server
     historyApiFallback: true,
@@ -184,8 +189,9 @@ export default merge(commonConfig, {
       APP_ENV: 'web',
       API_PREFIX: 'api',
       API_PORT: '5000',
-      BASE_API_URL: `http://${require('os').hostname()}`,
-      RESOURCES_BASE_URL: `http://${require('os').hostname()}`,
+      BASE_API_URL: `http://${HOST}`,
+      RESOURCES_BASE_URL: `http://${HOST}`,
+      PIPELINE_COUNT_DEFAULT: '5',
       SCAN_COUNT_DEFAULT: '500',
       SCAN_TREE_COUNT_DEFAULT: '10000',
       SEGMENT_WRITE_KEY: