Skip to content

Commit 0d898ad

Browse files
committed
#RI-3992 - fix redistack for empty list of modules
1 parent 50ddda0 commit 0d898ad

File tree

2 files changed

+21
-5
lines changed

2 files changed

+21
-5
lines changed

redisinsight/ui/src/utils/redistack.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,15 @@ export const REDISTACK_MODULES: Array<string | Array<string>> = [
1010
RedisDefaultModules.TimeSeries,
1111
]
1212

13-
const checkRediStackModules = (modules: any[]) => map(modules, 'name')
14-
.sort()
15-
.every((m, index) => (isArray(REDISTACK_MODULES[index])
16-
? (REDISTACK_MODULES[index] as Array<string>).some((rm) => rm === m)
17-
: REDISTACK_MODULES[index] === m))
13+
const checkRediStackModules = (modules: any[]) => {
14+
if (!modules.length || modules.length !== REDISTACK_MODULES.length) return false
15+
16+
return map(modules, 'name')
17+
.sort()
18+
.every((m, index) => (isArray(REDISTACK_MODULES[index])
19+
? (REDISTACK_MODULES[index] as Array<string>).some((rm) => rm === m)
20+
: REDISTACK_MODULES[index] === m))
21+
}
1822

1923
const checkRediStack = (instances: Instance[]): Instance[] => {
2024
let isRediStackCheck = false

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,18 @@ const getOutputCheckRediStackTests: any[] = [
4646
[{ port: 12000, modules: unmapWithName(['bf', 'timeseries', 'ReJSON', 'searchlight', 'graph']) }],
4747
[{ port: 12000, modules: unmapWithName(['bf', 'timeseries', 'ReJSON', 'searchlight', 'graph']), isRediStack: true }]
4848
],
49+
[
50+
[{ port: 12000, modules: [] }],
51+
[{ port: 12000, modules: [], isRediStack: false }]
52+
],
53+
[
54+
[{ port: 12000, modules: unmapWithName(['ReJSON']) }],
55+
[{ port: 12000, modules: unmapWithName(['ReJSON']), isRediStack: false }]
56+
],
57+
[
58+
[{ port: 12000, modules: unmapWithName(['bf', 'timeseries', 'ReJSON', 'searchlight', 'graph', 'custom']) }],
59+
[{ port: 12000, modules: unmapWithName(['bf', 'timeseries', 'ReJSON', 'searchlight', 'graph', 'custom']), isRediStack: false }]
60+
],
4961
]
5062

5163
describe('checkRediStack', () => {

0 commit comments

Comments
 (0)