Merge pull request #1328 from RedisInsight/fe/bugfix/RI-3725_Redisearch_light_module_not_loaded

#RI-3725 - Module is not found when RediSearch Light is loaded

Author: AlenaSY

redisinsight/ui/src/pages/databaseAnalysis/components/analysis-data-view/AnalysisDataView.spec.tsx

@@ -153,8 +153,8 @@ describe('AnalysisDataView', () => {
 
     const expirationGroup = mockedData.expirationGroups[1]
 
-    fireEvent.mouseEnter(screen.getByTestId(`circle-${expirationGroup.threshold}-${expirationGroup.total * 2}`))
-    expect(screen.getByTestId('area-tooltip-circle')).toHaveTextContent(`~${formatBytes(expirationGroup.total * 2, 3)}`)
+    fireEvent.mouseEnter(screen.getByTestId(`bar-${expirationGroup.threshold}-${expirationGroup.total * 2}`))
+    expect(screen.getByTestId('bar-tooltip')).toHaveTextContent(`~${formatBytes(expirationGroup.total * 2, 3)}`)
   })
 
   it('should render properly not extrapolated data for ttl chart after switching off', () => {
@@ -173,8 +173,8 @@ describe('AnalysisDataView', () => {
 
     const expirationGroup = mockedData.expirationGroups[1]
 
-    fireEvent.mouseEnter(screen.getByTestId(`circle-${expirationGroup.threshold}-${expirationGroup.total}`))
-    expect(screen.getByTestId('area-tooltip-circle')).toHaveTextContent(`${formatBytes(expirationGroup.total, 3)}`)
+    fireEvent.mouseEnter(screen.getByTestId(`bar-${expirationGroup.threshold}-${expirationGroup.total}`))
+    expect(screen.getByTestId('bar-tooltip')).toHaveTextContent(`${formatBytes(expirationGroup.total, 3)}`)
   })
 
   it('should render properly extrapolated data for top namespaces table', () => {
@@ -240,8 +240,8 @@ describe('AnalysisDataView', () => {
 
     const expirationGroup = mockedData.expirationGroups[1]
 
-    fireEvent.mouseEnter(screen.getByTestId(`circle-${expirationGroup.threshold}-${expirationGroup.total}`))
-    expect(screen.getByTestId('area-tooltip-circle')).toHaveTextContent(`${formatBytes(expirationGroup.total, 3)}`)
+    fireEvent.mouseEnter(screen.getByTestId(`bar-${expirationGroup.threshold}-${expirationGroup.total}`))
+    expect(screen.getByTestId('bar-tooltip')).toHaveTextContent(`${formatBytes(expirationGroup.total, 3)}`)
 
     const nspTopKeyItem = mockedData.topKeysNsp[0]
     expect(screen.getByTestId(`nsp-usedMemory-value=${nspTopKeyItem.memory}`))

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

@@ -144,12 +144,14 @@ export enum RedisCustomModulesName {
   IpTables = 'iptables-input-filter',
 }
 
-const RediSearchModulesText = [
+export const REDISEARCH_MODULES: string[] = [
   RedisDefaultModules.Search,
   RedisDefaultModules.SearchLight,
   RedisDefaultModules.FT,
-  RedisDefaultModules.FTL
-].reduce((prev, next) => ({ ...prev, [next]: 'RediSearch' }), {})
+  RedisDefaultModules.FTL,
+]
+
+const RediSearchModulesText = [...REDISEARCH_MODULES].reduce((prev, next) => ({ ...prev, [next]: 'RediSearch' }), {})
 
 // Enums don't allow to use dynamic key
 export const DATABASE_LIST_MODULES_TEXT = Object.freeze({

redisinsight/ui/src/utils/cliHelper.tsx

@@ -8,7 +8,7 @@ import { resetOutput, updateCliCommandHistory } from 'uiSrc/slices/cli/cli-outpu
 import { BrowserStorageItem, ICommands } from 'uiSrc/constants'
 import { ModuleCommandPrefix } from 'uiSrc/pages/workbench/constants'
 import { SelectCommand } from 'uiSrc/constants/cliOutput'
-import { ClusterNode, RedisDefaultModules } from 'uiSrc/slices/interfaces'
+import { ClusterNode, RedisDefaultModules, REDISEARCH_MODULES } from 'uiSrc/slices/interfaces'
 
 import { RedisModuleDto } from 'apiSrc/modules/instances/dto/database-instance.dto'
 import { Nullable } from './types'
@@ -146,6 +146,9 @@ const checkUnsupportedModuleCommand = (loadedModules: RedisModuleDto[], commandL
   }
 
   const isModuleLoaded = loadedModules?.some(({ name }) => name === commandModule)
+    // Redisearch has 4 names, need check all
+    || loadedModules?.some(({ name }) =>
+      REDISEARCH_MODULES.some((search) => name === search))
 
   if (isModuleLoaded) {
     return null