Merge pull request #2265 from RedisInsight/release/2.28.0

Release/2.28.0 to main

Author: vlad-dargel

.circleci/config.yml

@@ -345,6 +345,8 @@ jobs:
     parallelism: << parameters.parallelism >>
     steps:
       - checkout
+      - node/install:
+          node-version: '18.15.0'
       - attach_workspace:
           at: .
       - run: sudo apt-get install net-tools
@@ -1179,6 +1181,12 @@ workflows:
       - windows:
           name: Build app - Windows (stage)
           requires: *stageElectronBuildRequires
+      # e2e desktop tests on AppImage build
+      - e2e-app-image:
+          name: E2ETest (AppImage)
+          parallelism: 2
+          requires:
+            - Build app - Linux (stage)
       # release to AWS (stage)
       - release-aws-test:
           name: Release AWS stage

.circleci/e2e/test.app-image.sh

@@ -15,7 +15,7 @@ docker-compose -f tests/e2e/rte.docker-compose.yml up --force-recreate -d -V
 ./tests/e2e/wait-for-redis.sh localhost 12000 && \
 
 # run tests
-COMMON_URL=$(tail -n 1 apppath)/resources/app.asar/index.html \
+COMMON_URL=$(tail -n 1 apppath)/resources/app.asar/dist/renderer/index.html \
 ELECTRON_PATH=$(tail -n 1 apppath)/redisinsight \
 SOCKETS_CORS=true \
 yarn --cwd tests/e2e dotenv -e .desktop.env yarn --cwd tests/e2e test:desktop:ci

.circleci/e2e/test.exe.cmd

@@ -1,7 +1,7 @@
 @echo off
 
-set COMMON_URL=%USERPROFILE%/AppData/Local/Programs/redisinsight/resources/app.asar/index.html
-set ELECTRON_PATH=%USERPROFILE%/AppData/Local/Programs/redisinsight/RedisInsight-preview.exe
+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 OSS_STANDALONE_HOST=%E2E_CLOUD_DATABASE_HOST%
 set OSS_STANDALONE_PORT=%E2E_CLOUD_DATABASE_PORT%
 set OSS_STANDALONE_USERNAME=%E2E_CLOUD_DATABASE_USERNAME%

electron-builder.json

@@ -29,7 +29,7 @@
     "type": "distribution",
     "hardenedRuntime": true,
     "darkModeSupport": true,
-    "bundleVersion": "30",
+    "bundleVersion": "50",
     "icon": "resources/icon.icns",
     "artifactName": "${productName}-${os}-${arch}.${ext}",
     "entitlements": "resources/entitlements.mac.plist",

package.json

@@ -230,14 +230,14 @@
     "connection-string": "^4.3.2",
     "d3": "^7.6.1",
     "date-fns": "^2.16.1",
-    "detect-port": "^1.3.0",
     "electron-context-menu": "^3.1.0",
     "electron-log": "^4.2.4",
     "electron-store": "^8.0.0",
     "electron-updater": "^5.0.5",
     "file-saver": "^2.0.5",
     "formik": "^2.2.9",
     "fzstd": "^0.1.0",
+    "get-port": "^7.0.0",
     "gzip-js": "^0.3.2",
     "html-entities": "^2.3.2",
     "html-react-parser": "^1.2.4",

redisinsight/api/config/default.ts

@@ -58,7 +58,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.28.0',
+    appVersion: process.env.APP_VERSION || '2.28.1',
     requestTimeout: parseInt(process.env.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.28.0',
+    version: '2.28.1',
   },
   tags: [],
 };

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

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

redisinsight/desktop/src/lib/menu/menu.ts

@@ -257,6 +257,8 @@ export class MenuBuilder {
             accelerator: 'F11',
             click: () => {
               this.mainWindow.setFullScreen(!this.mainWindow.isFullScreen())
+              // on Linux menubar is hidden on full screen mode
+              this.mainWindow.setMenuBarVisibility(true)
             }
           },
           {

redisinsight/desktop/src/lib/server/server.ts

@@ -1,5 +1,5 @@
-import detectPort from 'detect-port'
 import log from 'electron-log'
+import getPort, { portNumbers } from 'get-port'
 
 import { wrapErrorMessageSensitiveData } from 'desktopSrc/utils'
 import { configMain as config } from 'desktopSrc/config'
@@ -22,7 +22,7 @@ export class ElectronWindowAuthStrategy extends AbstractWindowAuthStrategy {
 let backendGracefulShutdown: Function
 export const launchApiServer = async () => {
   try {
-    const detectPortConst = await detectPort(port)
+    const detectPortConst = await getPort({ port: portNumbers(port, port + 1_000) })
     process.env.API_PORT = detectPortConst?.toString()
     log.info('Available port:', detectPortConst)
     const { gracefulShutdown: beGracefulShutdown, app: beApp } = await server()