From 9b6f00d7b0039e5164aaf33caa567a2e8d19d379 Mon Sep 17 00:00:00 2001 From: zalenskiSofteq Date: Tue, 25 Oct 2022 15:33:03 +0200 Subject: [PATCH 1/2] #RI-3725 - Module is not found when RediSearch Light is loaded --- redisinsight/ui/src/slices/interfaces/instances.ts | 8 +++++--- redisinsight/ui/src/utils/cliHelper.tsx | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/redisinsight/ui/src/slices/interfaces/instances.ts b/redisinsight/ui/src/slices/interfaces/instances.ts index ccb2f04e95..62fe52daea 100644 --- a/redisinsight/ui/src/slices/interfaces/instances.ts +++ b/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({ diff --git a/redisinsight/ui/src/utils/cliHelper.tsx b/redisinsight/ui/src/utils/cliHelper.tsx index 7872667bf1..bc71620fc3 100644 --- a/redisinsight/ui/src/utils/cliHelper.tsx +++ b/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 From 7ba7cc0654bdc2d2bdbbaeabf6b2ebebff431a51 Mon Sep 17 00:00:00 2001 From: zalenskiSofteq Date: Tue, 25 Oct 2022 15:44:17 +0200 Subject: [PATCH 2/2] fix ui tests in the main branch --- .../analysis-data-view/AnalysisDataView.spec.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/redisinsight/ui/src/pages/databaseAnalysis/components/analysis-data-view/AnalysisDataView.spec.tsx b/redisinsight/ui/src/pages/databaseAnalysis/components/analysis-data-view/AnalysisDataView.spec.tsx index cad25c72c7..a463a14a23 100644 --- a/redisinsight/ui/src/pages/databaseAnalysis/components/analysis-data-view/AnalysisDataView.spec.tsx +++ b/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}`))