Avoid sending move requests for files in moved folders (#15313)

GitOrigin-RevId: 87244b785eeeb2dadb0b4b06c9725a1ddee0562f
This commit is contained in:
Alf Eaton 2023-10-23 11:24:52 +01:00 committed by Copybot
parent fa2afb7807
commit 6903d5c945

View file

@ -219,12 +219,16 @@ export function FileTreeActionableProvider({ reindexReferences, children }) {
(toFolderId, draggedEntityIds) => {
dispatch({ type: ACTION_TYPES.MOVING })
// find entities and filter out no-ops
// find entities and filter out no-ops and nested files
const founds = Array.from(draggedEntityIds)
.map(draggedEntityId =>
findInTreeOrThrow(fileTreeData, draggedEntityId)
)
.filter(found => found.parentFolderId !== toFolderId)
.filter(
found =>
found.parentFolderId !== toFolderId &&
!draggedEntityIds.has(found.parentFolderId)
)
// make sure all entities can be moved, return early otherwise
const isMoveToRoot = toFolderId === fileTreeData._id