Merge pull request #3021 from RedisInsight/latest

vlad-dargel · web-flow · commit 9f533b9f789a · 2024-02-02T19:25:48.000+01:00
Latest to main
diff --git a/.circleci/build/sum_sha256.sh b/.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"' _ {} \;
diff --git a/.circleci/config.yml b/.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)
diff --git a/electron-builder.json b/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",
diff --git a/redisinsight/api/config/default.ts b/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: [],
diff --git a/redisinsight/api/config/swagger.ts b/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: [],
 };
diff --git a/redisinsight/api/package.json b/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": {
diff --git a/redisinsight/api/src/modules/custom-tutorial/providers/custom-tutorial.fs.provider.ts b/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);
     }
   }
diff --git a/redisinsight/desktop/src/lib/aboutPanel/aboutPanel.ts b/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.`,
diff --git a/redisinsight/package.json b/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": {
diff --git a/redisinsight/ui/src/components/database-side-panels/panels/enablement-area/EnablementArea/components/CodeButtonBlock/CodeButtonBlock.tsx b/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
     }
 
diff --git a/redisinsight/ui/src/components/onboarding-features/OnboardingFeatures.spec.tsx b/redisinsight/ui/src/components/onboarding-features/OnboardingFeatures.spec.tsx
@@ -17,7 +17,12 @@ import { DatabaseAnalysisViewTab } from 'uiSrc/slices/interfaces/analytics'
 import { fetchRedisearchListAction, loadList } from 'uiSrc/slices/browser/redisearch'
 import { stringToBuffer } from 'uiSrc/utils'
 import { RedisResponseBuffer } from 'uiSrc/slices/interfaces'
-import { changeSelectedTab, toggleInsightsPanel } from 'uiSrc/slices/panels/insights'
+import {
+  changeSelectedTab,
+  resetExplorePanelSearch,
+  setExplorePanelIsPageOpen,
+  toggleInsightsPanel
+} from 'uiSrc/slices/panels/insights'
 import { InsightsPanelTabs } from 'uiSrc/slices/interfaces/insights'
 import { ONBOARDING_FEATURES } from './OnboardingFeatures'
 
@@ -503,6 +508,19 @@ describe('ONBOARDING_FEATURES', () => {
       expect(clearStoreActions(store.getActions().slice(-2)))
         .toEqual(clearStoreActions(expectedActions))
     })
+
+    it('should call proper actions on next', () => {
+      render(<OnboardingTour options={ONBOARDING_FEATURES.EXPLORE_REDIS}><span /></OnboardingTour>)
+      fireEvent.click(screen.getByTestId('next-btn'))
+
+      const expectedActions = [
+        resetExplorePanelSearch(),
+        setExplorePanelIsPageOpen(false),
+        setOnboardNextStep()
+      ]
+      expect(clearStoreActions(store.getActions().slice(-3)))
+        .toEqual(clearStoreActions(expectedActions))
+    })
   })
 
   describe('WORKBENCH_CUSTOM_TUTORIALS', () => {
diff --git a/redisinsight/ui/src/components/onboarding-features/OnboardingFeatures.tsx b/redisinsight/ui/src/components/onboarding-features/OnboardingFeatures.tsx
@@ -20,7 +20,12 @@ import { fetchRedisearchListAction } from 'uiSrc/slices/browser/redisearch'
 import { bufferToString, Nullable } from 'uiSrc/utils'
 import { CodeBlock } from 'uiSrc/components'
 
-import { changeSelectedTab, toggleInsightsPanel } from 'uiSrc/slices/panels/insights'
+import {
+  changeSelectedTab,
+  resetExplorePanelSearch,
+  setExplorePanelIsPageOpen,
+  toggleInsightsPanel
+} from 'uiSrc/slices/panels/insights'
 import { InsightsPanelTabs } from 'uiSrc/slices/interfaces/insights'
 import styles from './styles.module.scss'
 
@@ -281,7 +286,11 @@ const ONBOARDING_FEATURES = {
           dispatch(toggleInsightsPanel(false))
           sendBackTelemetryEvent(...telemetryArgs)
         },
-        onNext: () => sendNextTelemetryEvent(...telemetryArgs)
+        onNext: () => {
+          dispatch(resetExplorePanelSearch())
+          dispatch(setExplorePanelIsPageOpen(false))
+          sendNextTelemetryEvent(...telemetryArgs)
+        }
       }
     }
   },
diff --git a/redisinsight/ui/src/pages/autodiscover-cloud/redis-cloud-databases-result/styles.module.scss b/redisinsight/ui/src/pages/autodiscover-cloud/redis-cloud-databases-result/styles.module.scss
@@ -3,10 +3,10 @@
 @import '@elastic/eui/src/global_styling/index';
 
 :global(.homePage) :global(.cloudDatabaseListResult) {
-  height: calc(100vh - 277px) !important;
+  height: calc(100vh - 292px) !important;
 
   @media (min-width: 1130px) {
-    height: calc(100vh - 225px) !important;
+    height: calc(100vh - 236px) !important;
   }
 
   @media only screen and (max-width: 767px) {
diff --git a/redisinsight/ui/src/pages/autodiscover-cloud/redis-cloud-databases/styles.module.scss b/redisinsight/ui/src/pages/autodiscover-cloud/redis-cloud-databases/styles.module.scss
@@ -3,14 +3,10 @@
 @import '@elastic/eui/src/global_styling/index';
 
 :global(.homePage) :global(.cloudDatabaseList) {
-  height: calc(100vh - 310px) !important;
+  height: calc(100vh - 326px) !important;
 
   @media (min-width: 1130px) {
-    height: calc(100vh - 255px) !important;
-  }
-
-  @media only screen and (max-width: 767px) {
-    height: calc(100vh - 394px) !important;
+    height: calc(100vh - 272px) !important;
   }
 }
 
diff --git a/redisinsight/ui/src/pages/autodiscover-cloud/redis-cloud-subscriptions/styles.module.scss b/redisinsight/ui/src/pages/autodiscover-cloud/redis-cloud-subscriptions/styles.module.scss
@@ -32,14 +32,10 @@
 
 .cloudSubscriptions {
   overflow: hidden !important;
-  height: calc(100vh - 275px) !important;
+  height: calc(100vh - 292px) !important;
 
   @media (min-width: 1230px) {
-    height: calc(100vh - 225px) !important;
-  }
-
-  @media only screen and (max-width: 767px) {
-    height: calc(100vh - 360px) !important;
+    height: calc(100vh - 238px) !important;
   }
 }
 
diff --git a/redisinsight/ui/src/pages/autodiscover-sentinel/sentinel-databases-result/components/SentinelDatabasesResult/styles.module.scss b/redisinsight/ui/src/pages/autodiscover-sentinel/sentinel-databases-result/components/SentinelDatabasesResult/styles.module.scss
@@ -3,14 +3,10 @@
 @import '@elastic/eui/src/global_styling/index';
 
 :global(.homePage) :global(.sentinelDatabaseListResult) {
-  height: calc(100vh - 275px) !important;
+  height: calc(100vh - 292px) !important;
 
   @media (min-width: 1130px) {
-    height: calc(100vh - 225px) !important;
-  }
-
-  @media only screen and (max-width: 767px) {
-    height: calc(100vh - 360px) !important;
+    height: calc(100vh - 238px) !important;
   }
 }
 
diff --git a/redisinsight/ui/src/pages/autodiscover-sentinel/styles.module.scss b/redisinsight/ui/src/pages/autodiscover-sentinel/styles.module.scss
@@ -3,18 +3,10 @@
 @import "@elastic/eui/src/global_styling/index";
 
 :global(.homePage) :global(.sentinelDatabaseList) {
-  height: calc(100vh - 340px) !important;
+  height: calc(100vh - 356px) !important;
 
   @media (min-width: 1180px) {
-    height: calc(100vh - 280px) !important;
-  }
-
-  @media only screen and (max-width: 767px) {
-    height: calc(100vh - 440px) !important;
-  }
-
-  @media (min-width: 768px) and (max-width: 870px) {
-    height: calc(100vh - 360px) !important;
+    height: calc(100vh - 292px) !important;
   }
 }
 
diff --git a/redisinsight/ui/src/pages/home/components/databases-list-component/styles.module.scss b/redisinsight/ui/src/pages/home/components/databases-list-component/styles.module.scss
@@ -66,18 +66,10 @@ $breakpoint-l: 1400px;
 .noSearchResults {
   display: flex;
 
-  height: calc(100vh - 315px);
+  height: calc(100vh - 278px);
   align-items: center;
   flex-direction: column;
   justify-content: center;
-
-  @media (min-width: 768px) and (max-width: 1100px) {
-    height: calc(100vh - 223px);
-  }
-
-  @media (min-width: 1101px) {
-    height: calc(100vh - 248px);
-  }
 }
 
 .tableMsgTitle {
diff --git a/redisinsight/ui/src/pages/redis-cluster/styles.module.scss b/redisinsight/ui/src/pages/redis-cluster/styles.module.scss
@@ -13,26 +13,18 @@ $breakpoint-to-wrap-buttons: 660px;
 
 :global(.homePage) {
   :global(.clusterDatabaseList) {
-    height: calc(100vh - 300px) !important;
+    height: calc(100vh - 316px) !important;
 
     @media (min-width: 1130px) {
-      height: calc(100vh - 245px) !important;
-    }
-
-    @media only screen and (max-width: 767px) {
-      height: calc(100vh - 389px) !important;
+      height: calc(100vh - 256px) !important;
     }
   }
 
   :global(.clusterDatabaseListResult) {
-    height: calc(100vh - 280px) !important;
+    height: calc(100vh - 296px) !important;
 
     @media (min-width: 1130px) {
-      height: calc(100vh - 220px) !important;
-    }
-
-    @media only screen and (max-width: 767px) {
-      height: calc(100vh - 360px) !important;
+      height: calc(100vh - 232px) !important;
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"productName": "RedisInsight",`
`3`	`3`	`"appId": "org.RedisLabs.RedisInsight-V2",`
`4`		`- "copyright": "Copyright © 2023 Redis Ltd.",`
	`4`	`+ "copyright": "Copyright © 2024 Redis Ltd.",`
`5`	`5`	`"files": [`
`6`	`6`	`"dist",`
`7`	`7`	`"node_modules",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "redisinsight-api",`
`3`		`- "version": "2.40.0",`
	`3`	`+ "version": "2.42.0",`
`4`	`4`	`"description": "RedisInsight API",`
`5`	`5`	`"private": true,`
`6`	`6`	`"author": {`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ export class CustomTutorialFsProvider {`
`79`	`79`
`80`	`80`	`return this.unzipToTmpFolder(new AdmZip(data));`
`81`	`81`	`} catch (e) {`
`82`		`- this.logger.error('Unable to fetch zip file from external source', e);`
	`82`	`+ this.logger.error('Unable to fetch zip file from external source');`
`83`	`83`	`throw wrapHttpError(e, ERROR_MESSAGES.CUSTOM_TUTORIAL_UNABLE_TO_FETCH_FROM_EXTERNAL);`
`84`	`84`	`}`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ const CodeButtonBlock = (props: Props) => {`
`82`	`82`
`83`	`83`	`const handleRunClicked = () => {`
`84`	`84`	`if (!instanceId \|\| notLoadedModule \|\| (!isNotShowConfirmation && isButtonHasConfirmation)) {`
`85`		`- setIsPopoverOpen(true)`
	`85`	`+ setIsPopoverOpen((v) => !v)`
`86`	`86`	`return`
`87`	`87`	`}`
`88`	`88`