Merge pull request #3794 from RedisInsight/release/2.56.0

Release/2.56.0 to latest

Author: vlad-dargel

.circleci/build/build_modules.sh

@@ -46,3 +46,49 @@ LICENSE \
 
 mkdir -p release/web
 cp redisinsight/build.tar.gz release/web/"$FILENAME"
+
+# Minify build via esbuild
+echo "Start minifing workflow"
+npm_config_arch="$ARCH" \
+npm_config_target_arch="$ARCH" \
+npm_config_platform="$PLATFORM" \
+npm_config_target_platform="$PLATFORM" \
+yarn --cwd ./redisinsight/api install
+yarn --cwd ./redisinsight/api minify:prod
+
+
+PACKAGE_JSON_PATH="./redisinsight/api/package.json"
+APP_PACKAGE_JSON_PATH="./redisinsight/package.json"
+
+# Extract dependencies from the app package.json
+BINARY_PACKAGES=$(jq -r '.dependencies | keys[]' "$APP_PACKAGE_JSON_PATH" | jq -R -s -c 'split("\n")[:-1]')
+
+echo "Binary packages to exclude during minify: $BINARY_PACKAGES"
+
+# Modify the package.json
+jq --argjson keep "$BINARY_PACKAGES" \
+  'del(.devDependencies) | .dependencies |= with_entries(select(.key as $k | $keep | index($k)))' \
+  "$PACKAGE_JSON_PATH" > temp.json && mv temp.json "$PACKAGE_JSON_PATH"
+
+npm_config_arch="$ARCH" \
+npm_config_target_arch="$ARCH" \
+npm_config_platform="$PLATFORM" \
+npm_config_target_platform="$PLATFORM" \
+yarn --cwd ./redisinsight/api install --production
+yarn --cwd ./redisinsight/api autoclean --force
+
+# Compress minified build
+cd redisinsight && tar -czf build-mini.tar.gz \
+--exclude="api/node_modules/**/build/node_gyp_bins/python3" \
+api/node_modules \
+api/dist-minified \
+ui/dist \
+LICENSE \
+&& cd ..
+
+mkdir -p release/web-mini
+cp redisinsight/build-mini.tar.gz release/web-mini/"$FILENAME"
+
+# Restore the original package.json and yarn.lock
+git restore redisinsight/api/yarn.lock redisinsight/api/package.json
+

.circleci/build/release-docker.sh

@@ -2,7 +2,7 @@
 set -e
 
 HELP="Args:
--v - Semver (2.54.0)
+-v - Semver (2.56.0)
 -d - Build image repository (Ex: -d redisinsight)
 -r - Target repository (Ex: -r redis/redisinsight)
 "

.circleci/deps-licenses-report.js

@@ -78,7 +78,7 @@ async function runLicenseCheck(path) {
     new Promise((resolve, reject) => {
       exec(command, (error, stdout, stderr) => {
         if (error) {
-          console.error(`Failed command: ${commandProd}, error:`, stderr);
+          console.error(`Failed command: ${command}, error:`, stderr);
           reject(error);
         }
         resolve();

.gitignore

@@ -48,6 +48,7 @@ redisinsight/ui/style.css.map
 redisinsight/ui/dist
 redisinsight/api/commands
 redisinsight/api/guides
+redisinsight/api/dist-minified
 redisinsight/api/tutorials
 redisinsight/api/content
 redisinsight/ui/dist-stats.html

.snyk

@@ -2,6 +2,7 @@
 exclude:
   global:
     - __mocks__/**
+    - redisinsight/api/src/__mocks__/**
     - tests
     - redisinsight/api/test/**
     - "*.spec.ts"

README.md

@@ -1,7 +1,7 @@
 [![Release](https://img.shields.io/github/v/release/RedisInsight/RedisInsight.svg?sort=semver)](https://github.com/RedisInsight/RedisInsight/releases)
 [![CircleCI](https://circleci.com/gh/RedisInsight/RedisInsight/tree/main.svg?style=svg)](https://circleci.com/gh/RedisInsight/RedisInsight/tree/main)
 
-# <img src="https://redis.com/wp-content/uploads/2019/11/ico-redisinsight.svg" alt="logo" width="25"/>  Redis Insight - Developer GUI for Redis, by Redis.
+# <img src="https://github.com/RedisInsight/RedisInsight/blob/main/resources/icon.png" alt="logo" width="25"/>  Redis Insight - Developer GUI for Redis, by Redis.
 [![Forum](https://img.shields.io/badge/Forum-RedisInsight-red)](https://forum.redis.com/c/redisinsight/65)
 [![Discord](https://img.shields.io/discord/697882427875393627?style=flat-square)](https://discord.gg/QUkjSsk)
 

configs/webpack.config.main.prod.ts

@@ -56,11 +56,13 @@ export default merge(baseConfig, {
       DEBUG_PROD: false,
       START_MINIMIZED: false,
       RI_APP_TYPE: 'electron',
+      RI_AUTO_BOOTSTRAP: 'false',
       RI_SERVER_TLS_CERT: process.env.RI_SERVER_TLS_CERT || '',
       RI_SERVER_TLS_KEY: process.env.RI_SERVER_TLS_KEY || '',
       RI_SERVE_STATICS: false,
       RI_APP_FOLDER_NAME: process.env.RI_APP_FOLDER_NAME || '',
       RI_UPGRADES_LINK: process.env.RI_UPGRADES_LINK || '',
+      RI_ANALYTICS_START_EVENTS: 'true',
       RI_APP_HOST: '127.0.0.1',
       RI_BUILD_TYPE: 'ELECTRON',
       RI_APP_VERSION: version,

package.json

@@ -222,7 +222,8 @@
     "classnames": "^2.3.1",
     "connection-string": "^4.3.2",
     "d3": "^7.6.1",
-    "date-fns": "^2.16.1",
+    "date-fns": "^3.6.0",
+    "date-fns-tz": "^3.1.3",
     "electron-context-menu": "^3.1.0",
     "electron-log": "^4.2.4",
     "electron-store": "^8.0.0",

redisinsight/api/.eslintrc.js

@@ -14,6 +14,7 @@ module.exports = {
     'max-classes-per-file': 'off',
     'class-methods-use-this': 'off', // should be ignored since NestJS allow inheritance without using "this" inside class methods
     'no-await-in-loop': 'off',
+    'import/no-extraneous-dependencies': 'off',
   },
   parserOptions: {
     project: './tsconfig.json',

redisinsight/api/config/default.ts

@@ -12,9 +12,10 @@ const staticDir = process.env.RI_BUILD_TYPE === 'ELECTRON' && process['resources
   ? join(process['resourcesPath'], 'static')
   : join(__dirname, '..', 'static');
 
-const defaultsDir = process.env.RI_BUILD_TYPE === 'ELECTRON' && process['resourcesPath']
-  ? join(process['resourcesPath'], 'defaults')
-  : join(__dirname, '..', 'defaults');
+const defaultsDir = process.env.RI_DEFAULTS_DIR
+  || ((process.env.RI_BUILD_TYPE === 'ELECTRON' && process['resourcesPath'])
+    ? join(process['resourcesPath'], 'defaults')
+    : join(__dirname, '..', 'defaults'));
 
 const proxyPath = trim(process.env.RI_PROXY_PATH, '/');
 
@@ -71,17 +72,21 @@ export default {
     base: process.env.RI_BASE || '/',
     proxyPath,
     secretStoragePassword: process.env.RI_SECRET_STORAGE_PASSWORD,
+    agreementsPath: process.env.RI_AGREEMENTS_PATH,
     encryptionKey: process.env.RI_ENCRYPTION_KEY,
     tlsCert: process.env.RI_SERVER_TLS_CERT,
     tlsKey: process.env.RI_SERVER_TLS_KEY,
     staticContent: !!process.env.RI_SERVE_STATICS || true,
+    migrateOldFolders: process.env.RI_MIGRATE_OLD_FOLDERS ? process.env.RI_MIGRATE_OLD_FOLDERS === 'true' : true,
+    autoBootstrap: process.env.RI_AUTO_BOOTSTRAP ? process.env.RI_AUTO_BOOTSTRAP === 'true' : true,
     buildType: process.env.RI_BUILD_TYPE || 'DOCKER_ON_PREMISE',
-    appVersion: process.env.RI_APP_VERSION || '2.54.0',
+    appVersion: process.env.RI_APP_VERSION || '2.56.0',
     requestTimeout: parseInt(process.env.RI_REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],
   },
   encryption: {
+    keytar: process.env.RI_ENCRYPTION_KEYTAR ? process.env.RI_ENCRYPTION_KEYTAR === 'true' : true, // enabled by default
     encryptionIV: process.env.RI_ENCRYPTION_IV || Buffer.alloc(16, 0),
     encryptionAlgorithm: process.env.RI_ENCRYPTION_ALGORYTHM || 'aes-256-cbc',
   },
@@ -109,7 +114,8 @@ export default {
   },
   redis_scan: {
     countDefault: parseInt(process.env.RI_SCAN_COUNT_DEFAULT, 10) || 200,
-    countThreshold: parseInt(process.env.RI_SCAN_COUNT_THRESHOLD, 10) || 10000,
+    scanThreshold: parseInt(process.env.RI_SCAN_THRESHOLD, 10) || 10000,
+    scanThresholdMax: parseInt(process.env.RI_SCAN_THRESHOLD_MAX, 10) || Number.MAX_VALUE,
   },
   modules: {
     json: {
@@ -125,6 +131,7 @@ export default {
   analytics: {
     writeKey: process.env.RI_SEGMENT_WRITE_KEY || 'SOURCE_WRITE_KEY',
     flushInterval: parseInt(process.env.RI_ANALYTICS_FLUSH_INTERVAL, 10) || 3000,
+    startEvents: process.env.RI_ANALYTICS_START_EVENTS ? process.env.RI_ANALYTICS_START_EVENTS === 'true' : false,
   },
   logger: {
     logLevel: process.env.RI_LOG_LEVEL || 'info', // log level
@@ -216,7 +223,8 @@ export default {
     timeout: parseInt(process.env.RI_CONNECTIONS_TIMEOUT_DEFAULT, 10) || 30 * 1_000, // 30 sec
   },
   redisStack: {
-    id: process.env.RI_BUILD_TYPE === 'REDIS_STACK' ? process.env.RI_REDIS_STACK_DATABASE_ID || 'redis-stack' : undefined,
+    id: process.env.RI_BUILD_TYPE === 'REDIS_STACK'
+      ? process.env.RI_REDIS_STACK_DATABASE_ID || 'redis-stack' : undefined,
     name: process.env.RI_REDIS_STACK_DATABASE_NAME,
     host: process.env.RI_REDIS_STACK_DATABASE_HOST,
     port: process.env.RI_REDIS_STACK_DATABASE_PORT,
@@ -258,6 +266,16 @@ export default {
         redirectUri: process.env.RI_CLOUD_IDP_GH_REDIRECT_URI || process.env.RI_CLOUD_IDP_REDIRECT_URI,
         idp: process.env.RI_CLOUD_IDP_GH_ID,
       },
+      sso: {
+        authorizeUrl: process.env.RI_CLOUD_IDP_SSO_AUTHORIZE_URL || process.env.RI_CLOUD_IDP_AUTHORIZE_URL,
+        tokenUrl: process.env.RI_CLOUD_IDP_SSO_TOKEN_URL || process.env.RI_CLOUD_IDP_TOKEN_URL,
+        revokeTokenUrl: process.env.RI_CLOUD_IDP_SSO_REVOKE_TOKEN_URL || process.env.RI_CLOUD_IDP_REVOKE_TOKEN_URL,
+        issuer: process.env.RI_CLOUD_IDP_SSO_ISSUER || process.env.RI_CLOUD_IDP_ISSUER,
+        clientId: process.env.RI_CLOUD_IDP_SSO_CLIENT_ID || process.env.RI_CLOUD_IDP_CLIENT_ID,
+        redirectUri: process.env.RI_CLOUD_IDP_SSO_REDIRECT_URI || process.env.RI_CLOUD_IDP_REDIRECT_URI,
+        emailVerificationUri: process.env.RI_CLOUD_IDP_SSO_EMAIL_VERIFICATION_URI || 'saml/okta_idp_id',
+        idp: process.env.RI_CLOUD_IDP_SSO_ID,
+      },
     },
   },
   ai: {