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

Revert "fix(#251, #265): phantoms folders fix on rename/delete needs to be run only on windows"

Browse Source 
This reverts commit fcc12fb089.

# Conflicts:
#	packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
#	packages/bruno-app/src/utils/common/platform.js
This commit is contained in:
Jack Scotson 2023-10-14 16:36:10 +01:00
parent b07ccbdfab
commit 7808a6db05
2 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,11 +171,7 @@ export const cancelRequest = (cancelTokenUid, item, collection) => (dispatch) =>
.catch((err) => console.log(err)); .catch((err) => console.log(err));
}; };
// todo: this can be directly put inside the collections/index.js file
// the coding convention is to put only actions that need ipc in this file
export const sortCollections = (order) => (dispatch) => {
dispatch(_sortCollections(order));
};
export const runCollectionFolder = (collectionUid, folderUid, recursive) => (dispatch, getState) => { export const runCollectionFolder = (collectionUid, folderUid, recursive) => (dispatch, getState) => {
const state = getState(); const state = getState();
const collection = findCollectionByUid(state.collections.collections, collectionUid); const collection = findCollectionByUid(state.collections.collections, collectionUid);
@ -293,19 +289,10 @@ export const renameItem = (newName, itemUid, collectionUid) => (dispatch, getSta
} }
const { ipcRenderer } = window; const { ipcRenderer } = window;
ipcRenderer ipcRenderer.invoke('renderer:rename-item', item.pathname, newPathname, newName).then(() => {
.invoke('renderer:rename-item', item.pathname, newPathname, newName) dispatch(_renameItem({ newName, itemUid, collectionUid }))
.then(() => { resolve()
// In case of Mac and Linux, we get the unlinkDir and addDir IPC events from electron which takes care of updating the state }).catch(reject);
// But in windows we don't get those events, so we need to update the state manually
// This looks like an issue in our watcher library chokidar
// GH: https://github.com/usebruno/bruno/issues/251
if (isWindowsOS()) {
dispatch(_renameItem({ newName, itemUid, collectionUid }));
}
resolve();
})
.catch(reject);
}); });
}; };
@ -390,14 +377,8 @@ export const deleteItem = (itemUid, collectionUid) => (dispatch, getState) => {
ipcRenderer ipcRenderer
.invoke('renderer:delete-item', item.pathname, item.type) .invoke('renderer:delete-item', item.pathname, item.type)
.then(() => { .then(() => {
// In case of Mac and Linux, we get the unlinkDir IPC event from electron which takes care of updating the state dispatch(_deleteItem({ itemUid, collectionUid }))
// But in windows we don't get those events, so we need to update the state manually resolve()
// This looks like an issue in our watcher library chokidar
// GH: https://github.com/usebruno/bruno/issues/265
if (isWindowsOS()) {
dispatch(_deleteItem({ itemUid, collectionUid }));
}
resolve();
}) })
.catch((error) => reject(error)); .catch((error) => reject(error));
} }
@ -405,6 +386,9 @@ export const deleteItem = (itemUid, collectionUid) => (dispatch, getState) => {
}); });
}; };
export const sortCollections = () => (dispatch) => {
dispatch(_sortCollections())
}
export const moveItem = (collectionUid, draggedItemUid, targetItemUid) => (dispatch, getState) => { export const moveItem = (collectionUid, draggedItemUid, targetItemUid) => (dispatch, getState) => {
const state = getState(); const state = getState();
const collection = findCollectionByUid(state.collections.collections, collectionUid); const collection = findCollectionByUid(state.collections.collections, collectionUid);

1
packages/bruno-app/src/utils/common/platform.js
View File

@ -1,7 +1,6 @@
import trim from 'lodash/trim'; import trim from 'lodash/trim';
import path from 'path'; import path from 'path';
import slash from './slash'; import slash from './slash';
import platform from 'platform';
export const isElectron = () => { export const isElectron = () => {
if (!window) { if (!window) {