#RI-4586 - align BE and FE getModules summary (#2313)

* #RI-4586 - align BE and FE getModules summary

Author: AmirAllayarovSofteq

redisinsight/api/src/constants/redis-modules.ts

@@ -6,6 +6,7 @@ export enum AdditionalRedisModuleName {
   RedisJSON = 'ReJSON',
   RediSearch = 'search',
   RedisTimeSeries = 'timeseries',
+  'Triggers & Functions' = 'redisgears'
 }
 
 export enum AdditionalSearchModuleName {
@@ -14,6 +15,11 @@ export enum AdditionalSearchModuleName {
   FTL = 'ftl',
 }
 
+export enum AdditionalTriggersAndFunctionsModuleName {
+  TriggersAndFunctions = 'redisgears',
+  TriggersAndFunctions2 = 'redisgears_2',
+}
+
 export const SUPPORTED_REDIS_MODULES = Object.freeze({
   ai: AdditionalRedisModuleName.RedisAI,
   graph: AdditionalRedisModuleName.RedisGraph,
@@ -60,3 +66,8 @@ export const REDISEARCH_MODULES: string[] = [
   AdditionalSearchModuleName.FT,
   AdditionalSearchModuleName.FTL,
 ]
+
+export const TRIGGERED_AND_FUNCTIONS_MODULES: string[] = [
+  AdditionalTriggersAndFunctionsModuleName.TriggersAndFunctions,
+  AdditionalTriggersAndFunctionsModuleName.TriggersAndFunctions2,
+]

redisinsight/api/src/utils/redis-modules-summary.spec.ts

@@ -9,6 +9,7 @@ const DEFAULT_SUMMARY = Object.freeze(
     RedisBloom: { loaded: false },
     RedisJSON: { loaded: false },
     RedisTimeSeries: { loaded: false },
+    'Triggers & Functions': { loaded: false },
     customModules: [],
   },
 );
@@ -53,7 +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' },
-      'Triggers & Functios': { loaded: true, version: 10000, semanticVersion: '1.0.0' },
+      'Triggers & Functions': { loaded: true, version: 10000, semanticVersion: '1.0.0' },
       customModules: [],
     },
   },

redisinsight/api/src/utils/redis-modules-summary.ts

@@ -1,5 +1,10 @@
 import { cloneDeep } from 'lodash';
-import { AdditionalRedisModuleName, SUPPORTED_REDIS_MODULES } from 'src/constants';
+import {
+  AdditionalRedisModuleName,
+  SUPPORTED_REDIS_MODULES,
+  REDISEARCH_MODULES,
+  TRIGGERED_AND_FUNCTIONS_MODULES,
+} from 'src/constants';
 import { AdditionalRedisModule } from 'src/modules/database/models/additional.redis.module';
 
 interface IModuleSummary {
@@ -19,30 +24,58 @@ export const DEFAULT_SUMMARY: IRedisModulesSummary = Object.freeze(
     RedisBloom: { loaded: false },
     RedisJSON: { loaded: false },
     RedisTimeSeries: { loaded: false },
+    'Triggers & Functions': { loaded: false },
     customModules: [],
   },
 );
 
+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))
+);
+
 const getEnumKeyBValue = (myEnum: any, enumValue: number | string): string => {
   const keys = Object.keys(myEnum);
   const index = keys.findIndex((x) => myEnum[x] === enumValue);
   return index > -1 ? keys[index] : '';
 };
 
+const getModuleSummaryToSent = (module: AdditionalRedisModule) => ({
+  loaded: true,
+  version: module.version,
+  semanticVersion: module.semanticVersion,
+});
+
+// same function as in FE
 export const getRedisModulesSummary = (modules: AdditionalRedisModule[] = []): IRedisModulesSummary => {
   const summary = cloneDeep(DEFAULT_SUMMARY);
   try {
     modules.forEach(((module) => {
       if (SUPPORTED_REDIS_MODULES[module.name]) {
         const moduleName = getEnumKeyBValue(AdditionalRedisModuleName, module.name);
-        summary[moduleName] = {
-          loaded: true,
-          version: module.version,
-          semanticVersion: module.semanticVersion,
-        };
-      } else {
-        summary.customModules.push(module);
+        summary[moduleName] = getModuleSummaryToSent(module);
+        return;
       }
+
+      if (isRedisearchAvailable([module])) {
+        const redisearchName = getEnumKeyBValue(AdditionalRedisModuleName, AdditionalRedisModuleName.RediSearch);
+        summary[redisearchName] = getModuleSummaryToSent(module);
+        return;
+      }
+
+      if (isTriggeredAndFunctionsAvailable([module])) {
+        const triggeredAndFunctionsName = getEnumKeyBValue(
+          AdditionalRedisModuleName,
+          AdditionalRedisModuleName['Triggers & Functions'],
+        );
+        summary[triggeredAndFunctionsName] = getModuleSummaryToSent(module);
+        return;
+      }
+
+      summary.customModules.push(module);
     }));
   } catch (e) {
     // continue regardless of error