From 7808a6db05bdf123ab47237ef94a7b3172c5fbfb Mon Sep 17 00:00:00 2001
From: Jack Scotson <jackscotson@gmail.com>
Date: Sat, 14 Oct 2023 16:36:10 +0100
Subject: [PATCH] Revert "fix(#251, #265): phantoms folders fix on
 rename/delete needs to be run only on windows"

This reverts commit fcc12fb089472716328054665d767d7b0ae48e04.

# Conflicts:
#	packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
#	packages/bruno-app/src/utils/common/platform.js
---
 .../ReduxStore/slices/collections/actions.js  | 36 ++++++-------------
 .../bruno-app/src/utils/common/platform.js    |  1 -
 2 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js b/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
index f18c7edf..79f3384b 100644
--- a/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
+++ b/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
@@ -171,11 +171,7 @@ export const cancelRequest = (cancelTokenUid, item, collection) => (dispatch) =>
     .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) => {
   const state = getState();
   const collection = findCollectionByUid(state.collections.collections, collectionUid);
@@ -293,19 +289,10 @@ export const renameItem = (newName, itemUid, collectionUid) => (dispatch, getSta
     }
     const { ipcRenderer } = window;
 
-    ipcRenderer
-      .invoke('renderer:rename-item', item.pathname, newPathname, newName)
-      .then(() => {
-        // In case of Mac and Linux, we get the unlinkDir and addDir IPC events from electron which takes care of updating the state
-        // 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);
+    ipcRenderer.invoke('renderer:rename-item', item.pathname, newPathname, newName).then(() => {
+      dispatch(_renameItem({ newName, itemUid, collectionUid }))
+      resolve()
+    }).catch(reject);
   });
 };
 
@@ -390,14 +377,8 @@ export const deleteItem = (itemUid, collectionUid) => (dispatch, getState) => {
       ipcRenderer
         .invoke('renderer:delete-item', item.pathname, item.type)
         .then(() => {
-          // In case of Mac and Linux, we get the unlinkDir IPC event from electron which takes care of updating the state
-          // 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/265
-          if (isWindowsOS()) {
-            dispatch(_deleteItem({ itemUid, collectionUid }));
-          }
-          resolve();
+          dispatch(_deleteItem({ itemUid, collectionUid }))
+          resolve()
         })
         .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) => {
   const state = getState();
   const collection = findCollectionByUid(state.collections.collections, collectionUid);
diff --git a/packages/bruno-app/src/utils/common/platform.js b/packages/bruno-app/src/utils/common/platform.js
index 03ff9539..24b4a41a 100644
--- a/packages/bruno-app/src/utils/common/platform.js
+++ b/packages/bruno-app/src/utils/common/platform.js
@@ -1,7 +1,6 @@
 import trim from 'lodash/trim';
 import path from 'path';
 import slash from './slash';
-import platform from 'platform';
 
 export const isElectron = () => {
   if (!window) {