Merge branch 'main' into feature/RI-4149-Enhance_syntax_in_auto-completion

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
 

dev.provisionprofile

@@ -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",

embedded.provisionprofile

@@ -8,7 +8,7 @@ const ICON_PATH = app.isPackaged
 export default {
   applicationName: 'RedisInsight-v2',
   applicationVersion:
-  `${app.getVersion() || '2.22.0'}${process.env.NODE_ENV !== 'production' && `-dev-${process.getCreationTime()}`}`,
+  `${app.getVersion() || '2.22.1'}${process.env.NODE_ENV !== 'production' ? `-dev-${process.getCreationTime()}` : ''}`,
   copyright: `Copyright © ${new Date().getFullYear()} Redis Ltd.`,
   iconPath: ICON_PATH,
 };

package.json

@@ -5,7 +5,7 @@ const SWAGGER_CONFIG: Omit<OpenAPIObject, 'paths'> = {
   info: {
     title: 'RedisInsight Backend API',
     description: 'RedisInsight Backend API',
-    version: '2.22.0',
+    version: '2.22.1',
   },
   tags: [],
 };

redisinsight/about-panel.ts

@@ -31,6 +31,8 @@ export enum Compressor {
   ZSTD = 'ZSTD',
   LZ4 = 'LZ4',
   SNAPPY = 'SNAPPY',
+  Brotli = 'Brotli',
+  PHPGZCompress = 'PHPGZCompress',
 }
 
 @Entity('database_instance')

redisinsight/api/config/swagger.ts

@@ -2,7 +2,7 @@
   "name": "redisinsight",
   "productName": "RedisInsight",
   "private": true,
-  "version": "2.22.0",
+  "version": "2.22.1",
   "description": "RedisInsight",
   "main": "./main.prod.js",
   "author": {