Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FEATURE: Integrate conflict resolution with publish/discard dialog workflow #3769

Open
wants to merge 12 commits into
base: 9.0
Choose a base branch
from
Open

FEATURE: Integrate conflict resolution with publish/discard dialog workflow #3769

wants to merge 12 commits into from

Commits on Jun 28, 2024

  1. TASK: Move Conflicts concept to Application\Shared namespace 

    This moves the classes `ConflictsOccurred`, `Conflict`, `Conflicts`,
`ConflictsBuilder`, `ReasonForConflict`, `TypeOfChange` and `IconLabel`
into the `Application\Shared` namespace and adjusts all references
accordingly.

These classes are going to be reused by multiple command handlers.
    @grebaldi
    grebaldi committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    aaeb68a View commit details
    Browse the repository at this point in the history

  2. TASK: Add command handlers for all Publish-related commands 

    This includes the following tasks;
- Move `PublishChangesInDocument` ->
`PublishChangesInDocument\PublishChangesInDocumentCommand`
- Create `PublishChangesInDocumentCommandHandler`
- Move `PublishChangesInSite` ->
`PublishChangesInSite\PublishChangesInSiteCommand`
- Create `PublishChangesInSiteCommandHandler`
    @grebaldi
    grebaldi committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    5ff99a8 View commit details
    Browse the repository at this point in the history

  3. TASK: Ensure that all Publish-related command handlers throw `Conflic… 

    …tsOccurred`
    @grebaldi
    grebaldi committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    10c0098 View commit details
    Browse the repository at this point in the history

  4. TASK: Turn ConflictsOccurred into a Result DTO rather than an excep… 

    …tion
    @grebaldi
    grebaldi committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    852bad1 View commit details
    Browse the repository at this point in the history

  5. TASK: Move logic to create Conflicts from WorkspaceRebaseFailed into … 

    …dedicated Factory
    @grebaldi
    grebaldi committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    aec75b0 View commit details
    Browse the repository at this point in the history

  6. TASK: Use conflict DTO key property as key for iteration in Conflic… 

    …tList component
    @grebaldi
    grebaldi committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    67468b3 View commit details
    Browse the repository at this point in the history

  7. TASK: Trigger conflict resolution from within Publish saga

    @grebaldi
    grebaldi committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    24927dc View commit details
    Browse the repository at this point in the history

  8. BUGFIX: Remove race condition in watchNodeInformationChanges 

    It may happen that `fetchAdditionalNodeMetadata` adds metadata for
a node that has since been removed from the store. The occurance
of such "zombie" nodes leads to problems, because they may lack
crucial properties like `children` that are treated as always-
present by other mechanisms throughout the UI.

This became apparent after #3756.

The CR.Nodes.MERGE action now takes care of preventing zombie nodes
from entering the store.
    @grebaldi
    grebaldi committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    f23176b View commit details
    Browse the repository at this point in the history

  9. BUGFIX: Wait and reload before syncing in E2E test 

    This is to prevent the flakiness described in #3785.
    @grebaldi
    grebaldi committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    4205f09 View commit details
    Browse the repository at this point in the history

  10. TASK: Stabilize E2E tests for synving feature 

    fixes: #3785
    @grebaldi
    grebaldi committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    98d002a View commit details
    Browse the repository at this point in the history

  11. BUGFIX: Fix undefined state when cancelling sync operations 

    This adds an e2e test case for cancelling and reselecting a resolution strategy
and another e2e test case for immediate resolution cancellation.

Both test cases are fixed by changes to the syncing saga.
    @grebaldi
    grebaldi committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    d8c93a0 View commit details
    Browse the repository at this point in the history

  12. TASK: Handle edge case when automatic syncing during "publish documen… 

    …t" removes the document

This also adds two more E2E test cases for publishing with automatic syncing.
    @grebaldi
    grebaldi committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    f2526fd View commit details
    Browse the repository at this point in the history