Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@ import Modal from 'components/Modal';
import { isItemAFolder } from 'utils/tabs';
import { useDispatch } from 'react-redux';
import { closeTabs } from 'providers/ReduxStore/slices/tabs';
import { deleteItem } from 'providers/ReduxStore/slices/collections/actions';
import { deleteItem, reorderDirectoryItems } from 'providers/ReduxStore/slices/collections/actions';
import { recursivelyGetAllItemUids } from 'utils/collections';
import StyledWrapper from './StyledWrapper';

const DeleteCollectionItem = ({ onClose, item, collectionUid }) => {
const dispatch = useDispatch();
const isFolder = isItemAFolder(item);
const onConfirm = () => {
dispatch(deleteItem(item.uid, collectionUid)).then(() => {
dispatch(deleteItem(item.uid, collectionUid)).then(({ parentDirectory }) => {
dispatch(reorderDirectoryItems(parentDirectory, item.uid));

if (isFolder) {
// close all tabs that belong to the folder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -818,19 +818,37 @@

const item = findItemInCollection(collection, itemUid);
if (item) {
const parentDirectoryItem = findParentItemInCollection(collection, itemUid) || collection;
const { ipcRenderer } = window;

ipcRenderer
.invoke('renderer:delete-item', item.pathname, item.type)
.then(() => {
resolve();
resolve({ parentDirectory: parentDirectoryItem });
})
.catch((error) => reject(error));
}
return;
});
};

export const reorderDirectoryItems = (directory, itemUid) => (dispatch, getState) => {
if (!directory.items) return;

Check failure on line 837 in packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js

View workflow job for this annotation

GitHub Actions / Unit Tests

Trailing spaces not allowed
const directoryItemsWithoutDeletedItem = directory.items.filter(

Check failure on line 838 in packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js

View workflow job for this annotation

GitHub Actions / Unit Tests

Unexpected newline after '('
(i) => i.uid !== itemUid
);

Check failure on line 840 in packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js

View workflow job for this annotation

GitHub Actions / Unit Tests

Unexpected newline before ')'

const reorderedSourceItems = getReorderedItemsInSourceDirectory({
items: directoryItemsWithoutDeletedItem
});
if (reorderedSourceItems?.length) {
dispatch(updateItemsSequences({ itemsToResequence: reorderedSourceItems }));
}

return;
}

Check failure on line 850 in packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js

View workflow job for this annotation

GitHub Actions / Unit Tests

Missing semicolon

export const sortCollections = (payload) => (dispatch) => {
dispatch(_sortCollections(payload));
};
Expand Down
Loading