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

TASK: Disallow disabling tethered nodes #4938

Draft
wants to merge 1 commit into
base: 9.0
Choose a base branch
from
Draft

TASK: Disallow disabling tethered nodes #4938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 16 additions & 6 deletions ...Tests/Behavior/Features/06-NodeDisabling/01-DisableNodeAggregate_ConstraintChecks.feature
View file
Open in desktop
Expand Up @@ -11,7 +11,11 @@ Feature: Constraint checks on node aggregate disabling
| language | de, gsw, en | gsw->de, en |
And using the following node types:
"""yaml
'Neos.ContentRepository.Testing:Document': []
'Neos.ContentRepository.Testing:Tethered': []
'Neos.ContentRepository.Testing:Document':
childNodes:
tethered:
type: 'Neos.ContentRepository.Testing:Tethered'
"""
And using identifier "default", I define a content repository
And I am in content repository "default"
Expand All @@ -30,8 +34,8 @@ Feature: Constraint checks on node aggregate disabling
| nodeTypeName | "Neos.ContentRepository:Root" |
And the graph projection is fully up to date
And the following CreateNodeAggregateWithNode commands are executed:
| nodeAggregateId | nodeTypeName | parentNodeAggregateId | nodeName |
| sir-david-nodenborough | Neos.ContentRepository.Testing:Document | lady-eleonode-rootford | document |
| nodeAggregateId | nodeTypeName | parentNodeAggregateId | nodeName | tetheredDescendantNodeAggregateIds |
| sir-david-nodenborough | Neos.ContentRepository.Testing:Document | lady-eleonode-rootford | document | {"tethered": "nodewyn-tetherton"} |

Scenario: Try to disable a node aggregate in a non-existing content stream
When the command DisableNodeAggregate is executed with payload and exceptions are caught:
Expand All @@ -58,6 +62,13 @@ Feature: Constraint checks on node aggregate disabling
| nodeVariantSelectionStrategy | "allVariants" |
| tag | "disabled" |

Scenario: Try to disable a tethered node aggregate
When the command DisableNodeAggregate is executed with payload and exceptions are caught:
| Key | Value |
| nodeAggregateId | "nodewyn-tetherton" |
| nodeVariantSelectionStrategy | "allVariants" |
Then the last command should have thrown an exception of type "NodeAggregateIsTethered"

Scenario: Try to disable an already disabled node aggregate
Given the command DisableNodeAggregate is executed with payload:
| Key | Value |
Expand All @@ -72,15 +83,14 @@ Feature: Constraint checks on node aggregate disabling
| nodeAggregateId | "sir-david-nodenborough" |
| coveredDimensionSpacePoint | {"language": "de"} |
| nodeVariantSelectionStrategy | "allVariants" |
Then I expect exactly 4 events to be published on stream with prefix "ContentStream:cs-identifier"
And event at index 3 is of type "SubtreeWasTagged" with payload:
Then I expect exactly 5 events to be published on stream with prefix "ContentStream:cs-identifier"
And event at index 4 is of type "SubtreeWasTagged" with payload:
| Key | Expected |
| contentStreamId | "cs-identifier" |
| nodeAggregateId | "sir-david-nodenborough" |
| affectedDimensionSpacePoints | [{"language":"de"},{"language":"gsw"}] |
| tag | "disabled" |


Scenario: Try to disable a node aggregate in a non-existing dimension space point
When the command DisableNodeAggregate is executed with payload and exceptions are caught:
| Key | Value |
Expand Down
3 changes: 3 additions & 0 deletions Neos.ContentRepository.Core/Classes/Feature/NodeDisabling/NodeDisabling.php
View file
Open in desktop
Expand Up @@ -60,6 +60,9 @@ private function handleDisableNodeAggregate(
$nodeAggregate,
$command->coveredDimensionSpacePoint
);

$this->requireNodeAggregateToBeUntethered($nodeAggregate);

if ($nodeAggregate->getDimensionSpacePointsTaggedWith(SubtreeTag::disabled())->contains($command->coveredDimensionSpacePoint)) {
// already disabled, so we can return a no-operation.
return EventsToPublish::empty();
Expand Down