Merge pull request #4234 from RedisInsight/e2e/feature/resolve-ssh-issue

mariasergeenko · web-flow · commit 17be0f61ff68 · 2024-12-30T12:34:04.000+01:00
E2e/feature/resolve ssh issue
diff --git a/.circleci/build/release-docker.sh b/.circleci/build/release-docker.sh
@@ -2,7 +2,7 @@
 set -e
 
 HELP="Args:
--v - Semver (2.62.0)
+-v - Semver (2.64.0)
 -d - Build image repository (Ex: -d redisinsight)
 -r - Target repository (Ex: -r redis/redisinsight)
 "
diff --git a/.github/build/release-docker.sh b/.github/build/release-docker.sh
@@ -2,7 +2,7 @@
 set -e
 
 HELP="Args:
--v - Semver (2.62.0)
+-v - Semver (2.64.0)
 -d - Build image repository (Ex: -d redisinsight)
 -r - Target repository (Ex: -r redis/redisinsight)
 "
diff --git a/redisinsight/api/config/default.ts b/redisinsight/api/config/default.ts
@@ -80,7 +80,7 @@ export default {
     migrateOldFolders: process.env.RI_MIGRATE_OLD_FOLDERS ? process.env.RI_MIGRATE_OLD_FOLDERS === 'true' : true,
     autoBootstrap: process.env.RI_AUTO_BOOTSTRAP ? process.env.RI_AUTO_BOOTSTRAP === 'true' : true,
     buildType: process.env.RI_BUILD_TYPE || 'DOCKER_ON_PREMISE',
-    appVersion: process.env.RI_APP_VERSION || '2.62.0',
+    appVersion: process.env.RI_APP_VERSION || '2.64.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: 'Redis Insight Backend API',
     description: 'Redis Insight Backend API',
-    version: '2.62.0',
+    version: '2.64.0',
   },
   tags: [],
 };
diff --git a/redisinsight/api/package.json b/redisinsight/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redisinsight-api",
-  "version": "2.62.0",
+  "version": "2.64.0",
   "description": "Redis Insight API",
   "private": true,
   "author": {
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: 'Redis Insight',
-  applicationVersion: `${app.getVersion() || '2.62.0'}${
+  applicationVersion: `${app.getVersion() || '2.64.0'}${
     !config.isProduction ? `-dev-${process.getCreationTime()}` : ''
   }`,
   copyright: `Copyright © ${new Date().getFullYear()} Redis Ltd.`,
diff --git a/redisinsight/package.json b/redisinsight/package.json
@@ -3,7 +3,7 @@
   "appName": "Redis Insight",
   "productName": "RedisInsight",
   "private": true,
-  "version": "2.62.0",
+  "version": "2.64.0",
   "description": "Redis Insight",
   "main": "./dist/main/main.js",
   "author": {
diff --git a/redisinsight/ui/package.json b/redisinsight/ui/package.json
@@ -2,7 +2,7 @@
   "name": "redisinsight",
   "appName": "Redis Insight",
   "productName": "RedisInsight",
-  "version": "2.62.0",
+  "version": "2.64.0",
   "description": "Redis Insight",
   "author": {
     "name": "Redis Ltd.",
diff --git a/redisinsight/ui/src/components/oauth/oauth-select-account-dialog/styles.module.scss b/redisinsight/ui/src/components/oauth/oauth-select-account-dialog/styles.module.scss
@@ -36,9 +36,9 @@
 }
 
 .footer {
-  padding-top: 24px;
+  padding-top: 20px;
   text-align: right;
-  padding-bottom: 1px;
+  padding-bottom: 4px;
 }
 
 .button {
diff --git a/redisinsight/ui/src/components/oauth/oauth-user-profile/styles.module.scss b/redisinsight/ui/src/components/oauth/oauth-user-profile/styles.module.scss
@@ -14,7 +14,7 @@
 
     border-radius: 100%;
 
-    background-color: var(--euiTooltipBackgroundColor);
+    background-color: var(--insightsTriggerBgColor);
 
     cursor: pointer;
   }
diff --git a/redisinsight/ui/src/pages/home/components/db-status/texts.tsx b/redisinsight/ui/src/pages/home/components/db-status/texts.tsx
@@ -3,35 +3,40 @@ import React from 'react'
 
 export const CHECK_CLOUD_DATABASE = (
   <>
-    <EuiTitle size="xxs"><span>Check your Cloud database</span></EuiTitle>
+    <EuiTitle size="xxs"><span>Build your app with Redis Cloud</span></EuiTitle>
     <EuiSpacer size="s" />
     <div>
-      Free Cloud databases are usually deleted after 15 days of inactivity.
+      Free Cloud DBs auto-delete after 15 days of inactivity.
       <EuiSpacer size="s" />
-      Check your Cloud database to proceed with learning more about Redis and its capabilities.
+      But not to worry, you can always re-create it to test your ideas.
+      <br />
+      Includes native support for JSON, Query Engine and more.
     </div>
   </>
 )
 
 export const WARNING_WITH_CAPABILITY = (capability: string) => (
   <>
-    <EuiTitle size="xxs"><span>{capability}</span></EuiTitle>
+    <EuiTitle size="xxs"><span>Build your app with {capability}</span></EuiTitle>
     <EuiSpacer size="s" />
     <div>
-      Hey, remember you expressed interest in {capability}?
+      Hey, remember your interest in {capability}?
       <br />
-      Try your Cloud database to get started.
+      Use your free Redis Cloud DB to try it.
     </div>
     <EuiSpacer size="s" />
-    <div><b>Notice</b>: free Cloud databases will be deleted after 15 days of inactivity.</div>
+    <div><b>Note</b>: Free Cloud DBs auto-delete after 15 days of inactivity.</div>
   </>
 )
 export const WARNING_WITHOUT_CAPABILITY = (
   <>
-    <EuiTitle size="xxs"><span>Try your Cloud database</span></EuiTitle>
+    <EuiTitle size="xxs"><span>Your free Redis Cloud DB is waiting.</span></EuiTitle>
     <EuiSpacer size="s" />
-    <div>Hey, try your Cloud database to learn more about Redis.</div>
+    <div>Test ideas and build prototypes.
+      <br />
+      Includes native support for JSON, Query Engine and more.
+    </div>
     <EuiSpacer size="s" />
-    <div><b>Notice</b>: free Cloud databases will be deleted after 15 days of inactivity.</div>
+    <div><b>Note</b>: Free Cloud DBs auto-delete after 15 days of inactivity.</div>
   </>
 )
diff --git a/redisinsight/ui/src/pages/rdi/pipeline-management/components/template-button/styles.module.scss b/redisinsight/ui/src/pages/rdi/pipeline-management/components/template-button/styles.module.scss
@@ -2,6 +2,7 @@
   display: flex;
   align-items: center;
   background-color: var(--insightsTriggerBgColor) !important;
+  color: var(--euiTooltipTextColor) !important;
   border-radius: 4px;
   border-color: var(--tableRowSelectedColor) !important;
 }
diff --git a/redisinsight/ui/src/pages/rdi/pipeline-management/components/template-popover/styles.module.scss b/redisinsight/ui/src/pages/rdi/pipeline-management/components/template-popover/styles.module.scss
@@ -11,6 +11,7 @@
     display: flex;
     align-items: center;
     background-color: var(--insightsTriggerBgColor) !important;
+    color: var(--euiTooltipTextColor) !important;
     border-radius: 4px;
     border-color: var(--tableRowSelectedColor) !important;
   }
diff --git a/tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts b/tests/e2e/pageObjects/dialogs/add-redis-database-dialog.ts
@@ -27,6 +27,7 @@ export class AddRedisDatabaseDialog {
     cloneDatabaseButton = Selector('[data-testid=clone-db-btn]');
     cancelButton = Selector('[data-testid=btn-cancel]');
     testConnectionBtn = Selector('[data-testid=btn-test-connection]');
+    backButton = Selector('[data-testid=back-btn]');
 
     // TEXT INPUTS (also referred to as 'Text fields')
     disabledDatabaseInfo = Selector('[class=euiListGroupItem__label]');
@@ -35,7 +36,7 @@ export class AddRedisDatabaseDialog {
     databaseAliasInput = Selector('[data-testid=name]');
     passwordInput = Selector('[data-testid=password]');
     usernameInput = Selector('[data-testid=username]');
-    connectionUrlInput = Selector('[data-testid=connectionURL]');
+    connectionUrlInput = Selector('[data-testid=connection-url]');
     accessKeyInput = Selector('[data-testid=access-key]');
     secretKeyInput = Selector('[data-testid=secret-key]');
     databaseIndexInput = Selector('[data-testid=db]');
diff --git a/tests/e2e/tests/web/critical-path/cluster-details/cluster-details.e2e.ts b/tests/e2e/tests/web/critical-path/cluster-details/cluster-details.e2e.ts
@@ -15,7 +15,7 @@ const databaseAPIRequests = new DatabaseAPIRequests();
 const headerColumns = {
     'Type': 'OSS Cluster',
     'Version': '7.0.0',
-    'User': 'Default'
+    'User': 'default'
 };
 type HeaderColumn = keyof typeof headerColumns;
 
diff --git a/tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts b/tests/e2e/tests/web/critical-path/database/connecting-to-the-db.e2e.ts
@@ -89,7 +89,7 @@ test
             .expect(myRedisDatabasePage.AddRedisDatabaseDialog.databaseAliasInput.value).eql(`${defaultHost}:${defaultPort}`, 'Default db alias not prepopulated');
         // Verify that the Host, Port, Database Alias values pre-populated by default for Sentinel
         await t
-            .click(myRedisDatabasePage.AddRedisDatabaseDialog.addAutoDiscoverDatabase)
+            .click(myRedisDatabasePage.AddRedisDatabaseDialog.backButton)
             .click(myRedisDatabasePage.AddRedisDatabaseDialog.redisSentinelButton);
         await t
             .expect(myRedisDatabasePage.AddRedisDatabaseDialog.hostInput.value).eql(defaultHost, 'Default sentinel host not prepopulated')
@@ -195,13 +195,13 @@ test
         await myRedisDatabasePage.clickOnDBByName(sshDbClusterPass.databaseName);
         await Common.checkURLContainsText('browser');
     });
-test
+// Unskip in RI-6478
+test.skip
     .meta({ rte: rte.none })
     .before(async() => {
         await databaseAPIRequests.deleteAllDatabasesApi();
         await databaseHelper.acceptLicenseTerms();
     })('Verify that create free cloud db is displayed always', async t => {
-
         const externalPageLinkList = 'https://redis.io/try-free?utm_source=redisinsight&utm_medium=app&utm_campaign=list_of_databases';
         const externalPageLinkNavigation = 'https://redis.io/try-free?utm_source=redisinsight&utm_medium=app&utm_campaign=navigation_menu';
 
@@ -242,7 +242,7 @@ test
         // Verify that 'redis://default@127.0.0.1:6379' default value prepopulated for connection URL field and the same for placeholder
         await t.expect(addDbDialog.connectionUrlInput.textContent).eql(`redis://default@127.0.0.1:6379`, 'Connection URL not prepopulated');
 
-        await t.typeText(addDbDialog.connectionUrlInput, codedUrl);
+        await t.typeText(addDbDialog.connectionUrlInput, codedUrl, { replace: true, paste: true });
         await t.click(addDbDialog.customSettingsButton);
         await t.expect(addDbDialog.databaseAliasInput.getAttribute('value')).eql(`${host}:${port}`, 'name is incorrected');
         await t.expect(addDbDialog.hostInput.getAttribute('value')).eql(`${host}`, 'host is incorrected');

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`set -e`
`3`	`3`
`4`	`4`	`HELP="Args:`
`5`		`--v - Semver (2.62.0)`
	`5`	`+-v - Semver (2.64.0)`
`6`	`6`	`-d - Build image repository (Ex: -d redisinsight)`
`7`	`7`	`-r - Target repository (Ex: -r redis/redisinsight)`
`8`	`8`	`"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "redisinsight-api",`
`3`		`- "version": "2.62.0",`
	`3`	`+ "version": "2.64.0",`
`4`	`4`	`"description": "Redis Insight API",`
`5`	`5`	`"private": true,`
`6`	`6`	`"author": {`
Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,9 @@`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`.footer {`
`39`		`- padding-top: 24px;`
	`39`	`+ padding-top: 20px;`
`40`	`40`	`text-align: right;`
`41`		`- padding-bottom: 1px;`
	`41`	`+ padding-bottom: 4px;`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`.button {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`border-radius: 100%;`
`16`	`16`
`17`		`- background-color: var(--euiTooltipBackgroundColor);`
	`17`	`+ background-color: var(--insightsTriggerBgColor);`
`18`	`18`
`19`	`19`	`cursor: pointer;`
`20`	`20`	`}`