#RI-4586 - add redisgears 2 icon and text

Author: AmirAllayarovSofteq

redisinsight/ui/src/components/database-list-modules/DatabaseListModules.tsx

@@ -69,6 +69,16 @@ export const modulesDefaultInit = {
     iconLight: RedisGraphLight,
     text: DATABASE_LIST_MODULES_TEXT[RedisDefaultModules.Graph],
   },
+  [RedisDefaultModules.RedisGears]: {
+    iconDark: RedisGearsDark,
+    iconLight: RedisGearsLight,
+    text: DATABASE_LIST_MODULES_TEXT[RedisDefaultModules.RedisGears],
+  },
+  [RedisDefaultModules.RedisGears2]: {
+    iconDark: RedisGearsDark,
+    iconLight: RedisGearsLight,
+    text: DATABASE_LIST_MODULES_TEXT[RedisDefaultModules.RedisGears2],
+  },
   [RedisDefaultModules.ReJSON]: {
     iconDark: RedisJSONDark,
     iconLight: RedisJSONLight,

redisinsight/ui/src/slices/interfaces/instances.ts

@@ -179,6 +179,11 @@ export const REDISEARCH_MODULES: string[] = [
   RedisDefaultModules.FTL,
 ]
 
+export const TRIGGERED_AND_FUNCTIONS_MODULES: string[] = [
+  RedisDefaultModules.RedisGears,
+  RedisDefaultModules.RedisGears2,
+]
+
 export const COMMAND_MODULES = {
   [RedisDefaultModules.Search]: REDISEARCH_MODULES,
   [RedisDefaultModules.ReJSON]: [RedisDefaultModules.ReJSON],
@@ -188,6 +193,7 @@ export const COMMAND_MODULES = {
 }
 
 const RediSearchModulesText = [...REDISEARCH_MODULES].reduce((prev, next) => ({ ...prev, [next]: 'RediSearch' }), {})
+const TriggeredAndFunctionsModulesText = [...TRIGGERED_AND_FUNCTIONS_MODULES].reduce((prev, next) => ({ ...prev, [next]: 'Triggered & Functions' }), {})
 
 // Enums don't allow to use dynamic key
 export const DATABASE_LIST_MODULES_TEXT = Object.freeze({
@@ -199,7 +205,8 @@ export const DATABASE_LIST_MODULES_TEXT = Object.freeze({
   [RedisDefaultModules.TimeSeries]: 'RedisTimeSeries',
   [RedisCustomModulesName.Proto]: 'redis-protobuf',
   [RedisCustomModulesName.IpTables]: 'RedisPushIpTables',
-  ...RediSearchModulesText
+  ...RediSearchModulesText,
+  ...TriggeredAndFunctionsModulesText,
 })
 
 export enum AddRedisClusterDatabaseOptions {

redisinsight/ui/src/telemetry/interfaces.ts

@@ -52,6 +52,7 @@ export enum RedisModules {
   RedisJSON = 'ReJSON',
   RediSearch = 'search',
   RedisTimeSeries = 'timeseries',
+  'Triggered & Functions' = 'redisgears'
 }
 
 interface IModuleSummary {

redisinsight/ui/src/telemetry/telemetryUtils.spec.ts

@@ -9,6 +9,7 @@ const DEFAULT_SUMMARY = Object.freeze(
     RedisBloom: { loaded: false },
     RedisJSON: { loaded: false },
     RedisTimeSeries: { loaded: false },
+    'Triggered & Functions': { loaded: false },
     customModules: [],
   },
 )
@@ -43,6 +44,7 @@ const getRedisModulesSummaryTests = [
       { name: 'ReJSON', version: 10000, semanticVersion: '1.0.0' },
       { name: 'search', version: 10000, semanticVersion: '1.0.0' },
       { name: 'timeseries', version: 10000, semanticVersion: '1.0.0' },
+      { name: 'redisgears_2', version: 10000, semanticVersion: '1.0.0' },
     ],
     expected: {
       RedisAI: { loaded: true, version: 10000, semanticVersion: '1.0.0' },
@@ -52,6 +54,7 @@ const getRedisModulesSummaryTests = [
       RedisJSON: { loaded: true, version: 10000, semanticVersion: '1.0.0' },
       RediSearch: { loaded: true, version: 10000, semanticVersion: '1.0.0' },
       RedisTimeSeries: { loaded: true, version: 10000, semanticVersion: '1.0.0' },
+      'Triggered & Functions': { loaded: true, version: 10000, semanticVersion: '1.0.0' },
       customModules: [],
     },
   },

redisinsight/ui/src/telemetry/telemetryUtils.ts

@@ -5,7 +5,7 @@
 import isGlob from 'is-glob'
 import { cloneDeep } from 'lodash'
 import * as jsonpath from 'jsonpath'
-import { isRedisearchAvailable, Nullable } from 'uiSrc/utils'
+import { isRedisearchAvailable, isTriggeredAndFunctionsAvailable, Nullable } from 'uiSrc/utils'
 import { localStorageService } from 'uiSrc/services'
 import { ApiEndpoints, BrowserStorageItem, KeyTypes, StreamViews } from 'uiSrc/constants'
 import { KeyViewType } from 'uiSrc/slices/interfaces/keys'
@@ -219,6 +219,7 @@ const DEFAULT_SUMMARY: IRedisModulesSummary = Object.freeze(
     RedisBloom: { loaded: false },
     RedisJSON: { loaded: false },
     RedisTimeSeries: { loaded: false },
+    'Triggered & Functions': { loaded: false },
     customModules: [],
   },
 )
@@ -253,6 +254,16 @@ const getRedisModulesSummary = (modules: AdditionalRedisModule[] = []): IRedisMo
         return
       }
 
+      if (isTriggeredAndFunctionsAvailable([module])) {
+        const triggeredAndFunctionsName = getEnumKeyBValue(RedisModules, RedisModules['Triggered & Functions'])
+        summary[triggeredAndFunctionsName] = {
+          loaded: true,
+          version: module.version,
+          semanticVersion: module.semanticVersion,
+        }
+        return
+      }
+
       summary.customModules.push(module)
     }))
   } catch (e) {

redisinsight/ui/src/utils/modules.ts

@@ -1,4 +1,4 @@
-import { DATABASE_LIST_MODULES_TEXT, RedisDefaultModules, REDISEARCH_MODULES } from 'uiSrc/slices/interfaces'
+import { DATABASE_LIST_MODULES_TEXT, RedisDefaultModules, REDISEARCH_MODULES, TRIGGERED_AND_FUNCTIONS_MODULES } from 'uiSrc/slices/interfaces'
 import { AdditionalRedisModule } from 'apiSrc/modules/database/models/additional.redis.module'
 
 export interface IDatabaseModule {
@@ -41,5 +41,9 @@ export const isRedisearchAvailable = (modules: AdditionalRedisModule[]): boolean
   modules?.some(({ name }) =>
     REDISEARCH_MODULES.some((search) => name === search))
 
+export const isTriggeredAndFunctionsAvailable = (modules: AdditionalRedisModule[]): boolean =>
+  modules?.some(({ name }) =>
+    TRIGGERED_AND_FUNCTIONS_MODULES.some((value) => name === value))
+
 export const isContainJSONModule = (modules: AdditionalRedisModule[]): boolean =>
   modules?.some((m: AdditionalRedisModule) => m.name === RedisDefaultModules.ReJSON)