Merge remote-tracking branch 'origin/main' into be/bugfix/dependabot-fixes-2023-11

Author: GnaneshKunal

.circleci/config.yml

@@ -1619,28 +1619,28 @@ workflows:
 
       - virustotal-url:
           name: Virus check - AppImage (nightly)
-          fileName: RedisInsight-v2-linux-x86_64.AppImage
+          fileName: RedisInsight-linux-x86_64.AppImage
       - virustotal-url:
           name: Virus check - deb (nightly)
-          fileName: RedisInsight-v2-linux-amd64.deb
+          fileName: RedisInsight-linux-amd64.deb
       - virustotal-url:
           name: Virus check - rpm (nightly)
-          fileName: RedisInsight-v2-linux-x86_64.rpm
+          fileName: RedisInsight-linux-x86_64.rpm
       - virustotal-url:
           name: Virus check - snap (nightly)
-          fileName: RedisInsight-v2-linux-amd64.snap
+          fileName: RedisInsight-linux-amd64.snap
       - virustotal-url:
           name: Virus check x64 - dmg (nightly)
-          fileName: RedisInsight-v2-mac-x64.dmg
+          fileName: RedisInsight-mac-x64.dmg
       - virustotal-url:
           name: Virus check arm64 - dmg (nightly)
-          fileName: RedisInsight-v2-mac-arm64.dmg
+          fileName: RedisInsight-mac-arm64.dmg
       - virustotal-url:
           name: Virus check MAS - pkg (nightly)
           fileName: RedisInsight-mac-universal-mas.pkg
       - virustotal-url:
           name: Virus check - exe (nightly)
-          fileName: RedisInsight-v2-win-installer.exe
+          fileName: RedisInsight-win-installer.exe
       - virustotal-report:
           name: Virus check report (prod)
           requires:

.circleci/e2e/test.exe.cmd

@@ -1,7 +1,7 @@
 @echo off
 
 set COMMON_URL=%USERPROFILE%/AppData/Local/Programs/redisinsight/resources/app.asar/dist/renderer/index.html
-set ELECTRON_PATH=%USERPROFILE%/AppData/Local/Programs/redisinsight/RedisInsight-v2.exe
+set ELECTRON_PATH=%USERPROFILE%/AppData/Local/Programs/redisinsight/RedisInsight.exe
 set OSS_STANDALONE_HOST=%E2E_CLOUD_DATABASE_HOST%
 set OSS_STANDALONE_PORT=%E2E_CLOUD_DATABASE_PORT%
 set OSS_STANDALONE_USERNAME=%E2E_CLOUD_DATABASE_USERNAME%

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

@@ -3,9 +3,9 @@ set -e
 
 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"
+SOURCE_APP=${SOURCE_APP:-"RedisInsight-linux-$ARCH.AppImage"}
+APP_FOLDER_NAME="RedisInsight-linux"
+TAR_NAME="RedisInsight-app-linux.$ARCH.tar.gz"
 TMP_FOLDER="/tmp/RedisInsight-app-$ARCH"
 
 rm -rf "$TMP_FOLDER"

.circleci/redisstack/build_modules.sh

@@ -5,7 +5,7 @@ PLATFORM=${PLATFORM:-'linux'}
 ELECTRON_VERSION=$(cat electron/version)
 ARCH=${ARCH:-'x64'}
 #FILENAME="RedisInsight-$PLATFORM.$VERSION.$ARCH.zip"
-FILENAME="RedisInsight-v2-web-$PLATFORM.$ARCH.tar.gz"
+FILENAME="RedisInsight-web-$PLATFORM.$ARCH.tar.gz"
 
 # reinstall backend prod dependencies only (optimise space)
 rm -rf redisinsight/api/node_modules

.circleci/redisstack/dmg.repack.sh

@@ -3,19 +3,19 @@ set -e
 
 ARCH=${ARCH:-x64}
 WORKING_DIRECTORY=$(pwd)
-TAR_NAME="RedisInsight-v2-app-darwin.$ARCH.tar.gz"
-APP_FOLDER_NAME="RedisInsight-v2.app"
+TAR_NAME="RedisInsight-app-darwin.$ARCH.tar.gz"
+APP_FOLDER_NAME="RedisInsight.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"
+hdiutil attach "./release/RedisInsight-mac-$ARCH.dmg"
+cp -a /Volumes/RedisInsight*/RedisInsight.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-*/
+hdiutil unmount /Volumes/RedisInsight*/

.gitignore

@@ -66,6 +66,7 @@ licenses
 /tests/e2e/results
 /tests/e2e/remote
 /tests/e2e/.redisinsight-v2
+/tests/e2e/.redisinsight-app
 
 # Parcel
 .parcel-cache

README.md

@@ -7,7 +7,7 @@
 [![Discord](https://img.shields.io/discord/697882427875393627?style=flat-square)](https://discord.gg/QUkjSsk)
 
 
-RedisInsight is a visual tool that provides capabilities to design, develop and optimize your Redis application. 
+RedisInsight is a visual tool that provides capabilities to design, develop, and optimize your Redis application.
 Query, analyse and interact with your Redis data. [Download it here](https://redis.com/redis-enterprise/redis-insight/#insight-form)!
 
 ![RedisInsight Browser screenshot](/.github/redisinsight_browser.png)
@@ -23,26 +23,26 @@ RedisInsight is an intuitive and efficient GUI for Redis, allowing you to intera
 * Browse, filter, visualise your key-value Redis data structures and see key values in different formats (including JSON, Hex, ASCII, etc.)
 * CRUD support for Lists, Hashes, Strings, Sets, Sorted Sets, and Streams
 * CRUD support for [RedisJSON](https://oss.redis.com/redisjson/)
+* Interactive tutorials to learn easily, among other things, how to leverage the native JSON data structure supporting structured querying and full-text search, including vector similarity search for your AI use cases
+* Contextualised recommendations to optimize performance and memory usage. The list of recommendations gets updated as you interact with your database
 * Profiler - analyze every command sent to Redis in real-time
 * SlowLog - analyze slow operations in Redis instances based on the [Slowlog](https://github.com/RedisInsight/RedisInsight/releases#:~:text=results%20of%20the-,Slowlog,-command%20to%20analyze) command
 * Pub/Sub - support for [Redis pub/sub](https://redis.io/docs/manual/pubsub/), enabling subscription to channels and posting messages to channels
 * Bulk actions - Delete the keys in bulk based on the filters set in Browser or Tree view
-* Introducing Workbench - advanced command line interface with intelligent command auto-complete, complex data visualizations and support for the raw mode
+* Workbench - advanced command line interface with intelligent command auto-complete, complex data visualizations and support for the raw mode
 * 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
-* Ability to build your own data visualization plugins
-* Built-in click-through guides for Redis capabilities
-* 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 
+* Visualizations of your [RediSearch](https://oss.redis.com/redisearch/) index, queries, and aggregations. Ability to build [your own data visualization plugins](https://github.com/RedisInsight/Packages)
+* Officially supported for Redis OSS, [Redis Cloud](https://redis.com/try-free/). Works with Microsoft Azure Cache for Redis (official support upcoming)
 
 Check out the [release notes](https://docs.redis.com/latest/ri/release-notes/). 
 
 ## Get started with RedisInsight
 
-This repository includes the code for the GA version of RedisInsight 2.0. Check out the [blogpost](https://redis.com/blog/introducing-redisinsight-2/) announcing it. 
+This repository includes the code for RedisInsight. Check out the [blogpost](https://redis.com/blog/introducing-redisinsight-2/) announcing it. 
 
 ### Installable 
 Available to download for free from [here](https://redis.com/redis-enterprise/redis-insight/#insight-form).
+Supports Windows, macOS (including M1), and Linux.
 
 ### Build 
 Alternatively you can also build from source. See our wiki for instructions.

docs/plugins/installation.md

@@ -9,9 +9,9 @@ authors to avoid automatic execution of malicious code.
 
 1. Download the plugin for the Workbench.
 2. Open the `plugins` folder with the following path
-   * For MacOs: `<usersHomeDir>/.redisinsight-preview/plugins`
-   * For Windows: `C:/Users/{Username}/.redisinsight-preview/plugins`
-   * For Linux: `<usersHomeDir>/.redisinsight-preview/plugins`
+   * For MacOs: `<usersHomeDir>/.redisinsight-app/plugins`
+   * For Windows: `C:/Users/{Username}/.redisinsight-app/plugins`
+   * For Linux: `<usersHomeDir>/.redisinsight-app/plugins`
 3. Add the folder with plugin to the `plugins` folder
 
 To see the uploaded plugin visualizations in the command results, reload the Workbench 

electron-builder.json

@@ -1,5 +1,5 @@
 {
-  "productName": "RedisInsight-v2",
+  "productName": "RedisInsight",
   "appId": "org.RedisLabs.RedisInsight-V2",
   "copyright": "Copyright © 2023 Redis Ltd.",
   "files": [

redisinsight/api/config/default.ts

@@ -60,7 +60,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.36.0',
+    appVersion: process.env.APP_VERSION || '2.40.0',
     requestTimeout: parseInt(process.env.REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],
@@ -77,7 +77,7 @@ export default {
   redis_clients: {
     idleSyncInterval: parseInt(process.env.CLIENTS_IDLE_SYNC_INTERVAL, 10) || 1000 * 60 * 60, // 1hr
     maxIdleThreshold: parseInt(process.env.CLIENTS_MAX_IDLE_THRESHOLD, 10) || 1000 * 60 * 60, // 1hr
-    retryTimes: parseInt(process.env.CLIENTS_RETRY_TIMES, 10) || 5,
+    retryTimes: parseInt(process.env.CLIENTS_RETRY_TIMES, 10) || 3,
     retryDelay: parseInt(process.env.CLIENTS_RETRY_DELAY, 10) || 500,
     maxRetriesPerRequest: parseInt(process.env.CLIENTS_MAX_RETRIES_PER_REQUEST, 10) || 1,
   },