Merge branch 'main' into bugfix/RI-5597-dependabot-alerts-2024-04

# Conflicts:
#	tests/e2e/yarn.lock
#	yarn.lock

Author: rsergeenko

.circleci/build/build.Dockerfile

@@ -1,7 +1,7 @@
 FROM node:18.18-alpine
 
 # runtime args and environment variables
-ARG DIST=RedisInsight.tar.gz
+ARG DIST=Redis-Insight.tar.gz
 ARG NODE_ENV=production
 ARG RI_SEGMENT_WRITE_KEY
 ENV RI_SEGMENT_WRITE_KEY=${RI_SEGMENT_WRITE_KEY}

.circleci/build/build.sh

@@ -7,5 +7,5 @@ yarn --cwd redisinsight/api
 
 # build
 yarn build:statics
-yarn build:web
+yarn build:ui
 yarn --cwd ./redisinsight/api build:prod

.circleci/build/build_modules.sh

@@ -4,8 +4,8 @@ set -e
 PLATFORM=${PLATFORM:-'linux'}
 ARCH=${ARCH:-'x64'}
 LIBC=${LIBC:-''}
-#FILENAME="RedisInsight-$PLATFORM.$VERSION.$ARCH.zip"
-FILENAME="RedisInsight-web-$PLATFORM"
+#FILENAME="Redis-Insight-$PLATFORM.$VERSION.$ARCH.zip"
+FILENAME="Redis-Insight-web-$PLATFORM"
 if [ ! -z $LIBC ]
 then
   FILENAME="$FILENAME-$LIBC.$ARCH.tar.gz"

.circleci/build/release-docker.sh

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

.circleci/config.yml

@@ -24,7 +24,7 @@ aliases:
     run:
       name: Sign application
       command: |
-        $filePath = $(Get-ChildItem release -Filter RedisInsight*.exe | % { $_.FullName })
+        $filePath = $(Get-ChildItem release -Filter Redis-Insight*.exe | % { $_.FullName })
         $filePathWithQuotes = '"{0}"' -f $filePath
         & "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86\signtool.exe" sign /a /sm /n "Redis Labs Inc." /fd sha256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /v $FilePathWithQuotes
       shell: powershell.exe
@@ -645,11 +645,11 @@ jobs:
       - persist_to_workspace:
           root: .
           paths:
-            - release/RedisInsight*.deb
-            - release/RedisInsight*.rpm
-            - release/RedisInsight*.AppImage
-            - release/RedisInsight*.flatpak
-            - release/RedisInsight*.snap
+            - release/Redis-Insight*.deb
+            - release/Redis-Insight*.rpm
+            - release/Redis-Insight*.AppImage
+            - release/Redis-Insight*.flatpak
+            - release/Redis-Insight*.snap
             - release/*-linux.yml
   macosx:
     macos:
@@ -697,7 +697,7 @@ jobs:
               yarn package:prod
               yarn package:mas
               rm -rf release/mac
-              mv release/mas-universal/RedisInsight-mac-universal-mas.pkg release/RedisInsight-mac-universal-mas.pkg
+              mv release/mas-universal/Redis-Insight-mac-universal-mas.pkg release/Redis-Insight-mac-universal-mas.pkg
               exit 0;
             fi
 
@@ -727,7 +727,7 @@ jobs:
 
             yarn package:stage && yarn package:mas
             rm -rf release/mac
-            mv release/mas-universal/RedisInsight-mac-universal-mas.pkg release/RedisInsight-mac-universal-mas.pkg
+            mv release/mas-universal/Redis-Insight-mac-universal-mas.pkg release/Redis-Insight-mac-universal-mas.pkg
           no_output_timeout: 60m
       - when:
           condition:
@@ -741,10 +741,10 @@ jobs:
       - persist_to_workspace:
           root: .
           paths:
-            - release/RedisInsight*.zip
-            - release/RedisInsight*.dmg
-            - release/RedisInsight*.dmg.blockmap
-            - release/RedisInsight*.pkg
+            - release/Redis-Insight*.zip
+            - release/Redis-Insight*.dmg
+            - release/Redis-Insight*.dmg.blockmap
+            - release/Redis-Insight*.pkg
             - release/*-mac.yml
             - release/redisstack
   windows:
@@ -806,8 +806,8 @@ jobs:
       - persist_to_workspace:
           root: .
           paths:
-            - release/RedisInsight*.exe
-            - release/RedisInsight*.exe.blockmap
+            - release/Redis-Insight*.exe
+            - release/Redis-Insight*.exe.blockmap
             - release/*.yml
   virustotal-file:
     executor: linux-executor
@@ -822,7 +822,7 @@ jobs:
       - run:
           name: export FILE_NAME environment variable
           command: |
-            echo 'export FILE_NAME="RedisInsight*<< parameters.ext >>"' >> $BASH_ENV
+            echo 'export FILE_NAME="Redis-Insight*<< parameters.ext >>"' >> $BASH_ENV
       - <<: *fileScan
       - <<: *validate
   virustotal-url:
@@ -905,7 +905,7 @@ jobs:
             docker buildx build \
             -f .circleci/build/build.Dockerfile \
             --platform linux/amd64 \
-            --build-arg DIST=release/web/RedisInsight-web-linux-musl.x64.tar.gz \
+            --build-arg DIST=release/web/Redis-Insight-web-linux-musl.x64.tar.gz \
             --build-arg NODE_ENV=<< parameters.env >> \
             --build-arg RI_SEGMENT_WRITE_KEY="$TELEMETRY" \
             -t redisinsight:amd64 \
@@ -915,7 +915,7 @@ jobs:
             docker buildx build \
             -f .circleci/build/build.Dockerfile \
             --platform linux/arm64 \
-            --build-arg DIST=release/web/RedisInsight-web-linux-musl.arm64.tar.gz \
+            --build-arg DIST=release/web/Redis-Insight-web-linux-musl.arm64.tar.gz \
             --build-arg NODE_ENV=<< parameters.env >> \
             --build-arg RI_SEGMENT_WRITE_KEY="$TELEMETRY" \
             -t redisinsight:arm64 \
@@ -1039,7 +1039,7 @@ jobs:
             echo "export releasesFolderPath=${releasesFolderPath}" >> $BASH_ENV
             echo "export applicationName=${appName}" >> $BASH_ENV
             echo "export applicationVersion=${appVersion}" >> $BASH_ENV
-            echo "export appFileName=RedisInsight" >> $BASH_ENV
+            echo "export appFileName=Redis-Insight" >> $BASH_ENV
 
             # download latest.yml file to get last public version
             aws s3 cp s3://${AWS_BUCKET_NAME}/${downloadLatestFolderPath}/${latestYmlFileName} .
@@ -1082,39 +1082,39 @@ jobs:
             declare -A tag0=(
                 [arch]='x64'
                 [platform]='macos'
-                [objectDownload]=${applicationName}'-mac-x64.dmg'
-                [objectUpgrade]=${applicationName}'-mac-x64.zip'
+                [objectDownload]=${appFileName}'-mac-x64.dmg'
+                [objectUpgrade]=${appFileName}'-mac-x64.zip'
             )
 
             declare -A tag1=(
                 [arch]='arm64'
                 [platform]='macos'
-                [objectDownload]=${applicationName}'-mac-arm64.dmg'
-                [objectUpgrade]=${applicationName}'-mac-arm64.zip'
+                [objectDownload]=${appFileName}'-mac-arm64.dmg'
+                [objectUpgrade]=${appFileName}'-mac-arm64.zip'
             )
 
             declare -A tag2=(
                 [arch]='x64'
                 [platform]='windows'
-                [objectDownload]=${applicationName}'-win-installer.exe'
+                [objectDownload]=${appFileName}'-win-installer.exe'
             )
 
             declare -A tag3=(
                 [arch]='x64'
                 [platform]='linux_AppImage'
-                [objectDownload]=${applicationName}'-linux-x86_64.AppImage'
+                [objectDownload]=${appFileName}'-linux-x86_64.AppImage'
             )
 
             declare -A tag4=(
                 [arch]='x64'
                 [platform]='linux_deb'
-                [objectDownload]=${applicationName}'-linux-amd64.deb'
+                [objectDownload]=${appFileName}'-linux-amd64.deb'
             )
 
             declare -A tag5=(
                 [arch]='x64'
                 [platform]='linux_rpm'
-                [objectDownload]=${applicationName}'-linux-x86_64.rpm'
+                [objectDownload]=${appFileName}'-linux-x86_64.rpm'
             )
 
             # loop for add all tags to each app and create metrics
@@ -1750,28 +1750,28 @@ workflows:
 
       - virustotal-url:
           name: Virus check - AppImage (nightly)
-          fileName: RedisInsight-linux-x86_64.AppImage
+          fileName: Redis-Insight-linux-x86_64.AppImage
       - virustotal-url:
           name: Virus check - deb (nightly)
-          fileName: RedisInsight-linux-amd64.deb
+          fileName: Redis-Insight-linux-amd64.deb
       - virustotal-url:
           name: Virus check - rpm (nightly)
-          fileName: RedisInsight-linux-x86_64.rpm
+          fileName: Redis-Insight-linux-x86_64.rpm
       - virustotal-url:
           name: Virus check - snap (nightly)
-          fileName: RedisInsight-linux-amd64.snap
+          fileName: Redis-Insight-linux-amd64.snap
       - virustotal-url:
           name: Virus check x64 - dmg (nightly)
-          fileName: RedisInsight-mac-x64.dmg
+          fileName: Redis-Insight-mac-x64.dmg
       - virustotal-url:
           name: Virus check arm64 - dmg (nightly)
-          fileName: RedisInsight-mac-arm64.dmg
+          fileName: Redis-Insight-mac-arm64.dmg
       - virustotal-url:
           name: Virus check MAS - pkg (nightly)
-          fileName: RedisInsight-mac-universal-mas.pkg
+          fileName: Redis-Insight-mac-universal-mas.pkg
       - virustotal-url:
           name: Virus check - exe (nightly)
-          fileName: RedisInsight-win-installer.exe
+          fileName: Redis-Insight-win-installer.exe
       - virustotal-report:
           name: Virus check report (prod)
           requires:

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

@@ -3,10 +3,10 @@ set -e
 
 ARCH=${ARCH:-x86_64}
 WORKING_DIRECTORY=$(pwd)
-SOURCE_APP=${SOURCE_APP:-"RedisInsight-linux-$ARCH.AppImage"}
-RI_APP_FOLDER_NAME="RedisInsight-linux"
-TAR_NAME="RedisInsight-app-linux.$ARCH.tar.gz"
-TMP_FOLDER="/tmp/RedisInsight-app-$ARCH"
+SOURCE_APP=${SOURCE_APP:-"Redis-Insight-linux-$ARCH.AppImage"}
+RI_APP_FOLDER_NAME="Redis-Insight-linux"
+TAR_NAME="Redis-Insight-app-linux.$ARCH.tar.gz"
+TMP_FOLDER="/tmp/Redis-Insight-app-$ARCH"
 
 rm -rf "$TMP_FOLDER"
 

.circleci/redisstack/dmg.repack.sh

@@ -3,19 +3,19 @@ set -e
 
 ARCH=${ARCH:-x64}
 WORKING_DIRECTORY=$(pwd)
-TAR_NAME="RedisInsight-app-darwin.$ARCH.tar.gz"
-RI_APP_FOLDER_NAME="RedisInsight.app"
+TAR_NAME="Redis-Insight-app-darwin.$ARCH.tar.gz"
+RI_APP_FOLDER_NAME="Redis Insight.app"
 TMP_FOLDER="/tmp/$RI_APP_FOLDER_NAME"
 
 rm -rf "$TMP_FOLDER"
 
 mkdir -p "$WORKING_DIRECTORY/release/redisstack"
 mkdir -p "$TMP_FOLDER"
 
-hdiutil attach "./release/RedisInsight-mac-$ARCH.dmg"
-cp -a /Volumes/RedisInsight*/RedisInsight.app "/tmp"
+hdiutil attach "./release/Redis-Insight-mac-$ARCH.dmg"
+rsync -av /Volumes/Redis*/Redis\ Insight.app "/tmp"
 cd "/tmp" || exit 1
 tar -czvf "$TAR_NAME" "$RI_APP_FOLDER_NAME"
 cp "$TAR_NAME" "$WORKING_DIRECTORY/release/redisstack/"
 cd "$WORKING_DIRECTORY" || exit 1
-hdiutil unmount /Volumes/RedisInsight*/
+hdiutil unmount /Volumes/Redis*/

.github/ISSUE_TEMPLATE/bug_report.md

@@ -22,4 +22,4 @@ assignees: ''
 **Screenshots** (Paste or drag-and-drop a screenshot or a link to a recording)
 
 
-**Additional context** (Operating system, version of RedisInsight, Redis database version, Redis module version, database type, connection type, logs, or any other information)
+**Additional context** (Operating system, version of Redis Insight, Redis database version, Redis module version, database type, connection type, logs, or any other information)

.gitignore

@@ -50,6 +50,7 @@ redisinsight/api/commands
 redisinsight/api/guides
 redisinsight/api/tutorials
 redisinsight/api/content
+redisinsight/ui/dist-stats.html
 dist
 distWeb
 dll
@@ -67,6 +68,7 @@ licenses
 /tests/e2e/remote
 /tests/e2e/.redisinsight-v2
 /tests/e2e/.redisinsight-app
+/tests/e2e/.redisinsight-insight
 
 # Parcel
 .parcel-cache

CONTRIBUTING.md

@@ -18,7 +18,7 @@ Before you submit an issue, please search the issue tracker, maybe an issue for
 
 Use the following procedure to submit a pull request:
 
-    a. Fork RedisInsight on github ( https://docs.github.com/en/github/getting-started-with-github/fork-a-repo )
+    a. Fork Redis Insight on github ( https://docs.github.com/en/github/getting-started-with-github/fork-a-repo )
     b. Create a topic branch (git checkout -b my_branch)
     c. Push to your branch (git push origin my_branch)
     d. Initiate a pull request on github ( https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request )