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

Remove WorkspaceStatus::OUTDATED_CONFLICT? #5101

Closed
mhsdesign opened this issue May 27, 2024 · 2 comments
Closed

Remove WorkspaceStatus::OUTDATED_CONFLICT? #5101

mhsdesign opened this issue May 27, 2024 · 2 comments
Labels
9.0

Comments

@mhsdesign
Copy link
Member

What happens with \Neos\ContentRepository\Core\Projection\Workspace\WorkspaceStatus::OUTDATED_CONFLICT the doc comment is now at least outdated and we never use it anymore besides writing for legacy event but we never query those?

So can we get rid of this status ?

Originally posted by @mhsdesign in #4965 (comment)
@mhsdesign mhsdesign added the 9.0 label May 27, 2024
mhsdesign added a commit to mhsdesign/neos-development-collection that referenced this issue Jun 16, 2024
@mhsdesign
TASK: Remove obsolete OUTDATED_CONFLICT state leftovers
10e3259 
Resolves: neos#5101
@mhsdesign mhsdesign mentioned this issue Jun 16, 2024
Closed
6 tasks
@mhsdesign
Copy link
Member Author

mhsdesign commented Oct 3, 2024 •
edited
Loading

Also we dont need the REBASE_ERROR any further and the docs are outdated:

neos-development-collection/Neos.ContentRepository.Core/Classes/SharedModel/Workspace/ContentStreamStatus.php

Line 80 in fab9d2d

case REBASE_ERROR = 'REBASE_ERROR';
as well as this comment here too:

neos-development-collection/Neos.ContentRepository.Core/Classes/Feature/WorkspaceRebase/Dto/RebaseErrorHandlingStrategy.php

Line 28 in a8857d3

* This strategy rebasing will fail if conflicts are detected and the "WorkspaceRebaseFailed" event is added.

Also some adjusted tests where not really testing that what they stated, this will be adjusted via: #5274

  • Conflicting changes lead to OUTDATED_CONFLICT which can be recovered from via forced rebase
  • Conflicting changes lead to OUTDATED which can be recovered from via discard

mhsdesign added a commit to mhsdesign/neos-development-collection that referenced this issue Oct 17, 2024
@mhsdesign
TASK: Remove obsolete REBASE_ERROR content stream state
1750160 
Via neos#4965 the status REBASE_ERROR is obsolete.
Instead of still using this status on replay we mimic the new logic:
> In case of a [rebase error}, reopen the old content stream and remove the newly created

Additionally, to not break `findContentStreams` when fetching all content streams we make sure that the streams with `REBASE_ERROR` are transformed to `NO_LONGER_IN_USE` so they can be cleaned up.

Related neos#5101
@mhsdesign
Copy link
Member Author

Fixed via #5274 and #5297

neos-bot pushed a commit to neos/contentgraph-doctrinedbaladapter that referenced this issue Oct 31, 2024
@mhsdesign
TASK: Remove obsolete REBASE_ERROR content stream state
1e281bc 
Via #4965 the status REBASE_ERROR is obsolete.
Instead of still using this status on replay we mimic the new logic:
> In case of a [rebase error}, reopen the old content stream and remove the newly created

Additionally, to not break `findContentStreams` when fetching all content streams we make sure that the streams with `REBASE_ERROR` are transformed to `NO_LONGER_IN_USE` so they can be cleaned up.

Related neos/neos-development-collection#5101
neos-bot pushed a commit to neos/contentrepository-core that referenced this issue Oct 31, 2024
@mhsdesign
TASK: Remove obsolete REBASE_ERROR content stream state
7ab2b55 
Via #4965 the status REBASE_ERROR is obsolete.
Instead of still using this status on replay we mimic the new logic:
> In case of a [rebase error}, reopen the old content stream and remove the newly created

Additionally, to not break `findContentStreams` when fetching all content streams we make sure that the streams with `REBASE_ERROR` are transformed to `NO_LONGER_IN_USE` so they can be cleaned up.

Related neos/neos-development-collection#5101
neos-bot pushed a commit to neos/contentrepositoryregistry that referenced this issue Oct 31, 2024
@mhsdesign
TASK: Remove obsolete REBASE_ERROR content stream state
eec8334 
Via #4965 the status REBASE_ERROR is obsolete.
Instead of still using this status on replay we mimic the new logic:
> In case of a [rebase error}, reopen the old content stream and remove the newly created

Additionally, to not break `findContentStreams` when fetching all content streams we make sure that the streams with `REBASE_ERROR` are transformed to `NO_LONGER_IN_USE` so they can be cleaned up.

Related neos/neos-development-collection#5101
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
9.0
Projects
Neos 9.0 Release Board
Archived in project
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

TASK: Remove obsolete OUTDATED_CONFLICT state leftovers mhsdesign/neos-development-collection
1 participant
@mhsdesign