Skip to content

Commit 499ff10

Browse files
committed
stop move conflict re-sending already-moved assets to server
1 parent 73ae1c9 commit 499ff10

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

resources/js/components/assets/Browser/Browser.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1018,12 +1018,16 @@ export default {
10181018
openMoveConflictModal({ action, asset, destinationFolder, selections, message, conflict, completedMoves }) {
10191019
const initialRemap =
10201020
completedMoves && typeof completedMoves === 'object' && !Array.isArray(completedMoves) ? completedMoves : {};
1021+
const completedSelectionIds = new Set(Object.keys(initialRemap).map((id) => String(id)));
1022+
const pendingSelections = Array.from(new Set((selections || [asset?.id]).filter(Boolean))).filter(
1023+
(id) => !completedSelectionIds.has(String(id)),
1024+
);
10211025
10221026
this.moveConflictContext = {
10231027
action,
10241028
asset,
10251029
destinationFolder,
1026-
pendingSelections: Array.from(new Set((selections || [asset?.id]).filter(Boolean))),
1030+
pendingSelections,
10271031
conflict,
10281032
idRemap: { ...initialRemap },
10291033
};

0 commit comments

Comments
 (0)