Skip to content

Commit 8eb4939

Browse files
authored
Merge pull request #57 from RedisInsight/bugfix/RI-1995
#RI-1995 - clear db context after deletion
2 parents 82541c8 + 8d007d6 commit 8eb4939

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

redisinsight/ui/src/slices/instances.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import ApiErrors from 'uiSrc/constants/apiErrors'
77
import { ApiEndpoints, BrowserStorageItem } from 'uiSrc/constants'
88
import successMessages from 'uiSrc/components/notifications/success-messages'
99
import { getApiErrorMessage, isStatusSuccessful, Nullable } from 'uiSrc/utils'
10+
import { setAppContextInitialState } from 'uiSrc/slices/app/context'
1011
import { DatabaseInstanceResponse } from 'apiSrc/modules/instances/dto/database-instance.dto'
1112

1213
import { AppDispatch, RootState } from './store'
@@ -270,18 +271,25 @@ export function updateInstanceAction({ id, ...payload }: Instance) {
270271

271272
// Asynchronous thunk action
272273
export function deleteInstancesAction(instances: Instance[]) {
273-
return async (dispatch: AppDispatch) => {
274+
return async (dispatch: AppDispatch, stateInit: () => RootState) => {
274275
dispatch(setDefaultInstance())
275276

276277
try {
278+
const state = stateInit()
279+
const instancesIds = map(instances, 'id')
277280
const { status } = await apiService.delete(ApiEndpoints.INSTANCE, {
278-
data: { ids: map(instances, 'id') },
281+
data: { ids: instancesIds },
279282
})
280283

281284
if (isStatusSuccessful(status)) {
282285
dispatch(setDefaultInstanceSuccess())
283286
dispatch<any>(fetchInstancesAction())
284287

288+
if (instancesIds.includes(state.app.context.contextInstanceId)) {
289+
dispatch(resetConnectedInstance())
290+
dispatch(setAppContextInitialState())
291+
}
292+
285293
if (instances.length === 1) {
286294
dispatch(
287295
addMessageNotification(successMessages.DELETE_INSTANCE(first(instances)?.name ?? ''))

0 commit comments

Comments
 (0)