Skip to content

Commit 00e000c

Browse files
authored
Merge pull request #2692 from RedisInsight/fe/bugfix/RI-5006_RI-5011
#RI-5006 - fix closing infinite message on connect to db error
2 parents d4d1f19 + 5f63458 commit 00e000c

File tree

3 files changed

+20
-11
lines changed

3 files changed

+20
-11
lines changed

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

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -445,15 +445,23 @@ function autoCreateAndConnectToInstanceActionSuccess(
445445
dispatch(setAppContextInitialState())
446446
dispatch(setConnectedInstanceId(id ?? ''))
447447
}
448-
dispatch(checkConnectToInstanceAction(id, (id) => {
449-
setTimeout(() => {
450-
dispatch(removeInfiniteNotification(InfiniteMessagesIds.autoCreateDb))
451-
dispatch(addMessageNotification(message))
452-
onSuccess?.(id)
453-
}, HIDE_CREATING_DB_DELAY_MS)
454-
},
455-
onFail,
456-
!isConnectedId))
448+
dispatch(
449+
checkConnectToInstanceAction(
450+
id,
451+
(id) => {
452+
setTimeout(() => {
453+
dispatch(removeInfiniteNotification(InfiniteMessagesIds.autoCreateDb))
454+
dispatch(addMessageNotification(message))
455+
onSuccess?.(id)
456+
}, HIDE_CREATING_DB_DELAY_MS)
457+
},
458+
() => {
459+
dispatch(removeInfiniteNotification(InfiniteMessagesIds.autoCreateDb))
460+
onFail?.()
461+
},
462+
!isConnectedId
463+
)
464+
)
457465
} catch (error) {
458466
// process error if needed
459467
}

redisinsight/ui/src/utils/tests/transformers/transformQueryParams.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { transformQueryParamsObject } from 'uiSrc/utils'
22

33
const transformQueryParamsObjectTests: any[] = [
44
[{ v1: 'true', v2: '123', v3: 'qwe', v4: '1q' }, { v1: true, v2: 123, v3: 'qwe', v4: '1q' }],
5+
[{ v1: 'true', v2: '123', v3: 'qwe', v4: '1q', v5: 'false' }, { v1: true, v2: 123, v3: 'qwe', v4: '1q', v5: false }],
56
[{ v1: 'd' }, { v1: 'd' }],
67
[{ }, { }],
78
]

redisinsight/ui/src/utils/transformers/transformQueryParams.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { toNumber, transform, isNaN } from 'lodash'
22

33
export const transformQueryParamsObject = (properties: Record<string, any> = {}) =>
44
transform(properties, (result: Record<string, any>, value, key) => {
5-
if (value === 'true') {
6-
result[key] = true
5+
if (value === 'true' || value === 'false') {
6+
result[key] = value === 'true'
77
return
88
}
99
if (!isNaN(toNumber(value))) {

0 commit comments

Comments
 (0)