Merge branch 'main' into fix/RI-1902_ui-encryption-error

# Conflicts:
#	redisinsight/ui/src/pages/home/components/HelpLinksMenu/styles.module.scss

Author: Artyom Podymov

.circleci/config.yml

@@ -671,26 +671,26 @@ jobs:
             declare -A tag0=(
                 [key]='platform'
                 [value]='macos'
-                [objectDownload]=${appFileName}'-mac-x64.dmg'
-                [objectUpgrade]=${appFileName}'.zip'
+                [objectDownload]=${applicationName}'-mac-x64.dmg'
+                [objectUpgrade]=${applicationName}'.zip'
             )
 
             declare -A tag1=(
                 [key]='platform'
                 [value]='windows'
-                [objectDownload]=${appFileName}'-win-installer.exe'
+                [objectDownload]=${applicationName}'-win-installer.exe'
             )
 
             declare -A tag2=(
                 [key]='platform'
                 [value]='linux_AppImage'
-                [objectDownload]=${appFileName}'-linux.AppImage'
+                [objectDownload]=${applicationName}'-linux.AppImage'
             )
 
             declare -A tag3=(
                 [key]='platform'
                 [value]='linux_deb'
-                [objectDownload]=${appFileName}'-linux.deb'
+                [objectDownload]=${applicationName}'-linux.deb'
             )
 
             # loop for add all tags to each app and create metrics

configs/webpack.config.main.prod.babel.js

@@ -64,6 +64,8 @@ export default merge(baseConfig, {
       SERVER_TLS: true,
       SERVER_TLS_CERT: process.env.SERVER_TLS_CERT || '',
       SERVER_TLS_KEY: process.env.SERVER_TLS_KEY || '',
+      APP_FOLDER_NAME: process.env.APP_FOLDER_NAME || '',
+      UPGRADES_LINK: process.env.UPGRADES_LINK || '',
       BUILD_TYPE: 'ELECTRON',
       APP_VERSION: version,
       AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',

configs/webpack.config.main.stage.babel.js

@@ -23,6 +23,8 @@ export default merge(mainProdConfig, {
       SERVER_TLS: true,
       SERVER_TLS_CERT: process.env.SERVER_TLS_CERT || '',
       SERVER_TLS_KEY: process.env.SERVER_TLS_KEY || '',
+      APP_FOLDER_NAME: process.env.APP_FOLDER_NAME || '',
+      UPGRADES_LINK: process.env.UPGRADES_LINK || '',
       BUILD_TYPE: 'ELECTRON',
       APP_VERSION: version,
       AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',

electron-builder.json

@@ -12,7 +12,7 @@
     "package.json"
   ],
   "afterSign": "electron-builder-notarize",
-  "artifactName": "RedisInsight.${ext}",
+  "artifactName": "${productName}.${ext}",
   "compression": "normal",
   "mac": {
     "target": ["dmg", "zip"],
@@ -24,7 +24,7 @@
     "gatekeeperAssess": false
   },
   "dmg": {
-    "artifactName": "RedisInsight-${os}-x64.${ext}",
+    "artifactName": "${productName}-${os}-x64.${ext}",
     "contents": [
       {
         "x": 130,
@@ -40,14 +40,14 @@
   },
   "win": {
     "target": ["nsis"],
-    "artifactName": "RedisInsight-${os}-installer.${ext}"
+    "artifactName": "${productName}-${os}-installer.${ext}"
   },
   "linux": {
     "icon": "./resources/icons",
     "target": ["deb", "AppImage"],
     "synopsis": "Redis GUI by Redis Ltd.",
     "category": "Development",
-    "artifactName": "RedisInsight-${os}.${ext}",
+    "artifactName": "${productName}-${os}.${ext}",
     "desktop": {
       "Name": "RedisInsight",
       "Type": "Application",

redisinsight/main.dev.ts

@@ -49,10 +49,8 @@ export default class AppUpdater {
     log.transports.file.level = 'info';
 
     autoUpdater.setFeedURL({
-      provider: 's3',
-      path: 'public/upgrades/',
-      bucket: process.env.MANUAL_UPDATE_BUCKET || process.env.AWS_BUCKET_NAME,
-      region: 'us-east-1',
+      provider: 'generic',
+      url: process.env.MANUAL_UPGRADES_LINK || process.env.UPGRADES_LINK,
     });
 
     autoUpdater.checkForUpdatesAndNotify();

redisinsight/ui/src/pages/home/components/HelpLinksMenu/HelpLinksMenu.tsx

@@ -47,10 +47,8 @@ const HelpLinksMenu = ({ onLinkClick }: IProps) => {
       onClick={onButtonClick}
       className={[styles.button, isPopoverOpen ? styles.buttonOpen : ''].join(' ')}
     >
-      <EuiText size="m" color="default">
-        CREATE DATABASE
-      </EuiText>
-      <EuiIcon type="arrowDown" />
+      <EuiText size="m">CREATE DATABASE</EuiText>
+      <EuiIcon type="arrowDown" className={styles.arrowIcon} />
     </button>
   )
 

redisinsight/ui/src/pages/home/components/HelpLinksMenu/styles.module.scss

@@ -7,33 +7,38 @@
   justify-content: space-between;
   align-items: center;
   border-radius: 4px;
-  border: 2px solid var(--euiColorSecondary);
+  border: 2px solid var(--controlsBorderColor);
   padding: 0 20px;
+  color: var(--inputTextColor);
   font: normal normal bold 14px/17px Graphik, sans-serif;
 }
 
 .buttonOpen {
-  border-bottom-color: transparent;
+  border-bottom-color: var(--separatorColor) !important;;
   border-radius: 4px 4px 0 0;
 }
 
 .popover {
-  border: 2px solid var(--euiColorSecondary) !important;
-  border-top: 1px solid var(--separatorColor) !important;
+  border: 2px solid var(--controlsBorderColor) !important;
+  border-top-width: 0 !important;
 }
 
 .item {
   padding: 10px 20px;
   background-color: transparent !important;
-  transition: background-color 0.3s ease-in-out;
   text-decoration: none !important;
   font: normal normal bold 12px/17px Graphik, sans-serif;
   letter-spacing: 0;
   &:hover {
-    background-color: var(--euiColorSecondary) !important;
+    background-color: var(--hoverInListColorLight) !important;
     text-decoration: none !important;
   }
   a {
     text-decoration: none !important;
   }
 }
+
+.arrowIcon {
+  fill: var(--iconsDefaultColor) !important;
+}
+

tests/e2e/pageObjects/my-redis-databases-page.ts

@@ -52,6 +52,7 @@ export class MyRedisDatabasePage {
           await t.click(this.toastCloseButton);
       }
       const db = this.dbNameList.withExactText(dbName.trim());
+      await t.expect(db.exists).ok('The database exists', {timeout: 60000});
       await t.click(db);
   }
 

tests/e2e/tests/regression/workbench/default-scripts-area.e2e.ts

@@ -28,13 +28,13 @@ test('Verify that user can resize(maximize)/(minimize) the enablement area (the
     const offsetX = 100;
     const areaWidthBefore = await workbenchPage.preselectsAreaContainer.clientWidth;
     //Minimize the area with default scripts
-    await t.drag(workbenchPage.resizeButtonForPreselectsArea, -offsetX, 0, { speed: 0.2 });
+    await t.drag(workbenchPage.resizeButtonForPreselectsArea, -offsetX, 0, { speed: 0.1 });
     await t.expect(await workbenchPage.preselectsAreaContainer.clientWidth).lt(areaWidthBefore, 'Default scripts area is smaller after resize');
     //Maximize the area with default scripts
     const areaWidthAfter = await workbenchPage.preselectsAreaContainer.clientWidth;
     await t.click(workbenchPage.preselectsAreaContainer);
-    await t.drag(workbenchPage.resizeButtonForPreselectsArea, offsetX, 0, { speed: 0.2 });
-    await t.expect(await workbenchPage.preselectsAreaContainer.clientWidth).gt(areaWidthAfter, 'Default scripts area is bigger after resize');
+    await t.drag(workbenchPage.resizeButtonForPreselectsArea, offsetX, 0, { speed: 0.1 });
+    await t.expect(await workbenchPage.preselectsAreaContainer.clientWidth).gte(areaWidthAfter, 'Default scripts area is bigger after resize');
 });
 test('Verify that user can expand/collapse the enablement area', async t => {
     //Collapse the area with default scripts