Merge pull request #3845 from RedisInsight/fe/feature/RI-6129

#RI-6129 - do not mark database > 7.9 as redistack

Author: mariasergeenko

redisinsight/ui/src/utils/redistack.ts

@@ -3,6 +3,7 @@ import { Instance, RedisDefaultModules } from 'uiSrc/slices/interfaces'
 import { isVersionHigherOrEquals, Nullable } from 'uiSrc/utils'
 
 const REDISTACK_VERSION = '6.2.5'
+const NON_REDISTACK_VERSION = '7.9'
 
 const REDISTACK_REQUIRE_MODULES: Array<string | Array<string>> = [
   RedisDefaultModules.ReJSON,
@@ -61,6 +62,10 @@ const isRediStack = (modules: any[], version?: Nullable<string>): boolean => {
     return checkRediStackModules(modules)
   }
 
+  if (isVersionHigherOrEquals(version, NON_REDISTACK_VERSION)) {
+    return false
+  }
+
   if (isVersionHigherOrEquals(version, REDISTACK_VERSION)) {
     return checkRediStackModules(modules)
   }

redisinsight/ui/src/utils/tests/redistack.spec.ts

@@ -43,6 +43,9 @@ const isRediStackTests = [
   { input: [unmapWithName(['bf', 'timeseries', 'ReJSON', 'searchlight', 'graph', 'redisgears', 'custom']), null], expected: false },
 
   { input: [unmapWithName(['bf', 'timeseries', 'ReJSON', 'searchlight']), '6.2.4'], expected: false },
+  { input: [unmapWithName(['bf', 'timeseries', 'ReJSON', 'searchlight', 'redisgears']), '7.9'], expected: false },
+  { input: [unmapWithName(['bf', 'timeseries', 'ReJSON', 'searchlight', 'redisgears']), '8.0.0'], expected: false },
+  { input: [unmapWithName(['bf', 'timeseries', 'ReJSON', 'searchlight', 'redisgears']), '8.0.0-rc'], expected: false },
 ]
 
 describe('isRediStack', () => {

tests/e2e/.desktop.env

@@ -12,6 +12,9 @@ OSS_STANDALONE_V5_PORT=8101
 OSS_STANDALONE_V7_HOST=localhost
 OSS_STANDALONE_V7_PORT=8108
 
+OSS_STANDALONE_V8_HOST=localhost
+OSS_STANDALONE_V8_PORT=8109
+
 OSS_STANDALONE_REDISEARCH_HOST=localhost
 OSS_STANDALONE_REDISEARCH_PORT=8102
 

tests/e2e/helpers/conf.ts

@@ -47,6 +47,14 @@ export const ossStandaloneV7Config = {
     databasePassword: process.env.OSS_STANDALONE_V7_PASSWORD
 };
 
+export const ossStandaloneV8Config = {
+    host: process.env.OSS_STANDALONE_V8_HOST || 'oss-standalone-v8',
+    port: process.env.OSS_STANDALONE_V8_PORT || '6379',
+    databaseName: `${process.env.OSS_STANDALONE_V8_DATABASE_NAME || 'test_standalone-v8'}-${uniqueId}`,
+    databaseUsername: process.env.OSS_STANDALONE_V8_USERNAME,
+    databasePassword: process.env.OSS_STANDALONE_V8_PASSWORD
+};
+
 export const ossStandaloneRedisearch = {
     host: process.env.OSS_STANDALONE_REDISEARCH_HOST || 'oss-standalone-redisearch',
     port: process.env.OSS_STANDALONE_REDISEARCH_PORT || '6379',

tests/e2e/rte.docker-compose.yml

@@ -92,6 +92,18 @@ services:
       ssh:
         ipv4_address: 172.33.100.112
 
+  # oss standalone v8
+  oss-standalone-v8:
+    logging: *logging
+    image: redis:8.0-M01
+    ports:
+      - 8109:6379
+    networks:
+      default:
+        ipv4_address: 172.31.100.113
+      ssh:
+        ipv4_address: 172.33.100.113
+
   # oss standalone redisearch
   oss-standalone-redisearch:
     logging: *logging

tests/e2e/tests/web/regression/database/redisstack.e2e.ts

@@ -1,7 +1,11 @@
 import { rte } from '../../../../helpers/constants';
 import { DatabaseHelper } from '../../../../helpers/database';
 import { BrowserPage, MyRedisDatabasePage } from '../../../../pageObjects';
-import { commonUrl, ossStandaloneConfig } from '../../../../helpers/conf';
+import {
+    commonUrl,
+    ossStandaloneConfig,
+    ossStandaloneV8Config
+} from '../../../../helpers/conf';
 import { DatabaseAPIRequests } from '../../../../helpers/api/api-database';
 
 const myRedisDatabasePage = new MyRedisDatabasePage();
@@ -23,7 +27,7 @@ fixture `Redis Stack`
     })
     .afterEach(async() => {
         // Delete database
-        await databaseAPIRequests.deleteStandaloneDatabaseApi(ossStandaloneConfig);
+        await databaseAPIRequests.deleteAllDatabasesApi();
     });
 test('Verify that user can see module list Redis Stack icon hovering (without Redis Stack text)', async t => {
     // Verify that user can see Redis Stack icon when Redis Stack DB is added in the application
@@ -47,3 +51,16 @@ test('Verify that user can see Redis Stack icon in Edit mode near the DB name',
     const databaseName = myRedisDatabasePage.redisStackIcon.parent().nextSibling();
     await t.expect(databaseName.withAttribute('data-testid', 'edit-alias-btn').exists).ok('Edit button not found');
 });
+test.before(async() => {
+    // Add new databases using API
+    await databaseHelper.acceptLicenseTerms();
+    await databaseAPIRequests.addNewStandaloneDatabaseApi(ossStandaloneV8Config);
+    // Reload Page
+    await browserPage.reloadPage();
+})('Verify that Redis Stack is not displayed for stack >8', async t => {
+    // Verify that user can not see Redis Stack icon when Redis Stack DB > 8 is added in the application
+    await t.expect(myRedisDatabasePage.redisStackIcon.visible).notOk('Redis Stack icon found');
+    await t.click(myRedisDatabasePage.editDatabaseButton);
+    // Check redis stack icon near the db name
+    await t.expect(myRedisDatabasePage.redisStackIcon.visible).notOk('Redis Stack icon found');
+});