Merge branch 'main' into fe/feature/RI-4230_workbench_screens

Author: vlad-dargel

.circleci/config.yml

@@ -8,7 +8,10 @@ aliases:
         security create-keychain -p mysecretpassword $KEYCHAIN
         security default-keychain -s $KEYCHAIN
         security unlock-keychain -p mysecretpassword $KEYCHAIN
-        security import certs/cert.p12 -k $KEYCHAIN -P "$CSC_KEY_PASSWORD" -T /usr/bin/codesign
+        security set-keychain-settings -u -t 10000000 $KEYCHAIN
+        security import certs/mac-developer.p12 -k $KEYCHAIN -P "$CSC_KEY_PASSWORD" -T /usr/bin/codesign -T /usr/bin/productbuild
+        security import certs/mas-distribution.p12 -k $KEYCHAIN -P "$CSC_MAS_PASSWORD" -T /usr/bin/codesign -T /usr/bin/productbuild
+        security import certs/mac-installer.p12 -k $KEYCHAIN -P "$CSC_MAC_INSTALLER_PASSWORD" -T /usr/bin/codesign -T /usr/bin/productbuild
         security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword $KEYCHAIN
       environment:
         KEYCHAIN: redisinsight.keychain
@@ -129,7 +132,7 @@ aliases:
     key: v1-ui-deps-{{ checksum "redisinsight/api/yarn.lock" }}
 
 orbs:
-  win: circleci/[email protected].0
+  win: circleci/[email protected].1
   node: circleci/[email protected]
   aws: circleci/[email protected]
 
@@ -447,7 +450,9 @@ jobs:
           name: Setup sign certificates
           command: |
             mkdir -p certs
-            echo "$CSC_P12_BASE64" | base64 -id > certs/cert.p12
+            echo "$CSC_P12_BASE64" | base64 -id > certs/mac-developer.p12
+            echo "$CSC_MAC_INSTALLER_P12_BASE64" | base64 -id > certs/mac-installer.p12
+            echo "$CSC_MAS_P12_BASE64" | base64 -id > certs/mas-distribution.p12
             echo "$WIN_CSC_PFX_BASE64" | base64 -id > certs/redislabs_win.pfx
       - persist_to_workspace:
           root: .
@@ -469,19 +474,11 @@ jobs:
             mkdir electron
 
             CURRENT_VERSION=$(jq -r ".version" redisinsight/package.json)
-            echo "Version: ${CURRENT_VERSION}"
-
-            if [ << parameters.env >> == "prod" ]; then
-              echo "Build version: $CURRENT_VERSION"
-              cp ./redisinsight/package.json ./electron/package.json
-              echo "$VERSION" > electron/version
-              exit 0
-            fi
-
-            VERSION=$CURRENT_VERSION-<< parameters.env >>-$CIRCLE_BUILD_NUM
-            echo "Build version: $VERSION"
+            echo "Build version: $CURRENT_VERSION"
+            cp ./redisinsight/package.json ./electron/package.json
             echo "$VERSION" > electron/version
-            echo $(jq ".version=\"$VERSION\"" redisinsight/package.json) > electron/package.json
+            exit 0
+
       - persist_to_workspace:
           root: /root/project
           paths:
@@ -568,7 +565,7 @@ jobs:
             - release/redisstack
   macosx:
     macos:
-      xcode: 13.2.1
+      xcode: 14.2.0
     parameters:
       env:
         description: Build environment (stage || prod)
@@ -595,6 +592,10 @@ jobs:
       - run:
           name: Build macos dmg
           command: |
+            unset CSC_LINK
+            export CSC_IDENTITY_AUTO_DISCOVERY=true
+            export CSC_KEYCHAIN=redisinsight.keychain
+
             if [ << parameters.env >> == 'prod' ]; then
               yarn package:prod
               rm -rf release/mac
@@ -609,7 +610,7 @@ jobs:
 
             UPGRADES_LINK='' SEGMENT_WRITE_KEY='' yarn package:stage
             rm -rf release/mac
-          no_output_timeout: 15m
+          no_output_timeout: 60m
 
       - run:
           name: Repack dmg to tar
@@ -622,6 +623,7 @@ jobs:
             - release/RedisInsight*.zip
             - release/RedisInsight*.dmg
             - release/RedisInsight*.dmg.blockmap
+            - release/**/*.pkg
             - release/*-mac.yml
             - release/redisstack
   windows:
@@ -698,7 +700,22 @@ jobs:
       - run:
           name: Build Docker image (API + UI)
           command: |
-            docker build --build-arg NODE_ENV=<< parameters.env >> --build-arg SERVER_TLS_CERT="$SERVER_TLS_CERT" --build-arg SERVER_TLS_KEY="$SERVER_TLS_KEY" -t riv2:latest .
+            TELEMETRY=$SEGMENT_WRITE_KEY_DEV
+
+            if [ << parameters.env >> == 'production' ]; then
+              TELEMETRY=$SEGMENT_WRITE_KEY
+            fi
+
+            if [ << parameters.env >> == 'staging' ]; then
+              TELEMETRY=$SEGMENT_WRITE_KEY_STAGE
+            fi
+
+            docker build --build-arg NODE_ENV=<< parameters.env >> \
+            --build-arg SERVER_TLS_CERT="$SERVER_TLS_CERT" \
+            --build-arg SERVER_TLS_KEY="$SERVER_TLS_KEY" \
+            --build-arg SEGMENT_WRITE_KEY="$TELEMETRY" \
+            -t riv2:latest .
+
             mkdir -p docker-release
             docker image save -o docker-release/docker.tar riv2
       - persist_to_workspace:

Dockerfile

@@ -13,8 +13,10 @@ COPY redisinsight ./redisinsight
 RUN yarn --cwd redisinsight/api
 ARG SERVER_TLS_CERT
 ARG SERVER_TLS_KEY
+ARG SEGMENT_WRITE_KEY
 ENV SERVER_TLS_CERT=${SERVER_TLS_CERT}
 ENV SERVER_TLS_KEY=${SERVER_TLS_KEY}
+ENV SEGMENT_WRITE_KEY=${SEGMENT_WRITE_KEY}
 RUN yarn build:web
 RUN yarn build:statics
 
@@ -61,8 +63,10 @@ RUN dbus-uuidgen > /var/lib/dbus/machine-id
 ARG NODE_ENV=production
 ARG SERVER_TLS_CERT
 ARG SERVER_TLS_KEY
+ARG SEGMENT_WRITE_KEY
 ENV SERVER_TLS_CERT=${SERVER_TLS_CERT}
 ENV SERVER_TLS_KEY=${SERVER_TLS_KEY}
+ENV SEGMENT_WRITE_KEY=${SEGMENT_WRITE_KEY}
 ENV NODE_ENV=${NODE_ENV}
 ENV SERVER_STATIC_CONTENT=true
 ENV BUILD_TYPE='DOCKER_ON_PREMISE'

dev.provisionprofile

@@ -14,23 +14,76 @@
   "afterSign": "electron-builder-notarize",
   "artifactName": "${productName}-${os}-${arch}.${ext}",
   "compression": "normal",
+  "asarUnpack": [
+    "node_modules/keytar",
+    "node_modules/sqlite3",
+    "node_modules/cpu-features"
+  ],
   "mac": {
     "target": [
       {
         "target": "dmg",
         "arch": ["x64", "arm64"]
-      }, {
+      },
+      {
         "target": "zip",
         "arch": ["x64", "arm64"]
+      },
+      {
+        "target": "mas",
+        "arch": ["universal"]
       }
     ],
     "type": "distribution",
     "hardenedRuntime": true,
     "darkModeSupport": true,
+    "bundleVersion": "1",
+    "icon": "resources/icon.icns",
+    "artifactName": "${productName}-${os}-${arch}.${ext}",
     "entitlements": "resources/entitlements.mac.plist",
     "entitlementsInherit": "resources/entitlements.mac.plist",
     "gatekeeperAssess": false
   },
+  "mas": {
+    "mergeASARs": false,
+    "entitlements": "resources/entitlements.mas.plist",
+    "entitlementsInherit": "resources/entitlements.mas.inherit.plist",
+    "entitlementsLoginHelper": "resources/entitlements.mas.loginhelper.plist",
+    "hardenedRuntime": false,
+    "asarUnpack": ["node_modules"],
+    "provisioningProfile": "embedded.provisionprofile",
+    "binaries": [
+      "Contents/Resources/app-x64.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-darwin-unknown-arm64/node_sqlite3.node",
+      "Contents/Resources/app-x64.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-darwin-unknown-x64/node_sqlite3.node",
+      "Contents/Resources/app-arm64.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-darwin-unknown-arm64/node_sqlite3.node",
+      "Contents/Resources/app-arm64.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-darwin-unknown-x64/node_sqlite3.node",
+      "Contents/Resources/app-arm64.asar.unpacked/node_modules/keytar/build/Release/keytar.node",
+      "Contents/Resources/app-x64.asar.unpacked/node_modules/keytar/build/Release/keytar.node",
+      "Contents/Resources/app-arm64.asar.unpacked/node_modules/cpu-features/build/Release/cpufeatures.node",
+      "Contents/Resources/app-x64.asar.unpacked/node_modules/cpu-features/build/Release/cpufeatures.node"
+    ],
+    "artifactName": "${productName}-${os}-${arch}-mas.${ext}"
+  },
+  "masDev": {
+    "mergeASARs": false,
+    "entitlements": "resources/entitlements.mas.plist",
+    "entitlementsInherit": "resources/entitlements.mas.inherit.plist",
+    "entitlementsLoginHelper": "resources/entitlements.mas.loginhelper.plist",
+    "hardenedRuntime": false,
+    "asarUnpack": ["node_modules"],
+    "provisioningProfile": "dev.provisionprofile",
+    "binaries": [
+      "Contents/Resources/app-x64.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-darwin-unknown-arm64/node_sqlite3.node",
+      "Contents/Resources/app-x64.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-darwin-unknown-x64/node_sqlite3.node",
+      "Contents/Resources/app-arm64.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-darwin-unknown-arm64/node_sqlite3.node",
+      "Contents/Resources/app-arm64.asar.unpacked/node_modules/sqlite3/lib/binding/napi-v6-darwin-unknown-x64/node_sqlite3.node",
+      "Contents/Resources/app-arm64.asar.unpacked/node_modules/keytar/build/Release/keytar.node",
+      "Contents/Resources/app-x64.asar.unpacked/node_modules/keytar/build/Release/keytar.node",
+      "Contents/Resources/app-arm64.asar.unpacked/node_modules/cpu-features/build/Release/cpufeatures.node",
+      "Contents/Resources/app-x64.asar.unpacked/node_modules/cpu-features/build/Release/cpufeatures.node"
+    ],
+    "artifactName": "${productName}-${os}-${arch}-masDev.${ext}"
+  },
   "dmg": {
     "contents": [
       {
@@ -48,6 +101,7 @@
   "win": {
     "target": ["nsis"],
     "artifactName": "${productName}-${os}-installer.${ext}",
+    "icon": "resources/icon.ico",
     "publisherName": [
       "Redis Inc.",
       "Redis Labs Inc."

electron-builder.json

@@ -54,10 +54,10 @@ module.exports = {
   ],
   coverageThreshold: {
     global: {
-      statements: 77,
-      branches: 55,
-      functions: 65,
-      lines: 75,
+      statements: 78,
+      branches: 61,
+      functions: 70,
+      lines: 79,
     },
     // './redisinsight/ui/src/slices/**/*.ts': {
     //   statements: 90,

embedded.provisionprofile

@@ -26,6 +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: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",
@@ -118,6 +120,7 @@
     "@types/electron-store": "^3.2.0",
     "@types/express": "^4.17.3",
     "@types/file-saver": "^2.0.5",
+    "@types/gzip-js": "^0.3.3",
     "@types/html-entities": "^1.3.4",
     "@types/ioredis": "^4.26.0",
     "@types/is-glob": "^4.0.2",
@@ -151,11 +154,11 @@
     "css-loader": "^5.0.1",
     "css-minimizer-webpack-plugin": "^1.2.0",
     "electron": "^19.0.7",
-    "electron-builder": "^23.1.0",
-    "electron-builder-notarize": "^1.5.0",
+    "electron-builder": "^23.6.0",
+    "electron-builder-notarize": "^1.5.1",
     "electron-debug": "^3.2.0",
     "electron-devtools-installer": "^3.2.0",
-    "electron-rebuild": "^3.2.7",
+    "electron-rebuild": "^3.2.9",
     "eslint": "^7.5.0",
     "eslint-config-airbnb": "^18.2.1",
     "eslint-config-airbnb-typescript": "^12.0.0",
@@ -217,6 +220,7 @@
     "@elastic/eui": "34.6.0",
     "@msgpack/msgpack": "^2.7.2",
     "@reduxjs/toolkit": "^1.6.2",
+    "@stablelib/snappy": "^1.0.2",
     "axios": "^0.25.0",
     "buffer": "^6.0.3",
     "classnames": "^2.3.1",
@@ -230,12 +234,15 @@
     "electron-updater": "^5.0.5",
     "file-saver": "^2.0.5",
     "formik": "^2.2.9",
+    "fzstd": "^0.1.0",
+    "gzip-js": "^0.3.2",
     "html-entities": "^2.3.2",
     "html-react-parser": "^1.2.4",
     "java-object-serialization": "^0.1.1",
     "jpickle": "^0.4.1",
     "jsonpath": "^1.1.1",
     "lodash": "^4.17.21",
+    "lz4js": "^0.2.0",
     "php-serialize": "^4.0.2",
     "rawproto": "^0.7.6",
     "react": "^18.2.0",

jest.config.js

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

package.json

@@ -24,6 +24,7 @@ export default {
     logs: join(homedir, 'logs'),
     defaultPlugins: join(staticDir, 'plugins'),
     customPlugins: join(homedir, 'plugins'),
+    customTutorials: join(homedir, 'custom-tutorials'),
     pluginsAssets: join(staticDir, 'resources', 'plugins'),
     commands: join(homedir, 'commands'),
     defaultCommandsDir: join(defaultsDir, 'commands'),
@@ -45,6 +46,7 @@ export default {
     staticUri: '/static',
     guidesUri: '/static/guides',
     tutorialsUri: '/static/tutorials',
+    customTutorialsUri: '/static/custom-tutorials',
     contentUri: '/static/content',
     defaultPluginsUri: '/static/plugins',
     pluginsAssetsUri: '/static/resources/plugins',
@@ -54,7 +56,7 @@ export default {
     tlsKey: process.env.SERVER_TLS_KEY,
     staticContent: !!process.env.SERVER_STATIC_CONTENT || false,
     buildType: process.env.BUILD_TYPE || 'ELECTRON',
-    appVersion: process.env.APP_VERSION || '2.20.0',
+    appVersion: process.env.APP_VERSION || '2.22.0',
     requestTimeout: parseInt(process.env.REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],
@@ -95,6 +97,7 @@ export default {
   },
   analytics: {
     writeKey: process.env.SEGMENT_WRITE_KEY || 'SOURCE_WRITE_KEY',
+    flushInterval: parseInt(process.env.ANALYTICS_FLUSH_INTERVAL, 10) || 3000,
   },
   logger: {
     logLevel: process.env.LOG_LEVEL || 'info', // log level
@@ -108,14 +111,14 @@ export default {
   },
   guides: {
     updateUrl: process.env.GUIDES_UPDATE_URL
-      || 'https://github.com/RedisInsight/Guides/releases/download/release',
+      || 'https://github.com/RedisInsight/Guides/releases/download/2.x.x',
     zip: process.env.GUIDES_ZIP || dataZipFileName,
     buildInfo: process.env.GUIDES_CHECKSUM || buildInfoFileName,
     devMode: !!process.env.GUIDES_DEV_PATH,
   },
   tutorials: {
     updateUrl: process.env.TUTORIALS_UPDATE_URL
-      || 'https://github.com/RedisInsight/Tutorials/releases/download/release',
+      || 'https://github.com/RedisInsight/Tutorials/releases/download/2.x.x',
     zip: process.env.TUTORIALS_ZIP || dataZipFileName,
     buildInfo: process.env.TUTORIALS_CHECKSUM || buildInfoFileName,
     devMode: !!process.env.TUTORIALS_DEV_PATH,

redisinsight/about-panel.ts

@@ -12,6 +12,7 @@ import { ClientCertificateEntity } from 'src/modules/certificate/entities/client
 import { DatabaseEntity } from 'src/modules/database/entities/database.entity';
 import { SshOptionsEntity } from 'src/modules/ssh/entities/ssh-options.entity';
 import { BrowserHistoryEntity } from 'src/modules/browser/entities/browser-history.entity';
+import { CustomTutorialEntity } from 'src/modules/custom-tutorial/entities/custom-tutorial.entity';
 import migrations from '../migration';
 import * as config from '../src/utils/config';
 
@@ -35,6 +36,7 @@ const ormConfig = {
     DatabaseAnalysisEntity,
     BrowserHistoryEntity,
     SshOptionsEntity,
+    CustomTutorialEntity,
   ],
   migrations,
 };