holm/bruno
1
0
Fork 0
forked from extern/bruno
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: fixed screen crash when collection was removed

Browse Source
This commit is contained in:
Anoop M D 2023-09-28 03:26:13 +05:30
parent 665428a2d0
commit 487dd73040
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
View File

@ -42,8 +42,8 @@ import {
collectionAddEnvFileEvent as _collectionAddEnvFileEvent collectionAddEnvFileEvent as _collectionAddEnvFileEvent
} from './index'; } from './index';
import { closeTabs } from 'providers/ReduxStore/slices/tabs'; import { closeAllCollectionTabs } from 'providers/ReduxStore/slices/tabs';
import { isLocalCollection, resolveRequestFilename } from 'utils/common/platform'; import { resolveRequestFilename } from 'utils/common/platform';
const PATH_SEPARATOR = path.sep; const PATH_SEPARATOR = path.sep;
@ -723,11 +723,7 @@ export const removeCollection = (collectionUid) => (dispatch, getState) => {
ipcRenderer ipcRenderer
.invoke('renderer:remove-collection', collection.pathname) .invoke('renderer:remove-collection', collection.pathname)
.then(() => { .then(() => {
dispatch( dispatch(closeAllCollectionTabs({ collectionUid }));
closeTabs({
tabUids: recursivelyGetAllItemUids(collection.items)
})
);
}) })
.then(waitForNextTick) .then(waitForNextTick)
.then(() => { .then(() => {

16
packages/bruno-app/src/providers/ReduxStore/slices/tabs.js
View File

@ -92,11 +92,23 @@ export const tabsSlice = createSlice({
if (!state.tabs || !state.tabs.length) { if (!state.tabs || !state.tabs.length) {
state.activeTabUid = null; state.activeTabUid = null;
} }
},
closeAllCollectionTabs: (state, action) => {
const collectionUid = action.payload.collectionUid;
state.tabs = filter(state.tabs, (t) => t.collectionUid !== collectionUid);
state.activeTabUid = null;
} }
} }
}); });
export const { addTab, focusTab, updateRequestPaneTabWidth, updateRequestPaneTab, updateResponsePaneTab, closeTabs } = export const {
tabsSlice.actions; addTab,
focusTab,
updateRequestPaneTabWidth,
updateRequestPaneTab,
updateResponsePaneTab,
closeTabs,
closeAllCollectionTabs
} = tabsSlice.actions;
export default tabsSlice.reducer; export default tabsSlice.reducer;