Merge branch 'main' into timeseries-plugin

# Conflicts:
#	scripts/build-statics.cmd
#	scripts/build-statics.sh

Author: egor-zalenski

.circleci/config.yml

@@ -390,8 +390,8 @@ jobs:
           name: Setup sign certificates
           command: |
             mkdir -p certs
-            echo "$CSC_P12_HEX" | xxd -r -p > certs/cert.p12
-            echo "$WIN_CSC_PFX_HEX" | xxd -r -p > certs/redislabs_win.pfx
+            echo "$CSC_P12_BASE64" | base64 -id > certs/cert.p12
+            echo "$WIN_CSC_PFX_BASE64" | base64 -id > certs/redislabs_win.pfx
       - persist_to_workspace:
           root: .
           paths:
@@ -455,6 +455,7 @@ jobs:
       - run:
           name: install dependencies
           command: |
+            sudo apt-get update -y && sudo apt-get install -y rpm
             yarn --cwd redisinsight/api/ install
             yarn install
             yarn build:statics
@@ -477,6 +478,10 @@ jobs:
           condition:
             equal: [ true, << parameters.redisstack >> ]
           steps:
+            - run:
+                name: Repack AppImage to tar
+                command: |
+                  ARCH=x86_64 ./.circleci/redisstack/app-image.repack.sh
             - run:
                 name: Build sources
                 command: ./.circleci/redisstack/build.sh
@@ -491,6 +496,7 @@ jobs:
           root: .
           paths:
             - release/RedisInsight*.deb
+            - release/RedisInsight*.rpm
             - release/RedisInsight*.AppImage
             - release/*-linux.yml
             - release/redisstack
@@ -538,13 +544,20 @@ jobs:
             UPGRADES_LINK='' SEGMENT_WRITE_KEY='' yarn package:stage
             rm -rf release/mac
           no_output_timeout: 15m
+
+      - run:
+          name: Repack dmg to tar
+          command: |
+            ARCH=x64 ./.circleci/redisstack/dmg.repack.sh
+            ARCH=arm64 ./.circleci/redisstack/dmg.repack.sh
       - persist_to_workspace:
           root: .
           paths:
             - release/RedisInsight*.zip
             - release/RedisInsight*.dmg
             - release/RedisInsight*.dmg.blockmap
             - release/*-mac.yml
+            - release/redisstack
   windows:
     executor:
       name: win/default
@@ -663,6 +676,19 @@ jobs:
             echo "APP VERSION $applicationVersion"
             ghr -t ${GH_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -prerelease -delete ${applicationVersion}
 
+  release-aws-test:
+    executor: linux-executor
+    steps:
+      - checkout
+      - attach_workspace:
+          at: .
+      - run:
+          name: publish
+          command: |
+            rm release/._* ||:
+            applicationVersion=$(jq -r '.version' redisinsight/package.json)
+            aws s3 cp release/ s3://${AWS_BUCKET_NAME_TEST}/public/rs-ri-builds/${CIRCLE_BUILD_NUM} --recursive --exclude "*.json"
+
   release-aws-private:
     executor: linux-executor
     steps:
@@ -879,6 +905,13 @@ workflows:
             - Build app - MacOS (dev)
             - Build app - Windows (dev)
 
+      - release-aws-test:
+          name: Release AWS test
+          requires:
+            - Build app - Linux (dev)
+            - Build app - MacOS (dev)
+            - Build app - Windows (dev)
+
       # build and release electron app (stage)
       - setup-sign-certificates:
           name: Setup sign certificates (stage)
@@ -905,6 +938,14 @@ workflows:
           name: Build app - Windows (stage)
           requires: *stageElectronBuildRequires
           <<: *stageFilter
+
+      - release-aws-test:
+          name: Release AWS test
+          requires:
+            - Build app - Linux (stage)
+            - Build app - MacOS (stage)
+            - Build app - Windows (stage)
+
       # Needs approval from QA team that build was tested before merging to latest
       - qa-approve:
           name: Approved by QA team

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

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+ARCH=${ARCH:-x86_64}
+WORKING_DIRECTORY=$(pwd)
+SOURCE_APP=${SOURCE_APP:-"RedisInsight-v2-linux-$ARCH.AppImage"}
+APP_FOLDER_NAME="RedisInsight-v2-linux"
+TAR_NAME="RedisInsight-v2-app-linux.$ARCH.tar.gz"
+TMP_FOLDER="/tmp/RedisInsight-app-$ARCH"
+
+rm -rf "$TMP_FOLDER"
+
+mkdir -p "$WORKING_DIRECTORY/release/redisstack"
+mkdir -p "$TMP_FOLDER"
+
+cp "./release/$SOURCE_APP" "$TMP_FOLDER"
+cd "$TMP_FOLDER" || exit 1
+
+./"$SOURCE_APP" --appimage-extract
+mv squashfs-root "$APP_FOLDER_NAME"
+
+tar -czvf "$TAR_NAME" "$APP_FOLDER_NAME"
+
+cp "$TAR_NAME" "$WORKING_DIRECTORY/release/redisstack/"
+cd "$WORKING_DIRECTORY" || exit 1

.circleci/redisstack/build_modules.sh

@@ -2,9 +2,9 @@
 
 PLATFORM=${PLATFORM:-'linux'}
 ELECTRON_VERSION=$(cat electron/version)
-VERSION=${ELECTRON_VERSION:-'redisstack'}
 ARCH=${ARCH:-'x64'}
-FILENAME="RedisInsight-$PLATFORM.$VERSION.$ARCH.zip"
+#FILENAME="RedisInsight-$PLATFORM.$VERSION.$ARCH.zip"
+FILENAME="RedisInsight-v2-web-$PLATFORM.$ARCH.tar.gz"
 
 # reinstall backend prod dependencies only (optimise space)
 rm -rf redisinsight/api/node_modules
@@ -13,19 +13,21 @@ npm_config_arch="$ARCH" \
 npm_config_target_arch="$ARCH" \
 npm_config_platform="$PLATFORM" \
 npm_config_target_platform="$PLATFORM" \
-npm_config_keytar_binary_host_mirror="$KEYTAR_MIRROR" \
-npm_config_node_sqlite3_binary_host_mirror="$SQLITE_MIRROR" \
 yarn --cwd ./redisinsight/api install --production
 
 cp redisinsight/api/.yarnclean.prod redisinsight/api/.yarnclean
 yarn --cwd ./redisinsight/api autoclean --force
 
 rm -rf redisinsight/build.zip
-cd redisinsight && zip -r 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
-cp redisinsight/build.zip release/redisstack/"$FILENAME"
+cp redisinsight/build.tar.gz release/redisstack/"$FILENAME"

.circleci/redisstack/dmg.repack.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+ARCH=${ARCH:-x64}
+WORKING_DIRECTORY=$(pwd)
+TAR_NAME="RedisInsight-v2-app-darwin.$ARCH.tar.gz"
+APP_FOLDER_NAME="RedisInsight-v2.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-v2-mac-$ARCH.dmg"
+cp -a /Volumes/RedisInsight-*/RedisInsight-v2.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-*/

.github/redisinsight_browser.png

@@ -50,6 +50,7 @@ RUN set -ex \
  && chown avahi:avahi /var/run/avahi-daemon \
  && chmod 777 /var/run/avahi-daemon
 
+RUN apt-get install net-tools
 RUN apt-get install -y dbus-x11 gnome-keyring libsecret-1-0
 RUN dbus-uuidgen > /var/lib/dbus/machine-id
 

Dockerfile

@@ -23,6 +23,7 @@ RedisInsight is an intuitive and efficient GUI for Redis, allowing you to intera
 * Browse, filter and visualise your key-value Redis data structures
 * CRUD support for Lists, Hashes, Strings, Sets, Sorted Sets 
 * CRUD support for [RedisJSON](https://oss.redis.com/redisjson/)
+* Profiler - analyze every command sent to Redis in real-time 
 * Introducing Workbench - advanced command line interface with intelligent command auto-complete and complex data visualizations
 * Command auto-complete support for [RediSearch](https://oss.redis.com/redisearch/), [RedisJSON](https://oss.redis.com/redisjson/), [RedisGraph](https://oss.redis.com/redisgraph/), [RedisTimeSeries](https://oss.redis.com/redistimeseries/), [RedisAI](https://oss.redis.com/redisai/)
 * Visualizations of your [RediSearch](https://oss.redis.com/redisearch/) index, queries, and aggregations

README.md

@@ -48,6 +48,8 @@ module.exports = (api) => {
       require('@babel/plugin-syntax-import-meta'),
       [require('@babel/plugin-proposal-class-properties'), { loose: true }],
       require('@babel/plugin-proposal-json-strings'),
+      [require('@babel/plugin-proposal-private-property-in-object'), { loose: true }],
+      [require('@babel/plugin-proposal-private-methods'), { loose: true }],
 
       ...(development ? developmentPlugins : productionPlugins),
     ],

babel.config.js

@@ -135,8 +135,8 @@ export default merge(baseConfig, {
             loader: 'file-loader',
             options: {
               name: '[hash]-[name].[ext]',
-              outputPath: 'static',
-              publicPath: 'static',
+              outputPath: 'fonts',
+              publicPath: 'fonts',
             },
           },
         ],
@@ -150,8 +150,8 @@ export default merge(baseConfig, {
             loader: 'file-loader',
             options: {
               name: '[hash]-[name].[ext]',
-              outputPath: 'static',
-              publicPath: 'static',
+              outputPath: 'fonts',
+              publicPath: 'fonts',
             },
           },
         ],
@@ -169,8 +169,8 @@ export default merge(baseConfig, {
             loader: 'file-loader',
             options: {
               name: '[hash]-[name].[ext]',
-              outputPath: 'static',
-              publicPath: 'static',
+              outputPath: 'fonts',
+              publicPath: 'fonts',
             },
           },
         ],
@@ -209,6 +209,7 @@ export default merge(baseConfig, {
       BASE_API_URL: 'http://localhost',
       RESOURCES_BASE_URL: 'http://localhost',
       SCAN_COUNT_DEFAULT: '500',
+      SCAN_TREE_COUNT_DEFAULT: '10000',
       BUILD_TYPE: 'ELECTRON',
       APP_VERSION: version,
       SEGMENT_WRITE_KEY:

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

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