WIP: Integrate conflict resolution with publish/discard dialog workflow #3769
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.
solves: #3761
builds on: #3762
Description
Steps to reproduce
Assuming you have two user accounts with
Neos.Neos:Editor
role (let's call them "editor-a" and "editor-b"):Remaining TODOs
Conflicts
concept toApplication\Shared
namespaceConflictsOccurred
toApplication\Shared
namespaceConflict
toApplication\Shared
namespaceConflicts
toApplication\Shared
namespaceConflictsBuilder
toApplication\Shared
namespaceReasonForConflict
toApplication\Shared
namespaceTypeOfChange
toApplication\Shared
namespaceIconLabel
toApplication\Shared
namespaceConflictsOccurred
PublishChangesInDocument
->PublishChangesInDocument\PublishChangesInDocumentCommand
PublishChangesInDocumentCommandHandler
PublishChangesInDocumentCommandHandler
throwsConflictsOccurred
PublishChangesInSite
->PublishChangesInSite\PublishChangesInSiteCommand
PublishChangesInSiteCommandHandler
PublishChangesInSiteCommandHandler
throwsConflictsOccurred
ConflictsOccurred
into a Result DTO rather than an exceptioncatch (WorkspaceRebaseFailed $e)
clausesPublish
sagaconflicts
case toPublishingResponse
PublishingState.CONFLICTS