Skip to content

Commit ee32903

Browse files
committed
RI-5547 make skip options if no module more generic
1 parent 995c55f commit ee32903

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

redisinsight/ui/src/pages/browser/components/filter-key-type/FilterKeyType.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ import { FilterNotAvailable } from 'uiSrc/components'
2020
import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
2121
import { resetBrowserTree } from 'uiSrc/slices/app/context'
2222
import { appFeatureFlagsFeaturesSelector } from 'uiSrc/slices/app/features'
23-
import { ModulesKeyTypes } from 'uiSrc/constants'
24-
import { AdditionalRedisModule, RedisDefaultModules } from 'uiSrc/slices/interfaces'
23+
import { AdditionalRedisModule } from 'uiSrc/slices/interfaces'
2524
import { FILTER_KEY_TYPE_OPTIONS } from './constants'
2625

2726
import styles from './styles.module.scss'
@@ -59,8 +58,8 @@ const FilterKeyType = ({ modules }: Props) => {
5958
}, [filter])
6059

6160
const options: EuiSuperSelectOption<string>[] = FILTER_KEY_TYPE_OPTIONS
62-
.filter(({ featureFlag, value }) => {
63-
if (value === ModulesKeyTypes.Graph && !modules?.some(({ name }) => name === RedisDefaultModules.Graph)) {
61+
.filter(({ featureFlag, skipIfNoModule }) => {
62+
if (skipIfNoModule && !modules?.some(({ name }) => name === skipIfNoModule)) {
6463
return false
6564
}
6665
return !featureFlag || features[featureFlag]?.flag

redisinsight/ui/src/pages/browser/components/filter-key-type/constants.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {
44
ModulesKeyTypes,
55
FeatureFlags
66
} from 'uiSrc/constants'
7+
import { RedisDefaultModules } from 'uiSrc/slices/interfaces'
78

89
export const FILTER_KEY_TYPE_OPTIONS = [
910
{
@@ -45,6 +46,7 @@ export const FILTER_KEY_TYPE_OPTIONS = [
4546
text: 'Graph',
4647
value: ModulesKeyTypes.Graph,
4748
color: GROUP_TYPES_COLORS[ModulesKeyTypes.Graph],
49+
skipIfNoModule: RedisDefaultModules.Graph,
4850
featureFlag: FeatureFlags.envDependent
4951
},
5052
{

0 commit comments

Comments
 (0)