[6.x] New Asset Exists Modal Resolution Feature#14433
Open
jackmcdade wants to merge 12 commits into6.xfrom
Open
[6.x] New Asset Exists Modal Resolution Feature#14433jackmcdade wants to merge 12 commits into6.xfrom
jackmcdade wants to merge 12 commits into6.xfrom
Conversation
Works with uploading and moving assets. Resolves #14381.
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
This updates the asset conflict UX by making modal-dismiss behavior resolve as cancel, only showing “apply to all” when multiple upload conflicts exist, and replacing recursive move-conflict continuation with an iterative loop. It also adds MoveAsset tests for non-conflicting moves, same-folder no-op moves, and explicit cancel strategy handling.
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 2 potential issues.
❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.
Reviewed by Cursor Bugbot for commit 6c5b195. Configure here.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Works with uploading and moving assets. Resolves #14381.
asset-conflicts.mp4
Note
Medium Risk
Changes asset upload and move flows to surface file conflicts and retry actions with overwrite/keep-both strategies, touching CP UI state management and backend action/controller error handling. Moderate risk due to new branching around file operations, cache invalidation, and multi-selection move retries.
Overview
Adds file conflict detection and resolution to the CP asset browser for both uploads and drag/drop moves, prompting a modal to
Cancel,Keep Both(timestamp), orOverwrite, with optional apply to all handling.Backend now returns structured conflict payloads for uploads (
AssetsController@store409 JSON) and moves (MoveAssetthrows newAssetConflictExceptioncaptured byActionController), including partialcompleted_movesfor multi-selection moves; frontend queues conflicts, retries with chosen strategy, supports multi-select drag moves, and clears Glide/image caches after overwrite/timestamp resolutions.Reviewed by Cursor Bugbot for commit 8cd9ec5. Bugbot is set up for automated code reviews on this repo. Configure here.