#RI-3957 - add searchlight as part of modules of redistack

Author: rsergeenko

redisinsight/ui/src/utils/redistack.ts

@@ -1,16 +1,20 @@
-import { map, isEqual } from 'lodash'
+import { isArray, map } from 'lodash'
 import { Instance, RedisDefaultModules } from 'uiSrc/slices/interfaces'
 
 export const REDISTACK_PORT = 6379
-export const REDISTACK_MODULES = [
+export const REDISTACK_MODULES: Array<string | Array<string>> = [
   RedisDefaultModules.ReJSON,
+  RedisDefaultModules.Bloom,
   RedisDefaultModules.Graph,
+  [RedisDefaultModules.Search, RedisDefaultModules.SearchLight],
   RedisDefaultModules.TimeSeries,
-  RedisDefaultModules.Search,
-  RedisDefaultModules.Bloom,
-].sort()
+]
 
-const checkRediStackModules = (modules: any[]) => isEqual(map(modules, 'name').sort(), REDISTACK_MODULES)
+const checkRediStackModules = (modules: any[]) => map(modules, 'name')
+  .sort()
+  .every((m, index) => (isArray(REDISTACK_MODULES[index])
+    ? (REDISTACK_MODULES[index] as Array<string>).some((rm) => rm === m)
+    : REDISTACK_MODULES[index] === m))
 
 const checkRediStack = (instances: Instance[]): Instance[] => {
   let isRediStackCheck = false
@@ -25,6 +29,7 @@ const checkRediStack = (instances: Instance[]): Instance[] => {
     }
   })
 
+  // if no any database with redistack on port 6379 - mark others as redistack (with modules check)
   if (!isRediStackCheck) {
     newInstances = newInstances.map((instance) => ({
       ...instance,

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

@@ -1,22 +1,51 @@
-import { checkRediStack, REDISTACK_MODULES, REDISTACK_PORT } from 'uiSrc/utils'
+/* eslint-disable max-len */
+import { checkRediStack, REDISTACK_PORT } from 'uiSrc/utils'
+import { RedisDefaultModules } from 'uiSrc/slices/interfaces'
 
 const unmapWithName = (arr: any[]) => arr.map((item) => ({ name: item }))
 
-const REDISTACK_MODULE_DEFAULT = unmapWithName(REDISTACK_MODULES)
+const REDISTACK_MODULE_DEFAULT = unmapWithName([
+  RedisDefaultModules.ReJSON,
+  RedisDefaultModules.Graph,
+  RedisDefaultModules.TimeSeries,
+  RedisDefaultModules.Search,
+  RedisDefaultModules.Bloom,
+].sort())
 
 const getOutputCheckRediStackTests: any[] = [
-  [[{ port: REDISTACK_PORT, modules: REDISTACK_MODULE_DEFAULT },
-    { port: 12000, modules: REDISTACK_MODULE_DEFAULT }],
-  [{ port: REDISTACK_PORT, modules: REDISTACK_MODULE_DEFAULT, isRediStack: true },
-    { port: 12000, modules: REDISTACK_MODULE_DEFAULT, isRediStack: false }]],
-  [[{ port: REDISTACK_PORT, modules: REDISTACK_MODULE_DEFAULT }],
-    [{ port: REDISTACK_PORT, modules: REDISTACK_MODULE_DEFAULT, isRediStack: true }]],
-  [[{ port: REDISTACK_PORT, modules: unmapWithName(['']) }], [{ port: REDISTACK_PORT, modules: unmapWithName(['']), isRediStack: false }]],
-  [[{ port: REDISTACK_PORT, modules: unmapWithName(['search']) }], [{ port: REDISTACK_PORT, modules: unmapWithName(['search']), isRediStack: false }]],
-  [[{ port: REDISTACK_PORT, modules: unmapWithName(['bf', 'search', 'timeseries']) }], [{ port: REDISTACK_PORT, modules: unmapWithName(['bf', 'search', 'timeseries']), isRediStack: false }]],
-  [[{ port: 12000, modules: REDISTACK_MODULE_DEFAULT }],
-    [{ port: 12000, modules: REDISTACK_MODULE_DEFAULT, isRediStack: true }]],
-  [[{ port: 12000, modules: unmapWithName(['search']) }], [{ port: 12000, modules: unmapWithName(['search']), isRediStack: false }]],
+  [
+    [{ port: REDISTACK_PORT, modules: REDISTACK_MODULE_DEFAULT }, { port: 12000, modules: REDISTACK_MODULE_DEFAULT }],
+    [{ port: REDISTACK_PORT, modules: REDISTACK_MODULE_DEFAULT, isRediStack: true }, { port: 12000, modules: REDISTACK_MODULE_DEFAULT, isRediStack: false }]
+  ],
+  [
+    [{ port: REDISTACK_PORT, modules: REDISTACK_MODULE_DEFAULT }],
+    [{ port: REDISTACK_PORT, modules: REDISTACK_MODULE_DEFAULT, isRediStack: true }]
+  ],
+  [
+    [{ port: REDISTACK_PORT, modules: unmapWithName(['']) }],
+    [{ port: REDISTACK_PORT, modules: unmapWithName(['']), isRediStack: false }]
+  ],
+  [
+    [{ port: REDISTACK_PORT, modules: unmapWithName(['search']) }],
+    [{ port: REDISTACK_PORT, modules: unmapWithName(['search']), isRediStack: false }]
+  ],
+  [
+    [{ port: REDISTACK_PORT, modules: unmapWithName(['bf', 'search', 'timeseries']) }],
+    [{ port: REDISTACK_PORT, modules: unmapWithName(['bf', 'search', 'timeseries']), isRediStack: false }]
+  ],
+  [
+    [{ port: 12000, modules: REDISTACK_MODULE_DEFAULT }],
+    [{ port: 12000, modules: REDISTACK_MODULE_DEFAULT, isRediStack: true }]
+  ],
+  [
+    [{ port: 12000, modules: unmapWithName(['search']) }],
+    [{ port: 12000, modules: unmapWithName(['search']), isRediStack: false }]
+  ],
+  // check searchlight - should be also marked as RediStack
+  [
+    [{ port: 12000, modules: unmapWithName(['bf', 'timeseries', 'ReJSON', 'searchlight', 'graph']) }],
+    [{ port: 12000, modules: unmapWithName(['bf', 'timeseries', 'ReJSON', 'searchlight', 'graph']), isRediStack: true }]
+  ],
 ]
 
 describe('checkRediStack', () => {