Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 26, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b6f00d
#RI-3725 - Module is not found when RediSearch Light is loaded
egor-zalenski Oct 25, 2022
446bee5
Merge branch 'main' into fe/bugfix/RI-3725_Redisearch_light_module_no…
egor-zalenski Oct 25, 2022
7ba7cc0
fix ui tests in the main branch
egor-zalenski Oct 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ...ght/ui/src/pages/databaseAnalysis/components/analysis-data-view/AnalysisDataView.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand All @@ -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', () => {
Expand Down Expand Up @@ -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}`))
Expand Down
8 changes: 5 additions & 3 deletions redisinsight/ui/src/slices/interfaces/instances.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
5 changes: 4 additions & 1 deletion redisinsight/ui/src/utils/cliHelper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand Down