Merge branch 'main' into release/2.24.0

Author: vlad-dargel

.circleci/config.yml

@@ -598,17 +598,18 @@ jobs:
 
             if [ << parameters.env >> == 'prod' ]; then
               yarn package:prod
+              yarn package:mas
               rm -rf release/mac
               exit 0;
             fi
 
             if [ << parameters.env >> == 'stage' ]; then
-              UPGRADES_LINK=$UPGRADES_LINK_STAGE SEGMENT_WRITE_KEY=$SEGMENT_WRITE_KEY_STAGE yarn package:stage
+              UPGRADES_LINK=$UPGRADES_LINK_STAGE SEGMENT_WRITE_KEY=$SEGMENT_WRITE_KEY_STAGE yarn package:stage && yarn package:mas
               rm -rf release/mac
               exit 0;
             fi
 
-            UPGRADES_LINK='' SEGMENT_WRITE_KEY='' yarn package:stage
+            UPGRADES_LINK='' SEGMENT_WRITE_KEY='' yarn package:stage && yarn package:mas
             rm -rf release/mac
           no_output_timeout: 60m
 

README.md

@@ -32,7 +32,7 @@ RedisInsight is an intuitive and efficient GUI for Redis, allowing you to intera
 * Visualizations of your [RediSearch](https://oss.redis.com/redisearch/) index, queries, and aggregations
 * Ability to build your own data visualization plugins
 * Built-in click-through guides for Redis capabilities
-* Oficially supported for Redis OSS, [Redis Cloud](https://redis.com/try-free/). Works with Microsoft Azure Cache for Redis (official support upcoming).
+* Officially supported for Redis OSS, [Redis Cloud](https://redis.com/try-free/). Works with Microsoft Azure Cache for Redis (official support upcoming).
 * Available for macOS (including M1), Windows and Linux 
 
 Check out the [release notes](https://docs.redis.com/latest/ri/release-notes/). 

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

@@ -66,6 +66,7 @@ export default merge(baseConfig, {
       SERVER_TLS_KEY: process.env.SERVER_TLS_KEY || '',
       APP_FOLDER_NAME: process.env.APP_FOLDER_NAME || '',
       UPGRADES_LINK: process.env.UPGRADES_LINK || '',
+      RI_HOSTNAME: '127.0.0.1',
       BUILD_TYPE: 'ELECTRON',
       APP_VERSION: version,
       AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',

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

@@ -26,6 +26,7 @@ export default merge(mainProdConfig, {
       SERVER_TLS_KEY: process.env.SERVER_TLS_KEY || '',
       APP_FOLDER_NAME: process.env.APP_FOLDER_NAME || '',
       UPGRADES_LINK: process.env.UPGRADES_LINK || '',
+      RI_HOSTNAME: '127.0.0.1',
       BUILD_TYPE: 'ELECTRON',
       APP_VERSION: version,
       AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',

dev.provisionprofile

@@ -11,7 +11,7 @@ Data visualization provided by the plugin is rendered within the
 Workbench results area and is based on the executed command, ie. a certain
 Redis command can generate its own custom data visualization.
 
-We have included the following [plugin package example](https://github.com/RedisInsight/RedisInsight/tree/main/redisinsight/ui/src/packages/clients-list-example) for your reference: running the CLIENT LIST command presents the output in a tabular format for easier reading.
+We have included the following [plugin package example](https://github.com/RedisInsight/RedisInsight/tree/main/redisinsight/ui/src/packages/clients-list) for your reference: running the CLIENT LIST command presents the output in a tabular format for easier reading.
 
 ## Wiki
 

docs/plugins/introduction.md

@@ -0,0 +1,9 @@
+const electronBuilder = require('./electron-builder.json');
+
+const config = {
+  ...electronBuilder,
+  appId: 'com.redis.RedisInsight',
+  productName: 'RedisInsight',
+};
+
+module.exports = config;

electron-builder-mas.js

@@ -28,16 +28,12 @@
       {
         "target": "zip",
         "arch": ["x64", "arm64"]
-      },
-      {
-        "target": "mas",
-        "arch": ["universal"]
       }
     ],
     "type": "distribution",
     "hardenedRuntime": true,
     "darkModeSupport": true,
-    "bundleVersion": "1",
+    "bundleVersion": "3",
     "icon": "resources/icon.icns",
     "artifactName": "${productName}-${os}-${arch}.${ext}",
     "entitlements": "resources/entitlements.mac.plist",

electron-builder.json

@@ -26,8 +26,8 @@
     "package": "yarn package:dev",
     "package:prod": "yarn build:prod && electron-builder build -p never",
     "package:stage": "yarn build:stage && electron-builder build -p never",
-    "build:mas": "electron-builder build -p never -m mas:universal",
-    "build:mas:dev": "electron-builder build -p never -m mas-dev:universal",
+    "package:mas": "electron-builder build -p never -m mas:universal -c ./electron-builder-mas.js",
+    "package:mas:dev": "electron-builder build -p never -m mas-dev:universal -c ./electron-builder-mas.js",
     "package:dev": "yarn build && cross-env DEBUG=electron-builder electron-builder build -p never",
     "package:win": "yarn build:prod && electron-builder build --win --x64 -p never",
     "package:mac": "yarn build:prod && electron-builder build --mac -p never",
@@ -128,6 +128,7 @@
     "@types/jsonpath": "^0.2.0",
     "@types/lodash": "^4.14.171",
     "@types/node": "14.14.10",
+    "@types/pako": "^2.0.0",
     "@types/react": "^18.0.20",
     "@types/react-dom": "^18.0.5",
     "@types/react-redux": "^7.1.12",
@@ -222,6 +223,7 @@
     "@reduxjs/toolkit": "^1.6.2",
     "@stablelib/snappy": "^1.0.2",
     "axios": "^0.25.0",
+    "brotli-unicode": "^1.0.2",
     "buffer": "^6.0.3",
     "classnames": "^2.3.1",
     "connection-string": "^4.3.2",
@@ -243,6 +245,7 @@
     "jsonpath": "^1.1.1",
     "lodash": "^4.17.21",
     "lz4js": "^0.2.0",
+    "pako": "^2.1.0",
     "php-serialize": "^4.0.2",
     "rawproto": "^0.7.6",
     "react": "^18.2.0",