Merge branch 'main' into fe/feature/RI-5376-parse-redis-url

# Conflicts:
#	redisinsight/ui/src/pages/home/utils/form.tsx

Author: rsergeenko

.circleci/build/sum_sha256.sh

@@ -1,8 +1,4 @@
 #!/bin/bash
 set -e
 
-cd ./release/web
-
-for f in *.tar.gz; do
-  sha256sum "$f" > "$f.sha256"
-done
+find ./release -type f -name '*.tar.gz' -execdir sh -c 'sha256sum "$1" > "$1.sha256"' _ {} \;

.circleci/config.yml

@@ -646,6 +646,10 @@ jobs:
         type: enum
         default: stage
         enum: ['stage', 'prod', 'dev']
+      redisstack:
+        description: Build RedisStack archives
+        type: boolean
+        default: true
       target:
         description: Build target
         type: string
@@ -710,6 +714,15 @@ jobs:
             rm -rf release/mac
             mv release/mas-universal/RedisInsight-mac-universal-mas.pkg release/RedisInsight-mac-universal-mas.pkg
           no_output_timeout: 60m
+      - when:
+          condition:
+            equal: [ true, << parameters.redisstack >> ]
+          steps:
+            - run:
+                name: Repack dmg to tar
+                command: |
+                  ARCH=x64 ./.circleci/redisstack/dmg.repack.sh
+                  ARCH=arm64 ./.circleci/redisstack/dmg.repack.sh
       - persist_to_workspace:
           root: .
           paths:
@@ -718,6 +731,7 @@ jobs:
             - release/RedisInsight*.dmg.blockmap
             - release/RedisInsight*.pkg
             - release/*-mac.yml
+            - release/redisstack
   windows:
     executor:
       name: win/default
@@ -961,6 +975,7 @@ jobs:
             --include "RedisInsight*" \
             --include "web/*" \
             --include "docker/*"
+            --include "redisstack/*"
 
   release-aws-private:
     executor: linux-executor
@@ -1334,6 +1349,7 @@ workflows:
       - macosx:
           name: Build app - MacOS (stage)
           env: stage
+          redisstack: false
           target: << pipeline.parameters.mac >>
           requires:
             - Setup build (stage)
@@ -1568,6 +1584,19 @@ workflows:
           name: Build docker images (prod)
           env: production
           requires: *prodElectronBuildRequires
+      # e2e desktop tests on AppImage build
+      - e2e-app-image:
+          name: E2ETest (AppImage)
+          parallelism: 2
+          requires:
+            - Build app - Linux (prod)
+      # e2e docker tests
+      - e2e-tests:
+          name: E2ETest
+          build: docker
+          parallelism: 4
+          requires:
+            - Build docker images (prod)
       # virus check all electron apps (prod)
       - virustotal-file:
           name: Virus check - AppImage (prod)

electron-builder.json

@@ -1,7 +1,7 @@
 {
   "productName": "RedisInsight",
   "appId": "org.RedisLabs.RedisInsight-V2",
-  "copyright": "Copyright © 2023 Redis Ltd.",
+  "copyright": "Copyright © 2024 Redis Ltd.",
   "files": [
     "dist",
     "node_modules",

redisinsight/api/config/default.ts

@@ -57,7 +57,7 @@ export default {
     tlsKey: process.env.RI_SERVER_TLS_KEY,
     staticContent: !!process.env.RI_SERVE_STATICS || true,
     buildType: process.env.RI_BUILD_TYPE || 'DOCKER_ON_PREMISE',
-    appVersion: process.env.RI_APP_VERSION || '2.40.0',
+    appVersion: process.env.RI_APP_VERSION || '2.42.0',
     requestTimeout: parseInt(process.env.RI_REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],

redisinsight/api/config/swagger.ts

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

redisinsight/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redisinsight-api",
-  "version": "2.40.0",
+  "version": "2.42.0",
   "description": "RedisInsight API",
   "private": true,
   "author": {

redisinsight/api/src/modules/custom-tutorial/providers/custom-tutorial.fs.provider.ts

@@ -79,7 +79,7 @@ export class CustomTutorialFsProvider {
 
       return this.unzipToTmpFolder(new AdmZip(data));
     } catch (e) {
-      this.logger.error('Unable to fetch zip file from external source', e);
+      this.logger.error('Unable to fetch zip file from external source');
       throw wrapHttpError(e, ERROR_MESSAGES.CUSTOM_TUTORIAL_UNABLE_TO_FETCH_FROM_EXTERNAL);
     }
   }

redisinsight/desktop/src/lib/aboutPanel/aboutPanel.ts

@@ -8,7 +8,7 @@ const ICON_PATH = app.isPackaged
 
 export const AboutPanelOptions = {
   applicationName: 'RedisInsight',
-  applicationVersion: `${app.getVersion() || '2.40.0'}${
+  applicationVersion: `${app.getVersion() || '2.42.0'}${
     !config.isProduction ? `-dev-${process.getCreationTime()}` : ''
   }`,
   copyright: `Copyright © ${new Date().getFullYear()} Redis Ltd.`,

redisinsight/package.json

@@ -2,7 +2,7 @@
   "name": "redisinsight",
   "productName": "RedisInsight",
   "private": true,
-  "version": "2.40.0",
+  "version": "2.42.0",
   "description": "RedisInsight",
   "main": "./dist/main/main.js",
   "author": {

redisinsight/ui/src/components/database-side-panels/panels/enablement-area/EnablementArea/components/CodeButtonBlock/CodeButtonBlock.tsx

@@ -82,7 +82,7 @@ const CodeButtonBlock = (props: Props) => {
 
   const handleRunClicked = () => {
     if (!instanceId || notLoadedModule || (!isNotShowConfirmation && isButtonHasConfirmation)) {
-      setIsPopoverOpen(true)
+      setIsPopoverOpen((v) => !v)
       return
     }