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.

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

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

Merged
merged 24 commits into from
Oct 29, 2024

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 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 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    5ff99a8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    10c0098 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    852bad1 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    aec75b0 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    67468b3 View commit details
    Browse the repository at this point in the history
  7. 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 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 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    4205f09 View commit details
    Browse the repository at this point in the history
  10. 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 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 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    f2526fd View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. Merge remote-tracking branch 'origin/9.0' into feature/conflict-resol…

    …ution-03/rebase-during-publish
    mhsdesign committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    e0bcbd1 View commit details
    Browse the repository at this point in the history
  2. TASK: Fix php code

    mhsdesign committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    c7c160f View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. Merge remote-tracking branch 'origin/9.0' into feature/conflict-resol…

    …ution-03/rebase-during-publish
    mhsdesign committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    b072764 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    64ac4bc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9c70968 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2024

  1. Merge remote-tracking branch 'origin/9.0' into feature/conflict-resol…

    …ution-03/rebase-during-publish
    mhsdesign committed Oct 26, 2024
    Configuration menu
    Copy the full SHA
    d3090d4 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2024

  1. TASK: Make sure e2e test fail if the Publish Result Dialog shows an e…

    …rror
    
    Currently, the `#neos-PublishDialog-Acknowledge` id will be used both for the "ok" button in success, and for the "cancel" button in case of any unexpected errors.
    
    To make the e2e tests fail fast we change the id in the error case to `Acknowledge-Error` so we dont accidentally click it.
    
    see also: #3769 (review)
    mhsdesign committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    6778a5a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d2baeb7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7468ffb View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2024

  1. TASK: Avoid use of internal sequenceNumber for building commands th…

    …at failed
    
    instead we can just generate a uuid as the `sequenceNumber` was also unique for each command that failed
    
    see neos/neos-development-collection#5301 (comment)
    mhsdesign committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    15c13ab View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    36a5de7 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. Merge remote-tracking branch 'origin/9.0' into feature/conflict-resol…

    …ution-03/rebase-during-publish
    mhsdesign committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    68fdde5 View commit details
    Browse the repository at this point in the history