Merge branch 'main' into feature/RI-4643-move-to-node-redis

# Conflicts:
#	redisinsight/ui/src/pages/browser/modules/key-details/components/hash-details/add-hash-fields/AddHashFields.tsx

Author: Artem

.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

@@ -657,6 +657,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
@@ -721,6 +725,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:
@@ -729,6 +742,7 @@ jobs:
             - release/RedisInsight*.dmg.blockmap
             - release/RedisInsight*.pkg
             - release/*-mac.yml
+            - release/redisstack
   windows:
     executor:
       name: win/default
@@ -972,6 +986,7 @@ jobs:
             --include "RedisInsight*" \
             --include "web/*" \
             --include "docker/*"
+            --include "redisstack/*"
 
   release-aws-private:
     executor: linux-executor
@@ -1348,6 +1363,7 @@ workflows:
       - macosx:
           name: Build app - MacOS (stage)
           env: stage
+          redisstack: false
           target: << pipeline.parameters.mac >>
           requires:
             - Setup build (stage)
@@ -1584,6 +1600,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/api/src/modules/statics-management/statics-management.module.ts

@@ -2,6 +2,7 @@ import { Module } from '@nestjs/common';
 import { ServeStaticModule } from '@nestjs/serve-static';
 import { join } from 'path';
 import config, { Config } from 'src/utils/config';
+import { Response } from 'express';
 import { AutoUpdatedStaticsProvider } from './providers/auto-updated-statics.provider';
 
 const SERVER_CONFIG = config.get('server') as Config['server'];
@@ -10,20 +11,29 @@ const TUTORIALS_CONFIG = config.get('tutorials') as Config['tutorials'];
 
 const CONTENT_CONFIG = config.get('content');
 
+const downloadableStaticFiles = (res: Response) => {
+  if (res.req?.query?.download === 'true') {
+    res.setHeader('Content-Type', 'application/octet-stream');
+    res.setHeader('Content-Disposition', 'attachment;');
+  }
+};
+
 @Module({
   imports: [
     ServeStaticModule.forRoot({
       serveRoot: SERVER_CONFIG.tutorialsUri,
       rootPath: join(PATH_CONFIG.tutorials),
       serveStaticOptions: {
         fallthrough: false,
+        setHeaders: downloadableStaticFiles,
       },
     }),
     ServeStaticModule.forRoot({
       serveRoot: SERVER_CONFIG.customTutorialsUri,
       rootPath: join(PATH_CONFIG.customTutorials),
       serveStaticOptions: {
         fallthrough: false,
+        setHeaders: downloadableStaticFiles,
       },
     }),
     ServeStaticModule.forRoot({

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/desktop/src/lib/app/deep-link.handlers.ts

@@ -22,7 +22,7 @@ export const deepLinkHandler = async (from?: string): Promise<undefined | IParse
           break
         default:
           return {
-            from: encodeURIComponent(from),
+            from,
             target: url.query?.target || '_self',
             initialPage: url.query?.initialPage,
           } as IParsedDeepLink