diff --git a/.composer.json b/.composer.json index f39d91c24db..21c06fac74f 100644 --- a/.composer.json +++ b/.composer.json @@ -38,14 +38,16 @@ "@test:behat-cli -c Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/behat.yml.dist", "../../flow doctrine:migrate --quiet; ../../flow cr:setup", "@test:behat-cli -c Neos.Neos/Tests/Behavior/behat.yml", - "@test:behat-cli -c Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/behat.yml.dist" + "@test:behat-cli -c Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/behat.yml.dist", + "@test:behat-cli -c Neos.TimeableNodeVisibility/Tests/Behavior/behat.yml.dist" ], "test:behavioral:stop-on-failure": [ "@test:behat-cli -vvv --stop-on-failure -c Neos.ContentRepository.BehavioralTests/Tests/Behavior/behat.yml.dist", "@test:behat-cli -vvv --stop-on-failure -c Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/behat.yml.dist", "../../flow doctrine:migrate --quiet; ../../flow cr:setup", "@test:behat-cli -vvv --stop-on-failure -c Neos.Neos/Tests/Behavior/behat.yml", - "@test:behat-cli -vvv --stop-on-failure -c Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/behat.yml.dist" + "@test:behat-cli -vvv --stop-on-failure -c Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/behat.yml.dist", + "@test:behat-cli -vvv --stop-on-failure -c Neos.TimeableNodeVisibility/Tests/Behavior/behat.yml.dist" ], "test": [ "@test:unit", diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php b/Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php index 4aff7d34cf8..258d58d8b3f 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php @@ -150,6 +150,26 @@ public function iChangeTheFollowingHierarchyRelationsDimensionSpacePointHash(Tab ); } + /** + * @When /^I change the following hierarchy relation's name:$/ + * @param TableNode $payloadTable + * @throws DBALException + */ + public function iChangeTheFollowingHierarchyRelationsEdgeName(TableNode $payloadTable): void + { + $dataset = $this->transformPayloadTableToDataset($payloadTable); + $record = $this->transformDatasetToHierarchyRelationRecord($dataset); + unset($record['position']); + + $this->dbalClient->getConnection()->update( + $this->getTableNamePrefix() . '_hierarchyrelation', + [ + 'name' => $dataset['newName'] + ], + $record + ); + } + /** * @When /^I set the following position:$/ * @param TableNode $payloadTable diff --git a/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/ProjectionIntegrityViolationDetection/TetheredNodesAreNamed.feature b/Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Projection/ProjectionIntegrityViolationDetection/TetheredNodesAreNamed.feature similarity index 86% rename from Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/ProjectionIntegrityViolationDetection/TetheredNodesAreNamed.feature rename to Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Projection/ProjectionIntegrityViolationDetection/TetheredNodesAreNamed.feature index db68d13c03e..b767c0e392e 100644 --- a/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/ProjectionIntegrityViolationDetection/TetheredNodesAreNamed.feature +++ b/Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Projection/ProjectionIntegrityViolationDetection/TetheredNodesAreNamed.feature @@ -46,8 +46,16 @@ Feature: Run projection integrity violation detection regarding naming of tether | originDimensionSpacePoint | {"language":"de"} | | coveredDimensionSpacePoints | [{"language":"de"}] | | parentNodeAggregateId | "sir-david-nodenborough" | + | nodeName | "to-be-hacked-to-null" | | nodeAggregateClassification | "tethered" | And the graph projection is fully up to date + And I change the following hierarchy relation's name: + | Key | Value | + | contentStreamId | "cs-identifier" | + | dimensionSpacePoint | {"language":"de"} | + | parentNodeAggregateId | "sir-david-nodenborough" | + | childNodeAggregateId | "nodewyn-tetherton" | + | newName | null | And I run integrity violation detection Then I expect the integrity violation detection result to contain exactly 1 errors And I expect integrity violation detection result error number 1 to have code 1597923103 diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentSubgraph.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentSubgraph.php index aa77993c975..8e27eaf7f04 100644 --- a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentSubgraph.php +++ b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentSubgraph.php @@ -461,15 +461,9 @@ public function countNodes(): int } } - /** - * @return array - */ - public function jsonSerialize(): array + public function jsonSerialize(): ContentSubgraphIdentity { - return [ - 'contentStreamId' => $this->contentStreamId, - 'dimensionSpacePoint' => $this->dimensionSpacePoint - ]; + return $this->getIdentity(); } /** ------------------------------------------- */ diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/ContentSubhypergraph.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/ContentSubhypergraph.php index cf3aafd476d..3e13ab75c53 100644 --- a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/ContentSubhypergraph.php +++ b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/ContentSubhypergraph.php @@ -534,14 +534,8 @@ private function getDatabaseConnection(): DatabaseConnection return $this->databaseClient->getConnection(); } - /** - * @return array - */ - public function jsonSerialize(): array + public function jsonSerialize(): ContentSubgraphIdentity { - return [ - 'contentStreamId' => $this->contentStreamId, - 'dimensionSpacePoint' => $this->dimensionSpacePoint - ]; + return $this->getIdentity(); } } diff --git a/Neos.ContentRepository.BehavioralTests/Classes/PhpstanRules/InternalMethodsNotAllowedOutsideContentRepositoryRule.php b/Neos.ContentRepository.BehavioralTests/Classes/PhpstanRules/InternalMethodsNotAllowedOutsideContentRepositoryRule.php index 2450e0bfc3f..20ce94d1592 100644 --- a/Neos.ContentRepository.BehavioralTests/Classes/PhpstanRules/InternalMethodsNotAllowedOutsideContentRepositoryRule.php +++ b/Neos.ContentRepository.BehavioralTests/Classes/PhpstanRules/InternalMethodsNotAllowedOutsideContentRepositoryRule.php @@ -31,19 +31,30 @@ public function processNode(Node $node, Scope $scope): array { assert($node instanceof Node\Expr\CallLike); - if ($scope->getNamespace() && str_starts_with($scope->getNamespace(), 'Neos\ContentRepository\Core')) { - // Core is allowed to call all namespaces - // TODO !!! ONLY FROM WITHIN OWN PACKAGE!!!! + if ( + $scope->getNamespace() + && ( + str_starts_with($scope->getNamespace(), 'Neos\ContentRepository\Core') + || str_starts_with($scope->getNamespace(), 'Neos\ContentGraph\DoctrineDbalAdapter') + || str_starts_with($scope->getNamespace(), 'Neos\ContentRepository\BehavioralTests') + || str_starts_with($scope->getNamespace(), 'Neos\ContentRepository\Export') + || str_starts_with($scope->getNamespace(), 'Neos\ContentRepository\LegacyNodeMigration') + || str_starts_with($scope->getNamespace(), 'Neos\ContentRepository\StructureAdjustment') + ) + ) { + // todo this rule was intended to enforce the internal annotations from the Neos\ContentRepository\Core from all call sites. + // this is currently not achievable and thus we grant a few packages BUT NOT NEOS.NEOS free access. + // that is a good compromise between having this rule not enabled at all or cluttering everything with a baseline. return []; } if ($node instanceof Node\Expr\MethodCall) { $methodCallTargetClass = $scope->getType($node->var); if ($methodCallTargetClass instanceof ObjectType) { $targetClassName = $methodCallTargetClass->getClassName(); - // TODO: also extend to more packages if ( !str_starts_with($targetClassName, 'Neos\ContentRepository\Core') ) { + // currently only access to methods on the cr core is protected. return []; } diff --git a/Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryId.php b/Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryId.php index 3fc383c9812..1647044092c 100644 --- a/Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryId.php +++ b/Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryId.php @@ -19,7 +19,7 @@ * * @api */ -final class ContentRepositoryId +final class ContentRepositoryId implements \JsonSerializable { private function __construct( public readonly string $value @@ -47,4 +47,9 @@ public function equals(self $other): bool { return $this->value === $other->value; } + + public function jsonSerialize(): mixed + { + return $this->value; + } } diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeModification/Dto/SerializedPropertyValues.php b/Neos.ContentRepository.Core/Classes/Feature/NodeModification/Dto/SerializedPropertyValues.php index 936e941d925..b828cab9da9 100644 --- a/Neos.ContentRepository.Core/Classes/Feature/NodeModification/Dto/SerializedPropertyValues.php +++ b/Neos.ContentRepository.Core/Classes/Feature/NodeModification/Dto/SerializedPropertyValues.php @@ -129,9 +129,6 @@ public function splitByScope(NodeType $nodeType): array ); } - /** - * @phpstan-assert-if-true !null $this->getProperty() - */ public function propertyExists(string $propertyName): bool { return isset($this->values[$propertyName]); diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentGraphWithRuntimeCaches/ContentSubgraphWithRuntimeCaches.php b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentGraphWithRuntimeCaches/ContentSubgraphWithRuntimeCaches.php index 496e55db2b6..c2d49149a30 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentGraphWithRuntimeCaches/ContentSubgraphWithRuntimeCaches.php +++ b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentGraphWithRuntimeCaches/ContentSubgraphWithRuntimeCaches.php @@ -247,7 +247,7 @@ private static function isFilterEmpty(object $filter): bool return array_filter(get_object_vars($filter), static fn ($value) => $value !== null) === []; } - public function jsonSerialize(): mixed + public function jsonSerialize(): ContentSubgraphIdentity { return $this->wrappedContentSubgraph->jsonSerialize(); } diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentSubgraphIdentity.php b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentSubgraphIdentity.php index 3bc447f0e11..821b52b1fde 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentSubgraphIdentity.php +++ b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentSubgraphIdentity.php @@ -33,7 +33,7 @@ * * @api */ -final class ContentSubgraphIdentity +final class ContentSubgraphIdentity implements \JsonSerializable { private function __construct( public readonly ContentRepositoryId $contentRepositoryId, @@ -90,4 +90,17 @@ public function withVisibilityConstraints(VisibilityConstraints $visibilityConst $visibilityConstraints ); } + + /** + * @return array + */ + public function jsonSerialize(): array + { + return [ + 'contentRepositoryId' => $this->contentRepositoryId, + 'contentStreamId' => $this->contentStreamId, + 'dimensionSpacePoint' => $this->dimensionSpacePoint, + 'visibilityConstraints' => $this->visibilityConstraints + ]; + } } diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentSubgraphInterface.php b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentSubgraphInterface.php index e3f5fe29b85..e1acfb67fc2 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentSubgraphInterface.php +++ b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/ContentSubgraphInterface.php @@ -204,4 +204,6 @@ public function retrieveNodePath(NodeAggregateId $nodeAggregateId): AbsoluteNode * @internal this method might change without further notice. */ public function countNodes(): int; + + public function jsonSerialize(): ContentSubgraphIdentity; } diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Node.php b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Node.php index 55f6e39a563..4bb69d0c16e 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Node.php +++ b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Node.php @@ -60,6 +60,9 @@ private function __construct( public ?NodeName $nodeName, public Timestamps $timestamps, ) { + if ($this->classification->isTethered() && $this->nodeName === null) { + throw new \InvalidArgumentException('The NodeName must be set if the Node is tethered.', 1695118377); + } } /** diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/VisibilityConstraints.php b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/VisibilityConstraints.php index e8404c11b21..8a2ab3168bc 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/VisibilityConstraints.php +++ b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/VisibilityConstraints.php @@ -21,7 +21,7 @@ * * @api */ -final class VisibilityConstraints +final class VisibilityConstraints implements \JsonSerializable { protected bool $disabledContentShown = false; @@ -49,4 +49,9 @@ public static function frontend(): VisibilityConstraints { return new VisibilityConstraints(false); } + + public function jsonSerialize(): string + { + return $this->getHash(); + } } diff --git a/Neos.ContentRepository.LegacyNodeMigration/Classes/NodeDataToEventsProcessor.php b/Neos.ContentRepository.LegacyNodeMigration/Classes/NodeDataToEventsProcessor.php index 4ea8a74d16f..7ec510fe35c 100644 --- a/Neos.ContentRepository.LegacyNodeMigration/Classes/NodeDataToEventsProcessor.php +++ b/Neos.ContentRepository.LegacyNodeMigration/Classes/NodeDataToEventsProcessor.php @@ -175,7 +175,7 @@ private function exportEvent(EventInterface $event): void ); assert($this->eventFileResource !== null); fwrite($this->eventFileResource, $exportedEvent->toJson() . chr(10)); - $this->numberOfExportedEvents ++; + $this->numberOfExportedEvents++; } /** @@ -287,7 +287,7 @@ public function processNodeDataWithoutFallbackToEmptyDimension(NodeAggregateId $ $this->exportEvent(new NodeAggregateWithNodeWasCreated($this->contentStreamId, $nodeAggregateId, $nodeTypeName, $originDimensionSpacePoint, $this->interDimensionalVariationGraph->getSpecializationSet($originDimensionSpacePoint->toDimensionSpacePoint()), $parentNodeAggregate->nodeAggregateId, $nodeName, $serializedPropertyValuesAndReferences->serializedPropertyValues, NodeAggregateClassification::CLASSIFICATION_REGULAR, null)); } // nodes are hidden via NodeAggregateWasDisabled event - if ($nodeDataRow['hidden']) { + if ($this->isNodeHidden($nodeDataRow)) { $this->exportEvent(new NodeAggregateWasDisabled($this->contentStreamId, $nodeAggregateId, $this->interDimensionalVariationGraph->getSpecializationSet($originDimensionSpacePoint->toDimensionSpacePoint(), true, $this->visitedNodes->alreadyVisitedOriginDimensionSpacePoints($nodeAggregateId)->toDimensionSpacePointSet()))); } foreach ($serializedPropertyValuesAndReferences->references as $referencePropertyName => $destinationNodeAggregateIds) { @@ -353,6 +353,21 @@ public function extractPropertyValuesAndReferences(array $nodeDataRow, NodeType $properties['_hiddenInIndex'] = true; } + if ($nodeType->isOfType(NodeTypeName::fromString('Neos.TimeableNodeVisibility:Timeable'))) { + // hiddenbeforedatetime is stored as separate column in the nodedata table, but we need it as property + if ($nodeDataRow['hiddenbeforedatetime']) { + $properties['enableAfterDateTime'] = $nodeDataRow['hiddenbeforedatetime']; + } + // hiddenafterdatetime is stored as separate column in the nodedata table, but we need it as property + if ($nodeDataRow['hiddenafterdatetime']) { + $properties['disableAfterDateTime'] = $nodeDataRow['hiddenafterdatetime']; + } + } else { + if ($nodeDataRow['hiddenbeforedatetime'] || $nodeDataRow['hiddenafterdatetime']) { + $this->dispatch(Severity::WARNING, 'Skipped the migration of your "hiddenBeforeDateTime" and "hiddenAfterDateTime" properties as your target NodeTypes do not inherit "Neos.TimeableNodeVisibility:Timeable". Please install neos/timeable-node-visibility, if you want to migrate them.'); + } + } + return new SerializedPropertyValuesAndReferences($this->propertyConverter->serializePropertyValues(PropertyValuesToWrite::fromArray($properties), $nodeType), $references); } @@ -444,4 +459,47 @@ private function dispatch(Severity $severity, string $message, mixed ...$args): $callback($severity, $renderedMessage); } } + + /** + * Determines actual hidden state based on "hidden", "hiddenafterdatetime" and "hiddenbeforedatetime" + * + * @param array $nodeDataRow + */ + private function isNodeHidden(array $nodeDataRow): bool + { + // Already hidden + if ($nodeDataRow['hidden']) { + return true; + } + + $now = new \DateTimeImmutable(); + $hiddenAfterDateTime = $nodeDataRow['hiddenafterdatetime'] ? new \DateTimeImmutable($nodeDataRow['hiddenafterdatetime']) : null; + $hiddenBeforeDateTime = $nodeDataRow['hiddenbeforedatetime'] ? new \DateTimeImmutable($nodeDataRow['hiddenbeforedatetime']) : null; + + // Hidden after a date time, without getting already re-enabled by hidden before date time - afterward + if ($hiddenAfterDateTime != null + && $hiddenAfterDateTime < $now + && ( + $hiddenBeforeDateTime == null + || $hiddenBeforeDateTime > $now + || $hiddenBeforeDateTime<= $hiddenAfterDateTime + ) + ) { + return true; + } + + // Hidden before a date time, without getting enabled by hidden after date time - before + if ($hiddenBeforeDateTime != null + && $hiddenBeforeDateTime > $now + && ( + $hiddenAfterDateTime == null + || $hiddenAfterDateTime > $hiddenBeforeDateTime + ) + ) { + return true; + } + + return false; + + } } diff --git a/Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/Bootstrap/FeatureContext.php b/Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/Bootstrap/FeatureContext.php index ac0db3ac9dc..10a3e75a2ac 100644 --- a/Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/Bootstrap/FeatureContext.php +++ b/Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/Bootstrap/FeatureContext.php @@ -108,6 +108,8 @@ public function iHaveTheFollowingNodeDataRows(TableNode $nodeDataRows): void 'properties' => !empty($row['Properties']) ? $row['Properties'] : '{}', 'dimensionvalues' => !empty($row['Dimension Values']) ? $row['Dimension Values'] : '{}', 'hiddeninindex' => $row['Hidden in index'] ?? '0', + 'hiddenbeforedatetime' => !empty($row['Hidden before DateTime']) ? ($row['Hidden before DateTime']): null, + 'hiddenafterdatetime' => !empty($row['Hidden after DateTime']) ? ($row['Hidden after DateTime']) : null, 'hidden' => $row['Hidden'] ?? '0', ]; }, $nodeDataRows->getHash()); diff --git a/Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/Features/Hidden.feature b/Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/Features/Hidden.feature new file mode 100644 index 00000000000..ef6572be925 --- /dev/null +++ b/Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/Features/Hidden.feature @@ -0,0 +1,166 @@ +@contentrepository +Feature: Simple migrations without content dimensions for hidden state migration + + Background: + Given using no content dimensions + And using the following node types: + """yaml + 'Neos.Neos:Site': {} + 'Neos.TimeableNodeVisibility:Timeable': + properties: + 'disableAfterDateTime': + type: DateTime + 'enableAfterDateTime': + type: DateTime + 'Some.Package:Homepage': + superTypes: + 'Neos.Neos:Site': true + 'Neos.TimeableNodeVisibility:Timeable': true + properties: + 'text': + type: string + defaultValue: 'My default text' + + """ + And using identifier "default", I define a content repository + And I am in content repository "default" + + Scenario: A node with a "hidden" property true must get disabled + When I have the following node data rows: + | Identifier | Path | Node Type | Properties | Hidden | Hidden after DateTime | Hidden before DateTime | + | sites-node-id | /sites | unstructured | | 0 | | | + | site-node-id | /sites/test-site | Some.Package:Homepage | {"text": "foo"} | 1 | | | + And I run the event migration for content stream "cs-id" + Then I expect the following events to be exported + | Type | Payload | + | RootNodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "sites-node-id", "nodeTypeName": "Neos.Neos:Sites", "nodeAggregateClassification": "root"} | + | NodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id", "nodeTypeName": "Some.Package:Homepage", "nodeName": "test-site", "parentNodeAggregateId": "sites-node-id", "nodeAggregateClassification": "regular", "initialPropertyValues": {"text": {"type": "string", "value": "foo"}}} | + | NodeAggregateWasDisabled | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id"} | + + Scenario: A node with a "hidden" property false must not get disabled + When I have the following node data rows: + | Identifier | Path | Node Type | Properties | Hidden | Hidden after DateTime | Hidden before DateTime | + | sites-node-id | /sites | unstructured | | 0 | | | + | site-node-id | /sites/test-site | Some.Package:Homepage | {"text": "foo"} | 0 | | | + And I run the event migration for content stream "cs-id" + Then I expect the following events to be exported + | Type | Payload | + | RootNodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "sites-node-id", "nodeTypeName": "Neos.Neos:Sites", "nodeAggregateClassification": "root"} | + | NodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id", "nodeTypeName": "Some.Package:Homepage", "nodeName": "test-site", "parentNodeAggregateId": "sites-node-id", "nodeAggregateClassification": "regular", "initialPropertyValues": {"text": {"type": "string", "value": "foo"}}} | + + Scenario: A node with active "hidden after" property, after a "hidden before" property must get disabled + When I have the following node data rows: + | Identifier | Path | Node Type | Properties | Hidden | Hidden after DateTime | Hidden before DateTime | + | sites-node-id | /sites | unstructured | | 0 | | | + | site-node-id | /sites/test-site | Some.Package:Homepage | {"text": "foo"} | 0 | 1990-01-01 10:10:10 | 1989-01-01 10:10:10 | + And I run the event migration for content stream "cs-id" + Then I expect the following events to be exported + | Type | Payload | + | RootNodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "sites-node-id", "nodeTypeName": "Neos.Neos:Sites", "nodeAggregateClassification": "root"} | + | NodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id", "nodeTypeName": "Some.Package:Homepage", "nodeName": "test-site", "parentNodeAggregateId": "sites-node-id", "nodeAggregateClassification": "regular", "initialPropertyValues": {"text": {"type": "string", "value": "foo"}, "disableAfterDateTime": {"type": "DateTimeImmutable", "value": "1990-01-01 10:10:10"}, "enableAfterDateTime": {"type": "DateTimeImmutable", "value": "1989-01-01 10:10:10"}}} | + | NodeAggregateWasDisabled | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id"} | + + Scenario: A node with active "hidden before" property, after a "hidden after" property must not get disabled + When I have the following node data rows: + | Identifier | Path | Node Type | Properties | Hidden | Hidden after DateTime | Hidden before DateTime | + | sites-node-id | /sites | unstructured | | 0 | | | + | site-node-id | /sites/test-site | Some.Package:Homepage | {"text": "foo"} | 0 | 1989-01-01 10:10:10 | 1990-01-01 10:10:10 | + And I run the event migration for content stream "cs-id" + Then I expect the following events to be exported + | Type | Payload | + | RootNodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "sites-node-id", "nodeTypeName": "Neos.Neos:Sites", "nodeAggregateClassification": "root"} | + | NodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id", "nodeTypeName": "Some.Package:Homepage", "nodeName": "test-site", "parentNodeAggregateId": "sites-node-id", "nodeAggregateClassification": "regular", "initialPropertyValues": {"text": {"type": "string", "value": "foo"}, "disableAfterDateTime": {"type": "DateTimeImmutable", "value": "1989-01-01 10:10:10"}, "enableAfterDateTime": {"type": "DateTimeImmutable", "value": "1990-01-01 10:10:10"}}} | + + + Scenario: A node with a active "hidden before" property and a "hidden after" property in future must not get disabled + When I have the following node data rows: + | Identifier | Path | Node Type | Properties | Hidden | Hidden after DateTime | Hidden before DateTime | + | sites-node-id | /sites | unstructured | | 0 | | | + | site-node-id | /sites/test-site | Some.Package:Homepage | {"text": "foo"} | 0 | 2099-01-01 10:10:10 | 1990-01-01 10:10:10 | + And I run the event migration for content stream "cs-id" + Then I expect the following events to be exported + | Type | Payload | + | RootNodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "sites-node-id", "nodeTypeName": "Neos.Neos:Sites", "nodeAggregateClassification": "root"} | + | NodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id", "nodeTypeName": "Some.Package:Homepage", "nodeName": "test-site", "parentNodeAggregateId": "sites-node-id", "nodeAggregateClassification": "regular", "initialPropertyValues": {"text": {"type": "string", "value": "foo"}, "disableAfterDateTime": {"type": "DateTimeImmutable", "value": "2099-01-01 10:10:10"}, "enableAfterDateTime": {"type": "DateTimeImmutable", "value": "1990-01-01 10:10:10"}}} | + + Scenario: A node with a active "hidden after" property and a "hidden before" property in future must get disabled + When I have the following node data rows: + | Identifier | Path | Node Type | Properties | Hidden | Hidden after DateTime | Hidden before DateTime | + | sites-node-id | /sites | unstructured | | 0 | | | + | site-node-id | /sites/test-site | Some.Package:Homepage | {"text": "foo"} | 0 | 1990-01-01 10:10:10 | 2099-01-01 10:10:10 | + And I run the event migration for content stream "cs-id" + Then I expect the following events to be exported + | Type | Payload | + | RootNodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "sites-node-id", "nodeTypeName": "Neos.Neos:Sites", "nodeAggregateClassification": "root"} | + | NodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id", "nodeTypeName": "Some.Package:Homepage", "nodeName": "test-site", "parentNodeAggregateId": "sites-node-id", "nodeAggregateClassification": "regular", "initialPropertyValues": {"text": {"type": "string", "value": "foo"}, "disableAfterDateTime": {"type": "DateTimeImmutable", "value": "1990-01-01 10:10:10"}, "enableAfterDateTime": {"type": "DateTimeImmutable", "value": "2099-01-01 10:10:10"}}} | + | NodeAggregateWasDisabled | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id"} | + + Scenario: A node with a "hidden after" property in future and a "hidden before" property later in future must not get disabled + When I have the following node data rows: + | Identifier | Path | Node Type | Properties | Hidden | Hidden after DateTime | Hidden before DateTime | + | sites-node-id | /sites | unstructured | | 0 | | | + | site-node-id | /sites/test-site | Some.Package:Homepage | {"text": "foo"} | 0 | 2098-01-01 10:10:10 | 2099-01-01 10:10:10 | + And I run the event migration for content stream "cs-id" + Then I expect the following events to be exported + | Type | Payload | + | RootNodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "sites-node-id", "nodeTypeName": "Neos.Neos:Sites", "nodeAggregateClassification": "root"} | + | NodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id", "nodeTypeName": "Some.Package:Homepage", "nodeName": "test-site", "parentNodeAggregateId": "sites-node-id", "nodeAggregateClassification": "regular", "initialPropertyValues": {"text": {"type": "string", "value": "foo"}, "disableAfterDateTime": {"type": "DateTimeImmutable", "value": "2098-01-01 10:10:10"}, "enableAfterDateTime": {"type": "DateTimeImmutable", "value": "2099-01-01 10:10:10"}}} | + + Scenario: A node with a "hidden before" property in future and a "hidden after" property later in future must get disabled + When I have the following node data rows: + | Identifier | Path | Node Type | Properties | Hidden | Hidden after DateTime | Hidden before DateTime | + | sites-node-id | /sites | unstructured | | 0 | | | + | site-node-id | /sites/test-site | Some.Package:Homepage | {"text": "foo"} | 0 | 2099-01-01 10:10:10 | 2098-01-01 10:10:10 | + And I run the event migration for content stream "cs-id" + Then I expect the following events to be exported + | Type | Payload | + | RootNodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "sites-node-id", "nodeTypeName": "Neos.Neos:Sites", "nodeAggregateClassification": "root"} | + | NodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id", "nodeTypeName": "Some.Package:Homepage", "nodeName": "test-site", "parentNodeAggregateId": "sites-node-id", "nodeAggregateClassification": "regular", "initialPropertyValues": {"text": {"type": "string", "value": "foo"}, "disableAfterDateTime": {"type": "DateTimeImmutable", "value": "2099-01-01 10:10:10"}, "enableAfterDateTime": {"type": "DateTimeImmutable", "value": "2098-01-01 10:10:10"}}} | + | NodeAggregateWasDisabled | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id"} | + + Scenario: A node with a active "hidden before" property must not get disabled + When I have the following node data rows: + | Identifier | Path | Node Type | Properties | Hidden | Hidden after DateTime | Hidden before DateTime | + | sites-node-id | /sites | unstructured | | 0 | | | + | site-node-id | /sites/test-site | Some.Package:Homepage | {"text": "foo"} | 0 | | 1990-01-01 10:10:10 | + And I run the event migration for content stream "cs-id" + Then I expect the following events to be exported + | Type | Payload | + | RootNodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "sites-node-id", "nodeTypeName": "Neos.Neos:Sites", "nodeAggregateClassification": "root"} | + | NodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id", "nodeTypeName": "Some.Package:Homepage", "nodeName": "test-site", "parentNodeAggregateId": "sites-node-id", "nodeAggregateClassification": "regular", "initialPropertyValues": {"text": {"type": "string", "value": "foo"}, "enableAfterDateTime": {"type": "DateTimeImmutable", "value": "1990-01-01 10:10:10"}}} | + + Scenario: A node with a active "hidden after" property must get disabled + When I have the following node data rows: + | Identifier | Path | Node Type | Properties | Hidden | Hidden after DateTime | Hidden before DateTime | + | sites-node-id | /sites | unstructured | | 0 | | | + | site-node-id | /sites/test-site | Some.Package:Homepage | {"text": "foo"} | 0 | 1990-01-01 10:10:10 | | + And I run the event migration for content stream "cs-id" + Then I expect the following events to be exported + | Type | Payload | + | RootNodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "sites-node-id", "nodeTypeName": "Neos.Neos:Sites", "nodeAggregateClassification": "root"} | + | NodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id", "nodeTypeName": "Some.Package:Homepage", "nodeName": "test-site", "parentNodeAggregateId": "sites-node-id", "nodeAggregateClassification": "regular", "initialPropertyValues": {"text": {"type": "string", "value": "foo"}, "disableAfterDateTime": {"type": "DateTimeImmutable", "value": "1990-01-01 10:10:10"}}} | + | NodeAggregateWasDisabled | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id"} | + + Scenario: A node with a "hidden after" property in future must not get disabled + When I have the following node data rows: + | Identifier | Path | Node Type | Properties | Hidden | Hidden after DateTime | Hidden before DateTime | + | sites-node-id | /sites | unstructured | | 0 | | | + | site-node-id | /sites/test-site | Some.Package:Homepage | {"text": "foo"} | 0 | 2099-01-01 10:10:10 | | + And I run the event migration for content stream "cs-id" + Then I expect the following events to be exported + | Type | Payload | + | RootNodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "sites-node-id", "nodeTypeName": "Neos.Neos:Sites", "nodeAggregateClassification": "root"} | + | NodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id", "nodeTypeName": "Some.Package:Homepage", "nodeName": "test-site", "parentNodeAggregateId": "sites-node-id", "nodeAggregateClassification": "regular", "initialPropertyValues": {"text": {"type": "string", "value": "foo"}, "disableAfterDateTime": {"type": "DateTimeImmutable", "value": "2099-01-01 10:10:10"}}} | + + Scenario: A node with a "hidden before" property in future must get disabled + When I have the following node data rows: + | Identifier | Path | Node Type | Properties | Hidden | Hidden after DateTime | Hidden before DateTime | + | sites-node-id | /sites | unstructured | | 0 | | | + | site-node-id | /sites/test-site | Some.Package:Homepage | {"text": "foo"} | 0 | | 2099-01-01 10:10:10 | + And I run the event migration for content stream "cs-id" + Then I expect the following events to be exported + | Type | Payload | + | RootNodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "sites-node-id", "nodeTypeName": "Neos.Neos:Sites", "nodeAggregateClassification": "root"} | + | NodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id", "nodeTypeName": "Some.Package:Homepage", "nodeName": "test-site", "parentNodeAggregateId": "sites-node-id", "nodeAggregateClassification": "regular", "initialPropertyValues": {"text": {"type": "string", "value": "foo"}, "enableAfterDateTime": {"type": "DateTimeImmutable", "value": "2099-01-01 10:10:10"}}} | + | NodeAggregateWasDisabled | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id"} | + diff --git a/Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/Features/HiddenWithoutTimeableNodeVisibility.feature b/Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/Features/HiddenWithoutTimeableNodeVisibility.feature new file mode 100644 index 00000000000..a619755f726 --- /dev/null +++ b/Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/Features/HiddenWithoutTimeableNodeVisibility.feature @@ -0,0 +1,177 @@ +@contentrepository +Feature: Simple migrations without content dimensions for hidden state migration without installed Neos.TimeableNodeVisibility + + Background: + Given using no content dimensions + And using the following node types: + """yaml + 'Neos.Neos:Site': {} + 'Some.Package:Homepage': + superTypes: + 'Neos.Neos:Site': true + properties: + 'text': + type: string + defaultValue: 'My default text' + + """ + And using identifier "default", I define a content repository + And I am in content repository "default" + + Scenario: A node with a "hidden" property true must get disabled + When I have the following node data rows: + | Identifier | Path | Node Type | Properties | Hidden | Hidden after DateTime | Hidden before DateTime | + | sites-node-id | /sites | unstructured | | 0 | | | + | site-node-id | /sites/test-site | Some.Package:Homepage | {"text": "foo"} | 1 | | | + And I run the event migration for content stream "cs-id" + Then I expect the following events to be exported + | Type | Payload | + | RootNodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "sites-node-id", "nodeTypeName": "Neos.Neos:Sites", "nodeAggregateClassification": "root"} | + | NodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id", "nodeTypeName": "Some.Package:Homepage", "nodeName": "test-site", "parentNodeAggregateId": "sites-node-id", "nodeAggregateClassification": "regular", "initialPropertyValues": {"text": {"type": "string", "value": "foo"}}} | + | NodeAggregateWasDisabled | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id"} | + + Scenario: A node with a "hidden" property false must not get disabled + When I have the following node data rows: + | Identifier | Path | Node Type | Properties | Hidden | Hidden after DateTime | Hidden before DateTime | + | sites-node-id | /sites | unstructured | | 0 | | | + | site-node-id | /sites/test-site | Some.Package:Homepage | {"text": "foo"} | 0 | | | + And I run the event migration for content stream "cs-id" + Then I expect the following events to be exported + | Type | Payload | + | RootNodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "sites-node-id", "nodeTypeName": "Neos.Neos:Sites", "nodeAggregateClassification": "root"} | + | NodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id", "nodeTypeName": "Some.Package:Homepage", "nodeName": "test-site", "parentNodeAggregateId": "sites-node-id", "nodeAggregateClassification": "regular", "initialPropertyValues": {"text": {"type": "string", "value": "foo"}}} | + + Scenario: A node with active "hidden after" property, after a "hidden before" property must get disabled + When I have the following node data rows: + | Identifier | Path | Node Type | Properties | Hidden | Hidden after DateTime | Hidden before DateTime | + | sites-node-id | /sites | unstructured | | 0 | | | + | site-node-id | /sites/test-site | Some.Package:Homepage | {"text": "foo"} | 0 | 1990-01-01 10:10:10 | 1989-01-01 10:10:10 | + And I run the event migration for content stream "cs-id" + Then I expect the following events to be exported + | Type | Payload | + | RootNodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "sites-node-id", "nodeTypeName": "Neos.Neos:Sites", "nodeAggregateClassification": "root"} | + | NodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id", "nodeTypeName": "Some.Package:Homepage", "nodeName": "test-site", "parentNodeAggregateId": "sites-node-id", "nodeAggregateClassification": "regular", "initialPropertyValues": {"text": {"type": "string", "value": "foo"}}} | + | NodeAggregateWasDisabled | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id"} | + And I expect the following warnings to be logged + | Skipped the migration of your "hiddenBeforeDateTime" and "hiddenAfterDateTime" properties as your target NodeTypes do not inherit "Neos.TimeableNodeVisibility:Timeable". Please install neos/timeable-node-visibility, if you want to migrate them. | + + Scenario: A node with active "hidden before" property, after a "hidden after" property must not get disabled + When I have the following node data rows: + | Identifier | Path | Node Type | Properties | Hidden | Hidden after DateTime | Hidden before DateTime | + | sites-node-id | /sites | unstructured | | 0 | | | + | site-node-id | /sites/test-site | Some.Package:Homepage | {"text": "foo"} | 0 | 1989-01-01 10:10:10 | 1990-01-01 10:10:10 | + And I run the event migration for content stream "cs-id" + Then I expect the following events to be exported + | Type | Payload | + | RootNodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "sites-node-id", "nodeTypeName": "Neos.Neos:Sites", "nodeAggregateClassification": "root"} | + | NodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id", "nodeTypeName": "Some.Package:Homepage", "nodeName": "test-site", "parentNodeAggregateId": "sites-node-id", "nodeAggregateClassification": "regular", "initialPropertyValues": {"text": {"type": "string", "value": "foo"}}} | + And I expect the following warnings to be logged + | Skipped the migration of your "hiddenBeforeDateTime" and "hiddenAfterDateTime" properties as your target NodeTypes do not inherit "Neos.TimeableNodeVisibility:Timeable". Please install neos/timeable-node-visibility, if you want to migrate them. | + + Scenario: A node with a active "hidden before" property and a "hidden after" property in future must not get disabled + When I have the following node data rows: + | Identifier | Path | Node Type | Properties | Hidden | Hidden after DateTime | Hidden before DateTime | + | sites-node-id | /sites | unstructured | | 0 | | | + | site-node-id | /sites/test-site | Some.Package:Homepage | {"text": "foo"} | 0 | 2099-01-01 10:10:10 | 1990-01-01 10:10:10 | + And I run the event migration for content stream "cs-id" + Then I expect the following events to be exported + | Type | Payload | + | RootNodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "sites-node-id", "nodeTypeName": "Neos.Neos:Sites", "nodeAggregateClassification": "root"} | + | NodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id", "nodeTypeName": "Some.Package:Homepage", "nodeName": "test-site", "parentNodeAggregateId": "sites-node-id", "nodeAggregateClassification": "regular", "initialPropertyValues": {"text": {"type": "string", "value": "foo"}}} | + And I expect the following warnings to be logged + | Skipped the migration of your "hiddenBeforeDateTime" and "hiddenAfterDateTime" properties as your target NodeTypes do not inherit "Neos.TimeableNodeVisibility:Timeable". Please install neos/timeable-node-visibility, if you want to migrate them. | + + Scenario: A node with a active "hidden after" property and a "hidden before" property in future must get disabled + When I have the following node data rows: + | Identifier | Path | Node Type | Properties | Hidden | Hidden after DateTime | Hidden before DateTime | + | sites-node-id | /sites | unstructured | | 0 | | | + | site-node-id | /sites/test-site | Some.Package:Homepage | {"text": "foo"} | 0 | 1990-01-01 10:10:10 | 2099-01-01 10:10:10 | + And I run the event migration for content stream "cs-id" + Then I expect the following events to be exported + | Type | Payload | + | RootNodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "sites-node-id", "nodeTypeName": "Neos.Neos:Sites", "nodeAggregateClassification": "root"} | + | NodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id", "nodeTypeName": "Some.Package:Homepage", "nodeName": "test-site", "parentNodeAggregateId": "sites-node-id", "nodeAggregateClassification": "regular", "initialPropertyValues": {"text": {"type": "string", "value": "foo"}}} | + | NodeAggregateWasDisabled | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id"} | + And I expect the following warnings to be logged + | Skipped the migration of your "hiddenBeforeDateTime" and "hiddenAfterDateTime" properties as your target NodeTypes do not inherit "Neos.TimeableNodeVisibility:Timeable". Please install neos/timeable-node-visibility, if you want to migrate them. | + + Scenario: A node with a "hidden after" property in future and a "hidden before" property later in future must not get disabled + When I have the following node data rows: + | Identifier | Path | Node Type | Properties | Hidden | Hidden after DateTime | Hidden before DateTime | + | sites-node-id | /sites | unstructured | | 0 | | | + | site-node-id | /sites/test-site | Some.Package:Homepage | {"text": "foo"} | 0 | 2098-01-01 10:10:10 | 2099-01-01 10:10:10 | + And I run the event migration for content stream "cs-id" + Then I expect the following events to be exported + | Type | Payload | + | RootNodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "sites-node-id", "nodeTypeName": "Neos.Neos:Sites", "nodeAggregateClassification": "root"} | + | NodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id", "nodeTypeName": "Some.Package:Homepage", "nodeName": "test-site", "parentNodeAggregateId": "sites-node-id", "nodeAggregateClassification": "regular", "initialPropertyValues": {"text": {"type": "string", "value": "foo"}}} | + And I expect the following warnings to be logged + | Skipped the migration of your "hiddenBeforeDateTime" and "hiddenAfterDateTime" properties as your target NodeTypes do not inherit "Neos.TimeableNodeVisibility:Timeable". Please install neos/timeable-node-visibility, if you want to migrate them. | + + Scenario: A node with a "hidden before" property in future and a "hidden after" property later in future must get disabled + When I have the following node data rows: + | Identifier | Path | Node Type | Properties | Hidden | Hidden after DateTime | Hidden before DateTime | + | sites-node-id | /sites | unstructured | | 0 | | | + | site-node-id | /sites/test-site | Some.Package:Homepage | {"text": "foo"} | 0 | 2099-01-01 10:10:10 | 2098-01-01 10:10:10 | + And I run the event migration for content stream "cs-id" + Then I expect the following events to be exported + | Type | Payload | + | RootNodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "sites-node-id", "nodeTypeName": "Neos.Neos:Sites", "nodeAggregateClassification": "root"} | + | NodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id", "nodeTypeName": "Some.Package:Homepage", "nodeName": "test-site", "parentNodeAggregateId": "sites-node-id", "nodeAggregateClassification": "regular", "initialPropertyValues": {"text": {"type": "string", "value": "foo"}}} | + | NodeAggregateWasDisabled | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id"} | + And I expect the following warnings to be logged + | Skipped the migration of your "hiddenBeforeDateTime" and "hiddenAfterDateTime" properties as your target NodeTypes do not inherit "Neos.TimeableNodeVisibility:Timeable". Please install neos/timeable-node-visibility, if you want to migrate them. | + + Scenario: A node with a active "hidden before" property must not get disabled + When I have the following node data rows: + | Identifier | Path | Node Type | Properties | Hidden | Hidden after DateTime | Hidden before DateTime | + | sites-node-id | /sites | unstructured | | 0 | | | + | site-node-id | /sites/test-site | Some.Package:Homepage | {"text": "foo"} | 0 | | 1990-01-01 10:10:10 | + And I run the event migration for content stream "cs-id" + Then I expect the following events to be exported + | Type | Payload | + | RootNodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "sites-node-id", "nodeTypeName": "Neos.Neos:Sites", "nodeAggregateClassification": "root"} | + | NodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id", "nodeTypeName": "Some.Package:Homepage", "nodeName": "test-site", "parentNodeAggregateId": "sites-node-id", "nodeAggregateClassification": "regular", "initialPropertyValues": {"text": {"type": "string", "value": "foo"}}} | + And I expect the following warnings to be logged + | Skipped the migration of your "hiddenBeforeDateTime" and "hiddenAfterDateTime" properties as your target NodeTypes do not inherit "Neos.TimeableNodeVisibility:Timeable". Please install neos/timeable-node-visibility, if you want to migrate them. | + + Scenario: A node with a active "hidden after" property must get disabled + When I have the following node data rows: + | Identifier | Path | Node Type | Properties | Hidden | Hidden after DateTime | Hidden before DateTime | + | sites-node-id | /sites | unstructured | | 0 | | | + | site-node-id | /sites/test-site | Some.Package:Homepage | {"text": "foo"} | 0 | 1990-01-01 10:10:10 | | + And I run the event migration for content stream "cs-id" + Then I expect the following events to be exported + | Type | Payload | + | RootNodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "sites-node-id", "nodeTypeName": "Neos.Neos:Sites", "nodeAggregateClassification": "root"} | + | NodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id", "nodeTypeName": "Some.Package:Homepage", "nodeName": "test-site", "parentNodeAggregateId": "sites-node-id", "nodeAggregateClassification": "regular", "initialPropertyValues": {"text": {"type": "string", "value": "foo"}}} | + | NodeAggregateWasDisabled | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id"} | + And I expect the following warnings to be logged + | Skipped the migration of your "hiddenBeforeDateTime" and "hiddenAfterDateTime" properties as your target NodeTypes do not inherit "Neos.TimeableNodeVisibility:Timeable". Please install neos/timeable-node-visibility, if you want to migrate them. | + + Scenario: A node with a "hidden after" property in future must not get disabled + When I have the following node data rows: + | Identifier | Path | Node Type | Properties | Hidden | Hidden after DateTime | Hidden before DateTime | + | sites-node-id | /sites | unstructured | | 0 | | | + | site-node-id | /sites/test-site | Some.Package:Homepage | {"text": "foo"} | 0 | 2099-01-01 10:10:10 | | + And I run the event migration for content stream "cs-id" + Then I expect the following events to be exported + | Type | Payload | + | RootNodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "sites-node-id", "nodeTypeName": "Neos.Neos:Sites", "nodeAggregateClassification": "root"} | + | NodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id", "nodeTypeName": "Some.Package:Homepage", "nodeName": "test-site", "parentNodeAggregateId": "sites-node-id", "nodeAggregateClassification": "regular", "initialPropertyValues": {"text": {"type": "string", "value": "foo"}}} | + And I expect the following warnings to be logged + | Skipped the migration of your "hiddenBeforeDateTime" and "hiddenAfterDateTime" properties as your target NodeTypes do not inherit "Neos.TimeableNodeVisibility:Timeable". Please install neos/timeable-node-visibility, if you want to migrate them. | + + Scenario: A node with a "hidden before" property in future must get disabled + When I have the following node data rows: + | Identifier | Path | Node Type | Properties | Hidden | Hidden after DateTime | Hidden before DateTime | + | sites-node-id | /sites | unstructured | | 0 | | | + | site-node-id | /sites/test-site | Some.Package:Homepage | {"text": "foo"} | 0 | | 2099-01-01 10:10:10 | + And I run the event migration for content stream "cs-id" + Then I expect the following events to be exported + | Type | Payload | + | RootNodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "sites-node-id", "nodeTypeName": "Neos.Neos:Sites", "nodeAggregateClassification": "root"} | + | NodeAggregateWithNodeWasCreated | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id", "nodeTypeName": "Some.Package:Homepage", "nodeName": "test-site", "parentNodeAggregateId": "sites-node-id", "nodeAggregateClassification": "regular", "initialPropertyValues": {"text": {"type": "string", "value": "foo"}}} | + | NodeAggregateWasDisabled | {"contentStreamId": "cs-id", "nodeAggregateId": "site-node-id"} | + And I expect the following warnings to be logged + | Skipped the migration of your "hiddenBeforeDateTime" and "hiddenAfterDateTime" properties as your target NodeTypes do not inherit "Neos.TimeableNodeVisibility:Timeable". Please install neos/timeable-node-visibility, if you want to migrate them. | diff --git a/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/CacheLifetimeOperationTest.php b/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/CacheLifetimeOperationTest.php deleted file mode 100644 index c08b0e3258b..00000000000 --- a/Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/CacheLifetimeOperationTest.php +++ /dev/null @@ -1,163 +0,0 @@ -markTestSkipped('Needs to be re-enabled with ES CR'); - $this->operation = new CacheLifetimeOperation(); - $this->now = new \DateTime(); - $this->inject($this->operation, 'now', $this->now); - - $inOneDay = clone $this->now; - $inOneDay->add(new \DateInterval('P1D')); - $inTwoDays = clone $this->now; - $inTwoDays->add(new \DateInterval('P2D')); - $oneDayAgo = clone $this->now; - $oneDayAgo->sub(new \DateInterval('P1D')); - - $this->dateFixtures = [ - 'now' => $this->now, - '+1D' => $inOneDay, - '+2D' => $inTwoDays, - '-1D' => $oneDayAgo - ]; - } - - /** - * @test - */ - public function canEvaluateReturnsTrueIfNodeIsInContext() - { - $mockNode = $this->mockNode('node'); - - $result = $this->operation->canEvaluate([$mockNode]); - self::assertTrue($result); - } - - public function nodePropertiesAndLifetime() - { - return [ - 'Minimum in hiddenBeforeDateTime' => [ - [ - ['hiddenBeforeDateTime' => '+1D', 'hiddenAfterDateTime' => null], - ['hiddenBeforeDateTime' => null, 'hiddenAfterDateTime' => '+2D'] - ], - 86400 - ], - 'Minimum in hiddenAfterDateTime' => [ - [ - ['hiddenBeforeDateTime' => '+2D', 'hiddenAfterDateTime' => null], - ['hiddenBeforeDateTime' => null, 'hiddenAfterDateTime' => '+1D'] - ], - 86400 - ], - 'Past hiddenBeforeDateTime' => [ - [ - ['hiddenBeforeDateTime' => '-1D', 'hiddenAfterDateTime' => null] - ], - null - ], - 'Past hiddenBeforeDateTime and future hiddenBeforeDateTime' => [ - [ - ['hiddenBeforeDateTime' => '-1D', 'hiddenAfterDateTime' => null], - ['hiddenBeforeDateTime' => '+2D', 'hiddenAfterDateTime' => null] - ], - 2*86400 - ], - 'Hidden just now' => [ - [ - ['hiddenBeforeDateTime' => 'now', 'hiddenAfterDateTime' => null] - ], - null - ], - 'Hidden just now with hiddenAfterDateTime' => [ - [ - ['hiddenBeforeDateTime' => 'now', 'hiddenAfterDateTime' => null], - ['hiddenBeforeDateTime' => null, 'hiddenAfterDateTime' => '+1D'] - ], - 86400 - ], - 'No dates set' => [ - [ - ['hiddenBeforeDateTime' => null, 'hiddenAfterDateTime' => null], - ['hiddenBeforeDateTime' => null, 'hiddenAfterDateTime' => null] - ], - null - ], - 'Empty array of nodes' => [ - [], - null - ] - ]; - } - - /** - * @test - * @dataProvider nodePropertiesAndLifetime - */ - public function evaluateReturnsMinimumOfFutureHiddenDates($nodes, $expectedLifetime) - { - $mockFlowQuery = $this->buildFlowQueryWithNodesInContext($nodes); - $lifetime = $this->operation->evaluate($mockFlowQuery, []); - - if ($expectedLifetime === null) { - self::assertNull($lifetime); - } else { - self::assertEqualsWithDelta($expectedLifetime, $lifetime, 1, 'Lifetime did not match expected value +/- 1'); - } - } - - /** - * @param array $nodes Array of nodes with properties for the FlowQuery context - * @return FlowQuery - */ - protected function buildFlowQueryWithNodesInContext($nodes) - { - $contextValues = []; - foreach ($nodes as $nodeProperties) { - $mockNode = $this->createMock(Node::class); - $mockNode->expects(self::any())->method('getHiddenBeforeDateTime')->will(self::returnValue($nodeProperties['hiddenBeforeDateTime'] !== null ? $this->dateFixtures[$nodeProperties['hiddenBeforeDateTime']] : null)); - $mockNode->expects(self::any())->method('getHiddenAfterDateTime')->will(self::returnValue($nodeProperties['hiddenAfterDateTime'] !== null ? $this->dateFixtures[$nodeProperties['hiddenAfterDateTime']] : null)); - - $contextValues[] = $mockNode; - } - - $mockFlowQuery = $this->getMockBuilder(FlowQuery::class)->disableOriginalConstructor()->getMock(); - $mockFlowQuery->expects(self::any())->method('getContext')->will(self::returnValue($contextValues)); - return $mockFlowQuery; - } -} diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/StripTagsOnPropertyTransformationFactory.php b/Neos.ContentRepository.NodeMigration/src/Transformation/StripTagsOnPropertyTransformationFactory.php index 405fd46196f..71017229f81 100644 --- a/Neos.ContentRepository.NodeMigration/src/Transformation/StripTagsOnPropertyTransformationFactory.php +++ b/Neos.ContentRepository.NodeMigration/src/Transformation/StripTagsOnPropertyTransformationFactory.php @@ -56,6 +56,7 @@ public function execute( $properties = $node->properties->serialized(); if ($properties->propertyExists($this->propertyName)) { $serializedPropertyValue = $properties->getProperty($this->propertyName); + assert($serializedPropertyValue !== null); $propertyValue = $serializedPropertyValue->value; if (!is_string($propertyValue)) { throw new \Exception( diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/TransformationsFactory.php b/Neos.ContentRepository.NodeMigration/src/Transformation/TransformationsFactory.php index 66143d2ee4e..6b32a5a5eac 100644 --- a/Neos.ContentRepository.NodeMigration/src/Transformation/TransformationsFactory.php +++ b/Neos.ContentRepository.NodeMigration/src/Transformation/TransformationsFactory.php @@ -68,7 +68,6 @@ protected function buildTransformationObject( * Neos\ContentRepository\NodeMigration\Transformation namespace. * * @param string $transformationName - * @return string * @throws MigrationException */ protected function resolveTransformationFactory(string $transformationName): TransformationFactoryInterface diff --git a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/GenericCommandExecutionAndEventPublication.php b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/GenericCommandExecutionAndEventPublication.php index 32e5de9f0fd..df2a0c56aa1 100644 --- a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/GenericCommandExecutionAndEventPublication.php +++ b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/GenericCommandExecutionAndEventPublication.php @@ -15,6 +15,8 @@ namespace Neos\ContentRepository\TestSuite\Behavior\Features\Bootstrap; use Behat\Gherkin\Node\TableNode; +use Neos\ContentRepository\Core\EventStore\EventNormalizer; +use Neos\ContentRepository\Core\EventStore\EventPersister; use Neos\ContentRepository\Core\EventStore\Events; use Neos\ContentRepository\Core\EventStore\EventsToPublish; use Neos\ContentRepository\Core\Feature\NodeMove\Command\MoveNodeAggregate; @@ -136,8 +138,10 @@ protected function publishEvent(string $eventType, StreamName $streamName, array Event\EventData::fromString(json_encode($eventPayload)), Event\EventMetadata::fromArray([]) ); + /** @var EventPersister $eventPersister */ $eventPersister = (new \ReflectionClass($this->currentContentRepository))->getProperty('eventPersister') ->getValue($this->currentContentRepository); + /** @var EventNormalizer $eventPersister */ $eventNormalizer = (new \ReflectionClass($eventPersister))->getProperty('eventNormalizer') ->getValue($eventPersister); $event = $eventNormalizer->denormalize($artificiallyConstructedEvent); diff --git a/Neos.ContentRepository.TestSuite/Classes/Unit/NodeSubjectProvider.php b/Neos.ContentRepository.TestSuite/Classes/Unit/NodeSubjectProvider.php index 170db769f12..50cd2a57dc8 100644 --- a/Neos.ContentRepository.TestSuite/Classes/Unit/NodeSubjectProvider.php +++ b/Neos.ContentRepository.TestSuite/Classes/Unit/NodeSubjectProvider.php @@ -47,7 +47,10 @@ * The general provider class for node subjects. * Capable of creating all kinds of nodes to be used in unit tests. * - * @api + * @internal this WIP helper is purely experimental and only to be used internally + * behaviour or api may change at any time. + * Generally It's advised to prefer behat testing over unit tests for complex cases, + * like when interacting with the NodeType or the Subgraph or other parts of the CR. */ final class NodeSubjectProvider { diff --git a/Neos.Fusion/Classes/FusionObjects/AbstractArrayFusionObject.php b/Neos.Fusion/Classes/FusionObjects/AbstractArrayFusionObject.php index c857740a734..512980e2096 100644 --- a/Neos.Fusion/Classes/FusionObjects/AbstractArrayFusionObject.php +++ b/Neos.Fusion/Classes/FusionObjects/AbstractArrayFusionObject.php @@ -139,25 +139,6 @@ protected function evaluateNestedProperties(?string $defaultFusionPrototypeName return $result; } - /** - * Sort the Fusion objects inside $this->properties depending on: - * - numerical ordering - * - position meta-property - * - * This will ignore all properties defined in "@ignoreProperties" in Fusion - * - * @return array an ordered list of key value pairs - * @throws FusionException if the positional string has an unsupported format - * @see PositionalArraySorter - * - * @deprecated - * @see preparePropertyKeys() - */ - protected function sortNestedProperties(): array - { - return $this->preparePropertyKeys($this->properties, $this->ignoreProperties); - } - /** * @param array $properties * @param array $ignoredProperties diff --git a/Neos.Fusion/Classes/FusionObjects/DataStructureImplementation.php b/Neos.Fusion/Classes/FusionObjects/DataStructureImplementation.php index 7c07f7aef5b..bf8218a87cd 100644 --- a/Neos.Fusion/Classes/FusionObjects/DataStructureImplementation.php +++ b/Neos.Fusion/Classes/FusionObjects/DataStructureImplementation.php @@ -31,22 +31,4 @@ public function evaluate() { return $this->evaluateNestedProperties('Neos.Fusion:DataStructure'); } - - /** - * Sort the Fusion objects inside $this->properties depending on: - * - numerical ordering - * - position meta-property - * - * This will ignore all properties defined in "@ignoreProperties" in Fusion - * - * @return array an ordered list of key value pairs - * @throws FusionException if the positional string has an unsupported format - * @see PositionalArraySorter - * - * @deprecated since 8.0 can be removed with 9.0 use {@see \Neos\Fusion\FusionObjects\AbstractArrayFusionObject::preparePropertyKeys} - */ - protected function sortNestedFusionKeys() - { - return $this->preparePropertyKeys($this->properties, $this->ignoreProperties); - } } diff --git a/Neos.Neos/Classes/Controller/Frontend/NodeController.php b/Neos.Neos/Classes/Controller/Frontend/NodeController.php index 756a1dd642c..f5ae466fd07 100644 --- a/Neos.Neos/Classes/Controller/Frontend/NodeController.php +++ b/Neos.Neos/Classes/Controller/Frontend/NodeController.php @@ -47,9 +47,6 @@ use Neos\Neos\Utility\NodeTypeWithFallbackProvider; use Neos\Neos\View\FusionView; -/** - * Event Sourced Node Controller; as Replacement of NodeController - */ class NodeController extends ActionController { use NodeTypeWithFallbackProvider; @@ -110,7 +107,7 @@ class NodeController extends ActionController protected int $shortcutRedirectHttpStatusCode; /** - * @param string $node Legacy name for backwards compatibility of route components + * @param string $node * @throws NodeNotFoundException * @throws \Neos\Flow\Mvc\Exception\StopActionException * @throws \Neos\Flow\Mvc\Routing\Exception\MissingActionNameException @@ -157,7 +154,11 @@ public function previewAction(string $node): void ); } - if ($this->getNodeType($nodeInstance)->isOfType(NodeTypeNameFactory::NAME_SHORTCUT) && $nodeAddress->isInLiveWorkspace()) { + if ( + $this->getNodeType($nodeInstance)->isOfType(NodeTypeNameFactory::NAME_SHORTCUT) + && !$renderingMode->isEdit + && $nodeAddress->workspaceName->isLive() // shortcuts are only resolvable for the live workspace + ) { $this->handleShortcutNode($nodeAddress, $contentRepository); } @@ -168,7 +169,7 @@ public function previewAction(string $node): void 'site' => $site, ]); - if (!$nodeAddress->isInLiveWorkspace()) { + if ($renderingMode->isEdit) { $this->overrideViewVariablesFromInternalArguments(); $this->response->setHttpHeader('Cache-Control', 'no-cache'); if (!$this->view->canRenderWithNodeAndPath()) { @@ -266,7 +267,7 @@ protected function overrideViewVariablesFromInternalArguments() } /** - * Handles redirects to shortcut targets in live rendering. + * Handles redirects to shortcut targets of nodes in the live workspace. * * @param NodeAddress $nodeAddress * @throws NodeNotFoundException diff --git a/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php b/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php index 61f854c20f5..8ef9b1becfe 100755 --- a/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php +++ b/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php @@ -14,6 +14,7 @@ namespace Neos\Neos\Controller\Module\Administration; +use Neos\ContentRepository\Core\Factory\ContentRepositoryId; use Neos\ContentRepository\Core\Feature\NodeRenaming\Command\ChangeNodeAggregateName; use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate; use Neos\ContentRepository\Core\Projection\Workspace\Workspace; @@ -22,6 +23,7 @@ use Neos\ContentRepository\Core\SharedModel\Node\NodeName; use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry; +use Neos\ContentRepositoryRegistry\Exception\ContentRepositoryNotFoundException; use Neos\Error\Messages\Message; use Neos\Flow\Annotations as Flow; use Neos\Flow\Package; @@ -246,13 +248,22 @@ public function updateSiteAction(Site $site, $newSiteNodeName) public function newSiteAction(Site $site = null) { // This is not 100% correct, but it is as good as we can get it to work right now - $contentRepositoryId = SiteDetectionResult::fromRequest($this->request->getHttpRequest()) - ->contentRepositoryId; - $contentRepository = $this->contentRepositoryRegistry->get($contentRepositoryId); + try { + $contentRepositoryId = SiteDetectionResult::fromRequest($this->request->getHttpRequest()) + ->contentRepositoryId; + } catch (\RuntimeException) { + $contentRepositoryId = ContentRepositoryId::fromString('default'); + } + + try { + $contentRepository = $this->contentRepositoryRegistry->get($contentRepositoryId); + $documentNodeTypes = $contentRepository->getNodeTypeManager()->getSubNodeTypes(NodeTypeNameFactory::forSite(), false); + } catch (ContentRepositoryNotFoundException) { + $documentNodeTypes = []; + } $sitePackages = $this->packageManager->getFilteredPackages('available', 'neos-site'); - $documentNodeTypes = $contentRepository->getNodeTypeManager()->getSubNodeTypes(NodeTypeNameFactory::forDocument(), false); $generatorServiceIsAvailable = $this->packageManager->isPackageAvailable('Neos.SiteKickstarter'); $generatorServices = []; diff --git a/Neos.Neos/Classes/Domain/Model/RenderingMode.php b/Neos.Neos/Classes/Domain/Model/RenderingMode.php index 389f23c1f2f..347ea1e062a 100644 --- a/Neos.Neos/Classes/Domain/Model/RenderingMode.php +++ b/Neos.Neos/Classes/Domain/Model/RenderingMode.php @@ -20,14 +20,14 @@ * Describes the mode in which the Neos interface is rendering currently, * mainly distinguishing between edit and preview modes currently. */ -class RenderingMode +final class RenderingMode { public const FRONTEND = 'frontend'; /** * @param array $options */ - public function __construct( + private function __construct( public readonly string $name, public readonly bool $isEdit, public readonly bool $isPreview, @@ -52,7 +52,7 @@ public static function createFromConfiguration(string $modeName, array $configur 1694802951840 ); } - $mode = new RenderingMode( + return new self( $modeName, $configuration['isEditingMode'] ?? false, $configuration['isPreviewMode'] ?? false, @@ -60,7 +60,6 @@ public static function createFromConfiguration(string $modeName, array $configur $configuration['fusionRenderingPath'] ?? '', $configuration['options'] ?? [], ); - return $mode; } /** @@ -68,7 +67,7 @@ public static function createFromConfiguration(string $modeName, array $configur */ public static function createFrontend(): RenderingMode { - return new RenderingMode( + return new self( RenderingMode::FRONTEND, false, false, diff --git a/Neos.Neos/Classes/FrontendRouting/NodeShortcutResolver.php b/Neos.Neos/Classes/FrontendRouting/NodeShortcutResolver.php index d1d6ad5b679..a63351f3569 100644 --- a/Neos.Neos/Classes/FrontendRouting/NodeShortcutResolver.php +++ b/Neos.Neos/Classes/FrontendRouting/NodeShortcutResolver.php @@ -64,6 +64,9 @@ public function __construct( */ public function resolveShortcutTarget(NodeAddress $nodeAddress, ContentRepository $contentRepository) { + if (!$nodeAddress->workspaceName->isLive()) { + throw new \RuntimeException(sprintf('Cannot resolve shortcut target for node-address %s in workspace %s because the DocumentUriPathProjection only handles the live workspace.', $nodeAddress->nodeAggregateId->value, $nodeAddress->workspaceName->value), 1707208650); + } $documentUriPathFinder = $contentRepository->projectionState(DocumentUriPathFinder::class); $documentNodeInfo = $documentUriPathFinder->getByIdAndDimensionSpacePointHash( $nodeAddress->nodeAggregateId, diff --git a/Neos.Neos/Classes/FrontendRouting/NodeUriBuilder.php b/Neos.Neos/Classes/FrontendRouting/NodeUriBuilder.php index a3f2433a824..6e90d5b1d23 100644 --- a/Neos.Neos/Classes/FrontendRouting/NodeUriBuilder.php +++ b/Neos.Neos/Classes/FrontendRouting/NodeUriBuilder.php @@ -58,7 +58,7 @@ public static function fromUriBuilder(UriBuilder $uriBuilder): self * If the node belongs to the live workspace, the public URL is generated * Otherwise a preview URI is rendered (@see previewUriFor()) * - * Note: Shortcut nodes will are resolved in the RoutePartHandler thus the resulting URI will point + * Note: Shortcut nodes will be resolved in the RoutePartHandler thus the resulting URI will point * to the shortcut target (node, asset or external URI) * * @param NodeAddress $nodeAddress @@ -67,10 +67,11 @@ public static function fromUriBuilder(UriBuilder $uriBuilder): self */ public function uriFor(NodeAddress $nodeAddress): UriInterface { - if (!$nodeAddress->isInLiveWorkspace()) { + if (!$nodeAddress->workspaceName->isLive()) { + // we cannot build a human-readable uri using the showAction as + // the DocumentUriPathProjection only handles the live workspace return $this->previewUriFor($nodeAddress); } - /** @noinspection PhpUnhandledExceptionInspection */ return new Uri($this->uriBuilder->uriFor('show', ['node' => $nodeAddress], 'Frontend\Node', 'Neos.Neos')); } diff --git a/Neos.Neos/Classes/Fusion/Helper/RenderingHelper.php b/Neos.Neos/Classes/Fusion/Helper/RenderingHelper.php deleted file mode 100644 index 05aa51a786f..00000000000 --- a/Neos.Neos/Classes/Fusion/Helper/RenderingHelper.php +++ /dev/null @@ -1,83 +0,0 @@ - $dimensions - */ - public function renderDimensions(array $dimensions): string - { - throw new \RuntimeException('TODO FIX ME IF NEEDED'); -// $rendered = []; -// foreach ($dimensions as $dimensionIdentifier => $dimensionValue) { -// $dimension = $this->contentDimensionSource->getDimension( -// new ContentDimensionIdentifier($dimensionIdentifier) -// ); -// $value = $dimension?->getValue($dimensionValue); -// $rendered[] = $dimension?->getConfigurationValue('label') -// . ' ' . $value?->getConfigurationValue('label'); -// } -// -// return implode(', ', $rendered); - } - - /** - * Render the label for the given $nodeTypeName - * - * @param string $nodeTypeName - * @throws NodeTypeNotFoundException - * @return string - */ - public function labelForNodeType($nodeTypeName) - { - throw new \RuntimeException('TODO RE-IMPLEMENT ME'); -// if (!$this->nodeTypeManager->hasNodeType($nodeTypeName)) { -// $explodedNodeTypeName = explode(':', $nodeTypeName); -// -// return end($explodedNodeTypeName); -// } -// -// $nodeType = $this->nodeTypeManager->getNodeType($nodeTypeName); -// -// return $nodeType->getLabel(); - } - - /** - * All methods are considered safe - * - * @param string $methodName - * @return boolean - */ - public function allowsCallOfMethod($methodName) - { - return true; - } -} diff --git a/Neos.Neos/Configuration/Settings.yaml b/Neos.Neos/Configuration/Settings.yaml index 89f849c863b..b1d965074f0 100755 --- a/Neos.Neos/Configuration/Settings.yaml +++ b/Neos.Neos/Configuration/Settings.yaml @@ -472,10 +472,13 @@ Neos: - Neos\Flow\Persistence\Doctrine\Exception\DatabaseConnectionException - Neos\Flow\Persistence\Doctrine\Exception\DatabaseStructureException options: &welcomeTemplate - viewClassName: Neos\FluidAdaptor\View\StandaloneView + viewClassName: Neos\Fusion\View\FusionView viewOptions: - templatePathAndFilename: 'resource://Neos.Neos/Private/Templates/Error/Welcome.html' - layoutRootPaths: ['resource://Neos.Neos/Private/Layouts/'] + fusionPath: 'Neos/Fusion/DatabaseConnectionExceptions' + fusionPathPatterns: ['resource://Neos.Neos/Private/Fusion/Error/Root.fusion'] + enableContentCache: false + templatePathAndFilename: ~ + noHomepageException: matchingExceptionClassNames: - Neos\Neos\Routing\Exception\NoHomepageException @@ -532,7 +535,6 @@ Neos: Neos.Node: Neos\Neos\Fusion\Helper\NodeHelper Neos.Link: Neos\Neos\Fusion\Helper\LinkHelper Neos.Array: Neos\Neos\Fusion\Helper\ArrayHelper - Neos.Rendering: Neos\Neos\Fusion\Helper\RenderingHelper Neos.Caching: Neos\Neos\Fusion\Helper\CachingHelper Neos.Dimension: Neos\Neos\Fusion\Helper\DimensionHelper Neos.Backend: Neos\Neos\Fusion\Helper\BackendHelper diff --git a/Neos.Neos/Documentation/References/CommandReference.rst b/Neos.Neos/Documentation/References/CommandReference.rst index cbe290dce25..6b2bc5e1b42 100644 --- a/Neos.Neos/Documentation/References/CommandReference.rst +++ b/Neos.Neos/Documentation/References/CommandReference.rst @@ -19,7 +19,7 @@ commands that may be available, use:: ./flow help -The following reference was automatically generated from code on 2024-02-05 +The following reference was automatically generated from code on 2024-02-11 .. _`Neos Command Reference: NEOS.FLOW`: diff --git a/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst b/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst index 75d41c7e8df..9108f2fc2ad 100644 --- a/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst +++ b/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst @@ -3,7 +3,7 @@ FluidAdaptor ViewHelper Reference ################################# -This reference was automatically generated from code on 2024-02-05 +This reference was automatically generated from code on 2024-02-11 .. _`FluidAdaptor ViewHelper Reference: f:debug`: diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Form.rst b/Neos.Neos/Documentation/References/ViewHelpers/Form.rst index f574a156ab4..ed6d1e48def 100644 --- a/Neos.Neos/Documentation/References/ViewHelpers/Form.rst +++ b/Neos.Neos/Documentation/References/ViewHelpers/Form.rst @@ -3,7 +3,7 @@ Form ViewHelper Reference ######################### -This reference was automatically generated from code on 2024-02-05 +This reference was automatically generated from code on 2024-02-11 .. _`Form ViewHelper Reference: neos.form:form`: diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Media.rst b/Neos.Neos/Documentation/References/ViewHelpers/Media.rst index 955a836f155..39daed28e4f 100644 --- a/Neos.Neos/Documentation/References/ViewHelpers/Media.rst +++ b/Neos.Neos/Documentation/References/ViewHelpers/Media.rst @@ -3,7 +3,7 @@ Media ViewHelper Reference ########################## -This reference was automatically generated from code on 2024-02-05 +This reference was automatically generated from code on 2024-02-11 .. _`Media ViewHelper Reference: neos.media:fileTypeIcon`: diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst b/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst index ecddc3443ac..3c4d681d61c 100644 --- a/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst +++ b/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst @@ -3,7 +3,7 @@ Neos ViewHelper Reference ######################### -This reference was automatically generated from code on 2024-02-05 +This reference was automatically generated from code on 2024-02-11 .. _`Neos ViewHelper Reference: neos:backend.authenticationProviderLabel`: diff --git a/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst b/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst index d6fa7ea6a5e..2eeeadfb4b7 100644 --- a/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst +++ b/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst @@ -3,7 +3,7 @@ TYPO3 Fluid ViewHelper Reference ################################ -This reference was automatically generated from code on 2024-02-05 +This reference was automatically generated from code on 2024-02-11 .. _`TYPO3 Fluid ViewHelper Reference: f:alias`: diff --git a/Neos.Neos/NodeTypes/Mixin/Content.yaml b/Neos.Neos/NodeTypes/Mixin/Content.yaml index c6513a7fe45..b3cb805acf2 100644 --- a/Neos.Neos/NodeTypes/Mixin/Content.yaml +++ b/Neos.Neos/NodeTypes/Mixin/Content.yaml @@ -2,7 +2,6 @@ superTypes: 'Neos.Neos:Node': true 'Neos.Neos:Hidable': true - 'Neos.Neos:Timable': true abstract: true constraints: nodeTypes: diff --git a/Neos.Neos/NodeTypes/Mixin/Document.yaml b/Neos.Neos/NodeTypes/Mixin/Document.yaml index f00b1f0dd85..dbefbab0e31 100644 --- a/Neos.Neos/NodeTypes/Mixin/Document.yaml +++ b/Neos.Neos/NodeTypes/Mixin/Document.yaml @@ -5,7 +5,6 @@ superTypes: 'Neos.Neos:Node': true 'Neos.Neos:Hidable': true - 'Neos.Neos:Timable': true abstract: true aggregate: true constraints: diff --git a/Neos.Neos/NodeTypes/Mixin/Timable.yaml b/Neos.Neos/NodeTypes/Mixin/Timable.yaml deleted file mode 100644 index 8235bfbc7d7..00000000000 --- a/Neos.Neos/NodeTypes/Mixin/Timable.yaml +++ /dev/null @@ -1,36 +0,0 @@ -# Timable Mixin -'Neos.Neos:Timable': - abstract: true - ui: - inspector: - groups: - visibility: - label: 'Neos.Neos:Inspector:groups.visibility' - icon: 'icon-eye' - position: 100 - tab: meta - properties: - # TODO: Neos 9 won't have _hiddenBeforeDateTime or _hiddenAfterDateTime anymore; - # but instead we want to build a mechanism to dispatch a command at a given point im time (e.g. hide/unhide) - _hiddenBeforeDateTime: ~ -# type: DateTime -# ui: -# label: i18n -# inspector: -# group: 'visibility' -# position: 10 -# editorOptions: -# format: 'd-m-Y H:i' -# validation: -# 'Neos.Neos/Validation/DateTimeValidator': [] - _hiddenAfterDateTime: ~ -# type: DateTime -# ui: -# label: i18n -# inspector: -# group: 'visibility' -# position: 20 -# editorOptions: -# format: 'd-m-Y H:i' -# validation: -# 'Neos.Neos/Validation/DateTimeValidator': [] diff --git a/Neos.Neos/Resources/Private/Fusion/Backend/Root.fusion b/Neos.Neos/Resources/Private/Fusion/Backend/Root.fusion index 162af12757f..71b34e6ed02 100644 --- a/Neos.Neos/Resources/Private/Fusion/Backend/Root.fusion +++ b/Neos.Neos/Resources/Private/Fusion/Backend/Root.fusion @@ -1,7 +1,7 @@ include: resource://Neos.Fusion/Private/Fusion/Root.fusion include: resource://Neos.Fusion.Form/Private/Fusion/Root.fusion +include: resource://Neos.Neos/Private/Fusion/SharedCoreComponents/* include: Views/*.fusion -include: Component/*.fusion Neos.Neos.LoginController.index = Neos.Neos:View.Login { site = ${site} diff --git a/Neos.Neos/Resources/Private/Fusion/Backend/Views/Login.fusion b/Neos.Neos/Resources/Private/Fusion/Backend/Views/Login.fusion index 7c8d824fc46..eee0c1623e7 100644 --- a/Neos.Neos/Resources/Private/Fusion/Backend/Views/Login.fusion +++ b/Neos.Neos/Resources/Private/Fusion/Backend/Views/Login.fusion @@ -4,96 +4,81 @@ prototype(Neos.Neos:View.Login) < prototype(Neos.Fusion:Component) { username = '' flashMessages = ${[]} - renderer = Neos.Fusion:Join { - doctype = '' - doctype.@position = 'start 100' - - content = Neos.Fusion:Component { - @apply.props = ${props} + @private { + logoImageSource = Neos.Neos:Core.ImageSource { + path = ${Configuration.setting('Neos.Neos.userInterface.backendLoginForm.logoImage')} + } + backgroundImageSource = Neos.Neos:Core.ImageSource { + path = ${Configuration.setting('Neos.Neos.userInterface.backendLoginForm.backgroundImage')} + } + backgroundImageSourceIsWebp = ${private.backgroundImageSource ? String.endsWith(private.backgroundImageSource, '.webp') : null} - logoImageSource = Neos.Neos:Component.ImageSource { - path = ${Configuration.setting('Neos.Neos.userInterface.backendLoginForm.logoImage')} + additionalStyles = Neos.Fusion:Loop { + items = ${props.styles} + content = Neos.Fusion:Tag { + tagName = 'link' + attributes.rel = 'stylesheet' + attributes.href = Neos.Fusion:ResourceUri { + path = ${item} + } } - backgroundImageSource = Neos.Neos:Component.ImageSource { - path = ${Configuration.setting('Neos.Neos.userInterface.backendLoginForm.backgroundImage')} - } - backgroundImageSourceIsWebp = ${this.backgroundImageSource ? String.endsWith(this.backgroundImageSource, '.webp') : null} - - headerComment = ${Configuration.setting('Neos.Neos.headerComment')} - - renderer = afx` - - {props.headerComment} - - - - {I18n.translate('login.index.title', 'Login to')} {props.site.name} - - - - - - - - - - + } + } - - - - - -
-
- +
+
+

+ Neos –  + © 2006-{Date.format('now', 'Y')} This is free software, licensed under GPL3 or higher, and you are welcome to redistribute it under certain conditions;  + Neos comes with ABSOLUTELY NO WARRANTY;  + See neos.io for more details. Obstructing the appearance of this notice is prohibited by law. +

+
+
- - - - ` - } - } + + + + ` } prototype(Neos.Neos:Component.Login.Form) < prototype(Neos.Fusion:Component) { diff --git a/Neos.Neos/Resources/Private/Fusion/Error/Root.fusion b/Neos.Neos/Resources/Private/Fusion/Error/Root.fusion index 8928db35a87..0599d2a6abe 100644 --- a/Neos.Neos/Resources/Private/Fusion/Error/Root.fusion +++ b/Neos.Neos/Resources/Private/Fusion/Error/Root.fusion @@ -1,8 +1,13 @@ include: resource://Neos.Fusion/Private/Fusion/Root.fusion -include: ../Prototypes/ErrorPage.fusion +include: resource://Neos.Neos/Private/Fusion/SharedCoreComponents/* include: Views/*.fusion Neos.Fusion.FusionParserException = Neos.Neos:Error.View.FusionParserException { exception = ${exception} flowPathRoot = ${flowPathRoot} } + +Neos.Fusion.DatabaseConnectionExceptions = Neos.Neos:Error.View.Welcome { + exception = ${exception} + renderingGroupName = ${renderingOptions.renderingGroup} +} diff --git a/Neos.Neos/Resources/Private/Fusion/Error/Views/FusionParserException.fusion b/Neos.Neos/Resources/Private/Fusion/Error/Views/FusionParserException.fusion index 39cd4982755..b09642bd9fa 100644 --- a/Neos.Neos/Resources/Private/Fusion/Error/Views/FusionParserException.fusion +++ b/Neos.Neos/Resources/Private/Fusion/Error/Views/FusionParserException.fusion @@ -5,7 +5,8 @@ prototype(Neos.Neos:Error.View.FusionParserException) < prototype(Neos.Fusion:Co flowPathRoot = '' renderer = afx` - + +

{String.htmlspecialchars(props.exception.headingMessagePart)}

@@ -24,6 +25,6 @@ prototype(Neos.Neos:Error.View.FusionParserException) < prototype(Neos.Fusion:Co
- + ` } diff --git a/Neos.Neos/Resources/Private/Fusion/Error/Views/Welcome.fusion b/Neos.Neos/Resources/Private/Fusion/Error/Views/Welcome.fusion new file mode 100644 index 00000000000..e9e6dc6ff59 --- /dev/null +++ b/Neos.Neos/Resources/Private/Fusion/Error/Views/Welcome.fusion @@ -0,0 +1,73 @@ +prototype(Neos.Neos:Error.View.Welcome) < prototype(Neos.Fusion:Component) { + /** @var exception \Exception */ + exception = '' + renderingGroupName = '' + + @private { + logoImageSource = Neos.Neos:Core.ImageSource { + path = ${Configuration.setting('Neos.Neos.userInterface.backendLoginForm.logoImage')} + } + backgroundImageSource = Neos.Neos:Core.ImageSource { + path = ${Configuration.setting('Neos.Neos.userInterface.backendLoginForm.backgroundImage')} + } + + backgroundImageSourceIsWebp = ${private.backgroundImageSource ? String.endsWith(private.backgroundImageSource, '.webp') : null} + + i18n = ${I18n.id(null).package('Neos.Neos').source('Main').locale(Neos.Backend.interfaceLanguage())} + + additionalResources = afx` + + + + ` + } + + renderer = afx` + + + + + + + +
+
+ +
+
+ + + ` +} diff --git a/Neos.Neos/Resources/Private/Fusion/ErrorCase.fusion b/Neos.Neos/Resources/Private/Fusion/ErrorCase.fusion index 83f191b2043..367f995e96a 100644 --- a/Neos.Neos/Resources/Private/Fusion/ErrorCase.fusion +++ b/Neos.Neos/Resources/Private/Fusion/ErrorCase.fusion @@ -27,7 +27,8 @@ prototype(Neos.Neos:DefaultExceptionRenderer) < prototype(Neos.Fusion:Component) renderingOptions = null renderer = afx` - + +
@@ -42,6 +43,6 @@ prototype(Neos.Neos:DefaultExceptionRenderer) < prototype(Neos.Fusion:Component)

#{props.exception.code}: {props.exception.message}

- + ` } diff --git a/Neos.Neos/Resources/Private/Fusion/Prototypes/ErrorPage.fusion b/Neos.Neos/Resources/Private/Fusion/Prototypes/ErrorPage.fusion deleted file mode 100644 index bfeaf3e6924..00000000000 --- a/Neos.Neos/Resources/Private/Fusion/Prototypes/ErrorPage.fusion +++ /dev/null @@ -1,28 +0,0 @@ -/** - * Only for internal use! - * @internal - */ -prototype(Neos.Neos:ErrorPage) < prototype(Neos.Fusion:Component) { - title = '' - content = '' - - renderer = Neos.Fusion:Join { - doctype = '' - html = afx` - - - - - - {props.title} - - - - - - - {props.content} - - ` - } -} diff --git a/Neos.Neos/Resources/Private/Fusion/RawContent/NodeHeader.fusion b/Neos.Neos/Resources/Private/Fusion/RawContent/NodeHeader.fusion index d68cfa16f50..aa3b1b01d9e 100644 --- a/Neos.Neos/Resources/Private/Fusion/RawContent/NodeHeader.fusion +++ b/Neos.Neos/Resources/Private/Fusion/RawContent/NodeHeader.fusion @@ -5,10 +5,6 @@ prototype(Neos.Neos:RawContent.NodeHeader) < prototype(Neos.Fusion:Component) { visibilityInformations = Neos.Fusion:DataStructure { hidden = 'hidden' hidden.@if.isHidden = ${node.hidden} - hiddenBeforeDateTime = ${'hidden before ' + Date.format(node.hiddenBeforeDateTime, 'Y-m-d H:i:s')} - hiddenBeforeDateTime.@if.hasHiddenBeforeDateTime = ${node.hiddenBeforeDateTime} - hiddenAfterDateTime = ${'hidden after ' + Date.format(node.hiddenAfterDateTime, 'Y-m-d H:i:s')} - hiddenAfterDateTime.@if.hasHiddenAfterDateTime = ${node.hiddenAfterDateTime} @process.join = ${Array.join(value, ', ')} } diff --git a/Neos.Neos/Resources/Private/Fusion/Root.fusion b/Neos.Neos/Resources/Private/Fusion/Root.fusion index e5ed9000545..1010042ed98 100644 --- a/Neos.Neos/Resources/Private/Fusion/Root.fusion +++ b/Neos.Neos/Resources/Private/Fusion/Root.fusion @@ -1,4 +1,5 @@ include: Prototypes/*.fusion +include: SharedCoreComponents/BackendPage.fusion include: ErrorCase.fusion include: RootCase.fusion include: RawContentMode.fusion diff --git a/Neos.Neos/Resources/Private/Fusion/SharedCoreComponents/BackendPage.fusion b/Neos.Neos/Resources/Private/Fusion/SharedCoreComponents/BackendPage.fusion new file mode 100644 index 00000000000..422dd8fa8bd --- /dev/null +++ b/Neos.Neos/Resources/Private/Fusion/SharedCoreComponents/BackendPage.fusion @@ -0,0 +1,33 @@ +/** + * Only for internal use! + * @internal + */ +prototype(Neos.Neos:Core.BackendPage) < prototype(Neos.Fusion:Component) { + title = '' + content = '' + additionalResources = Neos.Fusion:Join + + @private { + headerComment = ${Configuration.setting('Neos.Neos.headerComment')} + } + + renderer = Neos.Fusion:Join { + doctype = '' + html = afx` + + {private.headerComment} + + + + {props.title} + + + + + {props.additionalResources} + + {props.content} + + ` + } +} diff --git a/Neos.Neos/Resources/Private/Fusion/Backend/Component/ImageSource.fusion b/Neos.Neos/Resources/Private/Fusion/SharedCoreComponents/ImageSource.fusion similarity index 74% rename from Neos.Neos/Resources/Private/Fusion/Backend/Component/ImageSource.fusion rename to Neos.Neos/Resources/Private/Fusion/SharedCoreComponents/ImageSource.fusion index 2e9cac3ad10..0f863603b7d 100644 --- a/Neos.Neos/Resources/Private/Fusion/Backend/Component/ImageSource.fusion +++ b/Neos.Neos/Resources/Private/Fusion/SharedCoreComponents/ImageSource.fusion @@ -1,6 +1,9 @@ -prototype(Neos.Neos:Component.ImageSource) < prototype(Neos.Fusion:Component) { +/** + * Only for internal use! + * @internal + */ +prototype(Neos.Neos:Core.ImageSource) < prototype(Neos.Fusion:Component) { path = '' - @if.set = ${this.path} renderer = Neos.Fusion:Case { resourcePath { condition = ${String.indexOf(props.path, 'resource://') == 0} @@ -8,10 +11,9 @@ prototype(Neos.Neos:Component.ImageSource) < prototype(Neos.Fusion:Component) { path = ${props.path} } } - default { condition = true renderer = ${props.path} } } -} \ No newline at end of file +} diff --git a/Neos.Neos/Resources/Private/Templates/Error/Welcome.html b/Neos.Neos/Resources/Private/Templates/Error/Welcome.html deleted file mode 100755 index dd9fda61e41..00000000000 --- a/Neos.Neos/Resources/Private/Templates/Error/Welcome.html +++ /dev/null @@ -1,56 +0,0 @@ -{namespace neos=Neos\Neos\ViewHelpers} - - - - - Welcome to Neos - - - - - - - - - -
-
- -
-
- - diff --git a/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html b/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html index a4dd4a3c548..27d33f25da9 100644 --- a/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html +++ b/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html @@ -40,7 +40,7 @@

{neos:backend.translate(id: 'sites.new', value: 'New site', source: 'Modules
- +
diff --git a/Neos.Neos/Resources/Private/Translations/ar/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/ar/NodeTypes/Timable.xlf deleted file mode 100644 index 8936fc8e8b0..00000000000 --- a/Neos.Neos/Resources/Private/Translations/ar/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - إخفاء قبل - - Hide after - إخفاء بعد - - - diff --git a/Neos.Neos/Resources/Private/Translations/cs/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/cs/NodeTypes/Timable.xlf deleted file mode 100644 index bc521ad31fc..00000000000 --- a/Neos.Neos/Resources/Private/Translations/cs/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - Skrýt před - - Hide after - Skrýt po - - - diff --git a/Neos.Neos/Resources/Private/Translations/da/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/da/NodeTypes/Timable.xlf deleted file mode 100644 index 5f1a3810451..00000000000 --- a/Neos.Neos/Resources/Private/Translations/da/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - Skjul før - - Hide after - Skjul efter - - - diff --git a/Neos.Neos/Resources/Private/Translations/de/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/de/NodeTypes/Timable.xlf deleted file mode 100644 index 1709e9ac409..00000000000 --- a/Neos.Neos/Resources/Private/Translations/de/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - Verstecken bis - - Hide after - Verstecken nach - - - diff --git a/Neos.Neos/Resources/Private/Translations/el/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/el/NodeTypes/Timable.xlf deleted file mode 100644 index 6a0a16eab3c..00000000000 --- a/Neos.Neos/Resources/Private/Translations/el/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - Hide before - - Hide after - Hide after - - - diff --git a/Neos.Neos/Resources/Private/Translations/en/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/en/NodeTypes/Timable.xlf deleted file mode 100644 index 6a51b737e63..00000000000 --- a/Neos.Neos/Resources/Private/Translations/en/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - - - Hide after - - - - diff --git a/Neos.Neos/Resources/Private/Translations/es/Modules.xlf b/Neos.Neos/Resources/Private/Translations/es/Modules.xlf index 81af8328326..8d7c25e4f95 100644 --- a/Neos.Neos/Resources/Private/Translations/es/Modules.xlf +++ b/Neos.Neos/Resources/Private/Translations/es/Modules.xlf @@ -3,204 +3,204 @@ - Back + Back Atrás - Cancel + Cancel Cancelar - Management + Management Administración - Contains multiple modules related to management of content + Contains multiple modules related to management of content Contiene varios módulos relacionados con la gestión de contenidos - Workspaces + Workspaces Espacios de Trabajo - Details for "{0}" + Details for "{0}" Detalles de "{0}" - Create new workspace + Create new workspace Crear un nuevo espacio de trabajo - Create workspace + Create workspace Crear espacio de trabajo - Delete workspace + Delete workspace Eliminar espacio de trabajo - Edit workspace + Edit workspace Editar espacio de trabajo - Yes, delete the workspace + Yes, delete the workspace Sí, elimínalo - Edit workspace "{0}" + Edit workspace "{0}" Editar espacio de trabajo - Personal workspace + Personal workspace Espacio de trabajo personal - Private workspace + Private workspace Espacio de trabajo privado - Internal workspace + Internal workspace Espacio de trabajo interno - Read-only workspace + Read-only workspace Espacio de trabajo de solo lectura - Title + Title Título - Description + Description Descripción - Base workspace + Base workspace Espacio de trabajo base - Owner + Owner Dueño - Visibility + Visibility Visiblidad - Private + Private Privado - Only reviewers and administrators can access and modify this workspace + Only reviewers and administrators can access and modify this workspace Solo los revisores y administradores pueden acceder y modificar este espacio de trabajo - Internal + Internal Interno - Any logged in editor can see and modify this workspace. + Any logged in editor can see and modify this workspace. Cualquiera que inicie sesión en el editor puede ver y modificar este espacio de trabajo. - Changes + Changes Cambios - Open page in "{0}" workspace + Open page in "{0}" workspace Abrir la página en el espacio de trabajo "{0}" - This is your personal workspace which you can't delete. + This is your personal workspace which you can't delete. Este es tu espacio de trabajo personal que no se puede eliminar. - The workspace contains changes. To delete, discard the changes first. + The workspace contains changes. To delete, discard the changes first. El espacio de trabajo contiene cambios. Para eliminarlos, descarta los cambios primero. - Workspace can't be rebased on a different workspace because it still contains changes. + Workspace can't be rebased on a different workspace because it still contains changes. El espacio de trabajo no puede ser reajustado en un espacio de trabajo distinto ya que contiene cambios. - The workspace cannot be deleted because other workspaces depend on it. + The workspace cannot be deleted because other workspaces depend on it. El espacio de trabajo no se puede eliminar porque otros espacios de trabajo dependen de el. - You don't have the permissions for deleting this workspace. + You don't have the permissions for deleting this workspace. No tienes los permisos para eliminar esta área de trabajo. - Do you really want to delete the workspace "{0}"? + Do you really want to delete the workspace "{0}"? ¿Realmente deseas eliminar el espacio de trabajo "{0}"? - This will delete the workspace including all unpublished content. This operation cannot be undone. + This will delete the workspace including all unpublished content. This operation cannot be undone. Esto eliminará el espacio de trabajo incluyendo contenido todo inédito. Esta operación no se puede deshacer. - This module contains the overview of all elements within the current workspace and it enables to continue the review and publishing workflow for them. + This module contains the overview of all elements within the current workspace and it enables to continue the review and publishing workflow for them. Este módulo contiene el resumen de todos los elementos dentro del espacio de trabajo actual y permite seguir el flujo de trabajo de revisión y publicación para ellos. - Unpublished changes in workspace "{0}" + Unpublished changes in workspace "{0}" Cambios no publicados - additions: {new}, changes: {changed}, removals: {removed} + additions: {new}, changes: {changed}, removals: {removed} añadidos: {new}, cambios: {changed}, removidos: {removed} - Review + Review Revisar - Discard selected changes + Discard selected changes Descartar los cambios seleccionados - Discard all changes + Discard all changes Descartar todos los cambios - Publish all changes + Publish all changes Publicar todos los cambios - Publish all changes to {0} + Publish all changes to {0} Publicar todos los cambios en {0} - Changed Content + Changed Content Contenido cambiado - deleted + deleted eliminado - created + created creado - moved + moved movido - hidden + hidden oculto - edited + edited editado - There are no unpublished changes in this workspace. + There are no unpublished changes in this workspace. No hay cambios sin publicar en este espacio de trabajo. - Do you really want to discard all changes in the "{0}" workspace? + Do you really want to discard all changes in the "{0}" workspace? ¿Desea descartar todos los cambios en el espacio de trabajo "{0}"? @@ -226,10 +226,12 @@ Did not delete workspace "{0}" because it currently contains {1} node. - No se eliminó el espacio de trabajo "{0}" porque actualmente contiene {1} nodo. + No se eliminó el espacio de trabajo "{0}" porque actualmente contiene {1} nodo. + Did not delete workspace "{0}" because it currently contains {1} nodes. - No se eliminó el espacio de trabajo "{0}" porque actualmente contiene {1} nodos. + No se eliminó el espacio de trabajo "{0}" porque actualmente contiene {1} nodos. + The workspace "{0}" has been removed. @@ -261,547 +263,547 @@ - Administration + Administration Administración - Contains multiple modules related to administration + Contains multiple modules related to administration Contiene varios módulos relacionados con la administración - User Management + User Management Gestión de usuarios - The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured. + The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured. El módulo de gestión de usuario le proporciona una visión general de todos los usuarios del back-end. Puede agruparlos por sus propiedades para controlar sus permisos, puntos de montaje de archivos, grupos miembros, etc... Este módulo es una herramienta indispensable para asegurarse de que los usuarios están configurados correctamente. - Overview + Overview Resumen - Show + Show Mostrar - New + New Nuevo - Edit + Edit Editar - Edit account + Edit account Editar cuenta - New electronic address + New electronic address Nueva dirección electrónica - Use system default + Use system default Utilizar valores predeterminados del sistema - Create user + Create user Crear usuario - Create a new user + Create a new user Crear un nuevo usuario - User Data + User Data Datos de usuario - Username + Username Nombre de usuario - Password + Password Contraseña - Repeat password + Repeat password Repetir contraseña - Role(s) + Role(s) Rol(es) - Authentication Provider + Authentication Provider Proveedor de autenticación - Use system default + Use system default Utilizar valores predeterminados del sistema - Personal Data + Personal Data Datos de carácter personal - First Name + First Name Nombre - Last Name + Last Name Apellidos - User Preferences + User Preferences Preferencias de usuario - Interface Language + Interface Language Idioma de la interfaz - Create user + Create user Crear usuario - Details for user + Details for user Detalles del usuario - Personal Data + Personal Data Datos de carácter personal - Title + Title Título - First Name + First Name Nombre - Middle Name + Middle Name Segundo nombre - Last Name + Last Name Apellidos - Other Name + Other Name Otro nombre - Accounts + Accounts Cuentas - Username + Username Nombre de usuario - Roles + Roles Roles - Electronic Addresses + Electronic Addresses Direcciones electrónicas - Primary + Primary Primario - N/A + N/A N/A - Delete User + Delete User Eliminar usuario - Edit User + Edit User Editar usuario - You are logged in as this user and you cannot delete yourself. + You are logged in as this user and you cannot delete yourself. Estas conectado como este usuario y no se puede eliminar usted mismo. - Click here to delete this user + Click here to delete this user Haga clic aquí para eliminar este usuario - Do you really want to delete the user "{0}"? + Do you really want to delete the user "{0}"? ¿Realmente desea eliminar el usuario "{0}"? - Yes, delete the user + Yes, delete the user Sí, eliminar el usuario - This will delete the user, the related accounts and his personal workspace, including all unpublished content. + This will delete the user, the related accounts and his personal workspace, including all unpublished content. Esto eliminará el usuario, las cuentas correspondientes y su espacio de trabajo personal, incluyendo todos los contenidos no publicados. - This operation cannot be undone + This operation cannot be undone Esta operación no se puede deshacer - Edit account "{accountIdentifier}" + Edit account "{accountIdentifier}" Editar cuenta "{accountIdentifier}" - Account + Account Cuenta - Username + Username Nombre de usuario - The username can't be changed via the user interface + The username can't be changed via the user interface El nombre de usuario no se puede cambiar mediante la interfaz de usuario - Save account + Save account Guardar cuenta - Repeat password + Repeat password Repetir contraseña - Roles + Roles Roles - Directly assigned privilege + Directly assigned privilege Privilegio directamente asignado - Name + Name Nombre - From Parent Role "{role}" + From Parent Role "{role}" Desde el rol principal "{role}" - Accounts and Roles + Accounts and Roles Cuentas y Roles - View user + View user Ver usuario - Edit user + Edit user Editar Usuario - Not enough privileges to edit this user + Not enough privileges to edit this user No hay suficientes privilegios para editar este usuario - Not enough privileges to delete this user + Not enough privileges to delete this user No hay suficientes privilegios para eliminar este usuario - Delete user + Delete user Eliminar usuario - You are logged in as this user and you cannot delete yourself. + You are logged in as this user and you cannot delete yourself. Estas conectado como este usuario y no se puede eliminar usted mismo. - Do you really want to delete the user "{0}"? + Do you really want to delete the user "{0}"? ¿Realmente desea eliminar el usuario "{0}"? - This will delete the user, the related accounts and his personal workspace, including all unpublished content. + This will delete the user, the related accounts and his personal workspace, including all unpublished content. Esto eliminará el usuario, las cuentas correspondientes y su espacio de trabajo personal, incluyendo todos los contenidos no publicados. - Yes, delete the user + Yes, delete the user Sí, eliminar el usuario - Edit user "{0}" + Edit user "{0}" Editar usuario "{0}" - Home + Home Inicio - Work + Work Trabajo - Package Management + Package Management Administrar paquetes - The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context. + The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context. El módulo de gestión de paquetes proporciona una visión general de todos los paquetes. Puede activar y desactivar los paquetes individuales, importar paquetes nuevos y eliminar paquetes existentes. También le proporciona la capacidad para congelar y descongelar los paquetes en el contexto de desarrollo. - Available packages + Available packages Paquetes disponibles - Package Name + Package Name Nombre del paquete - Package Key + Package Key Clave de paquete - Package Type + Package Type Tipos de paquete - Deactivated + Deactivated Desactivado - This package is currently frozen. Click to unfreeze it. + This package is currently frozen. Click to unfreeze it. Este paquete está actualmente congelado. Haga clic para liberarlo. - Freeze the package in order to speed up your website. + Freeze the package in order to speed up your website. Congelar el paquete con el fin de acelerar su sitio de Internet. - This package is protected and cannot be deactivated. + This package is protected and cannot be deactivated. Este paquete está protegido y no se puede desactivar. - Deactivate Package + Deactivate Package Desactivar el paquete - Activate Package + Activate Package Activar paquete - This package is protected and cannot be deleted. + This package is protected and cannot be deleted. Este paquete está protegido y no se puede eliminar. - Delete Package + Delete Package Eliminar paquete - Do you really want to delete "{0}"? + Do you really want to delete "{0}"? ¿Realmente deseas eliminar "{0}"? - Yes, delete the package + Yes, delete the package Sí, eliminar el paquete - Yes, delete the packages + Yes, delete the packages Sí, eliminar los paquetes - Do you really want to delete the selected packages? + Do you really want to delete the selected packages? ¿Está seguro de querer borrar este paquete? - Freeze selected packages + Freeze selected packages Congelar paquetes seleccionados - Unfreeze selected packages + Unfreeze selected packages Liberar paquetes seleccionados - Delete selected packages + Delete selected packages Eliminar paquetes seleccionados - Deactivate selected packages + Deactivate selected packages Desactivar los paquetes seleccionados - Activate selected packages + Activate selected packages Activar los paquetes seleccionados - Sites Management + Sites Management Gestión de sitios - The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain. + The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain. El módulo de administración de sitios web le proporciona una visión general de todos los sitios. Puede editar, agregar y eliminar información sobre sus sitios, por ejemplo, agregar un nuevo dominio. - Add new site + Add new site Agregar nuevo sitio - Create site + Create site Crear sitio - Create a new site + Create a new site Crear un nuevo sitio - Root node name + Root node name Nombre del nodo raíz - Domains + Domains Dominios - Site + Site Sitio web - Name + Name Nombre - Default asset collection + Default asset collection Colección de activos predeterminada - Site package + Site package Sitio de paquete - Delete this site + Delete this site Eliminar este sitio - Deactivate site + Deactivate site Desactivar este sitio - Activate site + Activate site Activar sitio - Do you really want to delete "{0}"? This action cannot be undone. + Do you really want to delete "{0}"? This action cannot be undone. ¿Seguro que quieres eliminar "{0}"? Esta acción no se puede deshacer. - Yes, delete the site + Yes, delete the site Si, elimine este sitio - Import a site + Import a site Importar un sitio - Select a site package + Select a site package Seleccionar sitio del paquete - No site packages are available. Make sure you have an active site package. + No site packages are available. Make sure you have an active site package. No hay sitios de paquetes disponibles. Asegúrese de que usted tiene un sitio de paquete activo. - Create a blank site + Create a blank site Crear un sitio en blanco - Select a document nodeType + Select a document nodeType Selecciona el tipo de documento nodoTipo - Select a site generator + Select a site generator Seleccione un generador de sitios - Site name + Site name Nombre del sitio - Create empty site + Create empty site Crear un sitio vacío - Create a new site package + Create a new site package Crear un nuevo sitio de paquete - VendorName.MyPackageKey + VendorName.MyPackageKey VendorName.MyPackageKey - No sites available + No sites available No hay sitios disponibles - The <em>Neos Kickstarter</em> package is not installed, install it to kickstart new sites. + The <em>Neos Kickstarter</em> package is not installed, install it to kickstart new sites. El paquete<em>Kickstarter de Neos</em> no está instalado, instálelo para iniciar los nuevos sitios. - New site + New site Nuevo sitio - Do you really want to delete "{0}"? This action cannot be undone. + Do you really want to delete "{0}"? This action cannot be undone. ¿Seguro que quieres eliminar "{0}"? Esta acción no se puede deshacer. - New domain + New domain Nuevo dominio - Edit domain + Edit domain Editar dominio - Domain data + Domain data Datos del dominio - e.g. www.neos.io + e.g. www.neos.io Por ejemplo, www.neos.io - State + State Estado - Create + Create Crear - Configuration + Configuration Configuración - The Configuration module provides you with an overview of all configuration types. + The Configuration module provides you with an overview of all configuration types. El módulo de configuración le proporciona una visión general de todos los tipos de configuración. - Dimensions + Dimensions Dimensiones - Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions. + Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions. Concede un resumen gráfico sobre los respaldos configurados dentro de cada dimensión de contenido y en las dimensiones contenidas. - Inter dimensional fallback graph + Inter dimensional fallback graph Gráfico suplente inter dimensional - Inter dimensional + Inter dimensional Interdimensional - The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes). + The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes). Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity. Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter. El gráfico de respaldo interdimensional muestra todos los posibles respaldos (mostrados como bordes) entre subgráficos (combinaciones de valores de dimensión de contenido, mostrados como nodos). @@ -809,416 +811,416 @@ Los recursos alternativos primarios están marcados en azul y siempre visibles, Haga clic en uno de los nodos para ver solo sus alternativas y variantes. Haga clic de nuevo para eliminar el filtro. - Intra dimensional fallback graph + Intra dimensional fallback graph Gráfico Intradimensional de respaldo - Intra dimensional + Intra dimensional Interdimensional - The intra dimensional fallback graph displays fallbacks within each content dimension. + The intra dimensional fallback graph displays fallbacks within each content dimension. El gráfico intradimensional de respaldo muestra suplencias dentro de cada dimensión de contenido. - User + User Usuario - User Settings + User Settings Configuración de usuario - This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system. + This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system. Este módulo permite personalizar tu perfil de usuario del backend. Aquí puede cambiar su idioma activo, nombre y dirección de email. También puede configurar otras características generales del sistema. - Edit + Edit Editar - Edit + Edit Editar - New electronic address + New electronic address Nueva dirección electrónica - Edit account + Edit account Editar cuenta - Personal Data + Personal Data Datos de carácter personal - User Data + User Data Datos de usuario - User Menu + User Menu Menú de usuario - User Preferences + User Preferences Preferencias de usuario - Interface Language + Interface Language Idioma de la interfaz - Use system default + Use system default Utilizar valores predeterminados del sistema - Accounts + Accounts Cuentas - Username + Username Nombre de usuario - Roles + Roles Roles - Authentication Provider + Authentication Provider Proveedor de autenticación - Electronic addresses + Electronic addresses Direcciones electrónicas - Do you really want to delete + Do you really want to delete Realmente quiere borrar - Yes, delete electronic address + Yes, delete electronic address Sí, eliminar correo electrónico - Click to add a new Electronic address + Click to add a new Electronic address Haga clic para agregar una nueva dirección electrónica - Add electronic address + Add electronic address Agregar dirección electrónica - Save User + Save User Guardar usuario - Edit User + Edit User Editar usuario - An error occurred during validation of the configuration. + An error occurred during validation of the configuration. Se ha producido un error durante la validación de la configuración. - Configuration type not found. + Configuration type not found. No se encuentra el tipo de configuración. - Site package not found + Site package not found No se encuentra el paquete del sitio - The site package with key "{0}" was not found. + The site package with key "{0}" was not found. No se ha encontrado el paquete de sitio con la clave "{0}". - Update + Update Actualizar - The site "{0}" has been updated. + The site "{0}" has been updated. El sitio "{0}" ha sido actualizado. - Missing Package + Missing Package Paquete perdido - The package "{0}" is required to create new site packages. + The package "{0}" is required to create new site packages. El paquete "{0}" es necesario para crear nuevos paquetes para el sitio. - Invalid package key + Invalid package key Clave del paquete no válida - The package key "{0}" already exists. + The package key "{0}" already exists. La clave de paquete "{0}" ya existe. - Site package {0} was created. + Site package {0} was created. Se ha creado el paquete de sitio {0}. - The site has been imported. + The site has been imported. El sitio ha sido importado. - Import error + Import error Error al importar - Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1} + Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1} Error: Durante la importación de "Sites.xml" del paquete "{0}" se ha producido una excepción: {1} - Site creation error + Site creation error Error en la creación de la página - Error: A site with siteNodeName "{0}" already exists + Error: A site with siteNodeName "{0}" already exists Error: Ya existe una página con siteNodeName "{0}" - Site creation error + Site creation error Error al crear la página - Error: The given node type "{0}" was not found + Error: The given node type "{0}" was not found Error: No se ha encontrado el tipo de nodo "{0}" - Site creation error + Site creation error Error en la creación de la página - Error: The given node type "%s" is not based on the superType "{0}" + Error: The given node type "%s" is not based on the superType "{0}" Error: El tipo de nodo especificado "%s" no está basado en el supertipo "{0}" - Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}" + Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}" Creado con éxito el sitio "{0}" con siteNode "{1}", type "{2}" y packageKey "{3}" - Site deleted + Site deleted Página eliminada - The site "{0}" has been deleted. + The site "{0}" has been deleted. La página "{0}" ha sido eliminada. - Site activated + Site activated Página activada - The site "{0}" has been activated. + The site "{0}" has been activated. La página "{0}" ha sido activada. - Site deactivated + Site deactivated Página desactivada - The site "{0}" has been deactivated. + The site "{0}" has been deactivated. La página "{0}" ha sido desarrollada. - Domain updated + Domain updated Dominio actualizado - The domain "{0}" has been updated. + The domain "{0}" has been updated. El dominio "{0}" ha sido actualizado. - Domain created + Domain created Dominio creado - The domain "{0}" has been created. + The domain "{0}" has been created. Se ha creado el dominio "{0}". - Domain deleted + Domain deleted Dominio eliminado - The domain "{0}" has been deleted. + The domain "{0}" has been deleted. El dominio "{0}" ha sido eliminado. - Domain activated + Domain activated Dominio activado - The domain "{0}" has been activated. + The domain "{0}" has been activated. El dominio "{0}" ha sido activado. - Domain deactivated + Domain deactivated Dominio desactivado - The domain "{0}" has been deactivated. + The domain "{0}" has been deactivated. El dominio "{0}" ha sido desactivado. - User created + User created Usuario creado - The user "{0}" has been created. + The user "{0}" has been created. Se ha creado el usuario "{0}". - User creation denied + User creation denied Creación del usuario denegada - You are not allowed to create a user with roles "{0}". + You are not allowed to create a user with roles "{0}". No puede crear un usuario con el rol "{0}". - Unable to create user. + Unable to create user. No se puede crear el usuario. - User editing denied + User editing denied Edición del usuario denegada - Not allowed to edit the user "{0}". + Not allowed to edit the user "{0}". No se permite editar el usuario "{0}". - User updated + User updated Usuario actualizado - The user "{0}" has been updated. + The user "{0}" has been updated. El usuario "{0}" ha sido actualizado. - User editing denied + User editing denied Edición del usuario denegada - Not allowed to delete the user "{0}". + Not allowed to delete the user "{0}". No se permite eliminar al usuario "{0}". - Current user cannot be deleted + Current user cannot be deleted El usuario actual no puede ser eliminado - You cannot delete the currently logged in user + You cannot delete the currently logged in user No puede eliminar al usuario conectado actualmente - User deleted + User deleted Usuario eliminado - The user "{0}" has been deleted. + The user "{0}" has been deleted. El usuario "{0}" ha sido eliminado. - User account editing denied + User account editing denied Edición de la cuenta del usuario denegada - Not allowed to edit the account for the user "{0}". + Not allowed to edit the account for the user "{0}". No se permite editar la cuenta del usuario "{0}". - Don\'t lock yourself out + Don\'t lock yourself out No te quedes fuera - With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles! + With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles! Con los roles seleccionados, el usuario actualmente conectado ya no tendría acceso a este módulo. ¡Por favor ajuste los roles asignados! - Account updated + Account updated Cuenta actualizada - The account has been updated. + The account has been updated. La cuenta ha sido actualizada. - User email editing denied + User email editing denied Edición del correo electrónico del usuario denegada - Not allowed to create an electronic address for the user "{0}". + Not allowed to create an electronic address for the user "{0}". No se permite crear una dirección electrónica para el usuario "{0}". - Electronic address added + Electronic address added Dirección electrónica añadida - An electronic address "{0}" ({1}) has been added. + An electronic address "{0}" ({1}) has been added. Se ha añadido una dirección electrónica "{0}" ({1}). - User email deletion denied + User email deletion denied Denegada la eliminación del correo electrónico del usuario - Not allowed to delete an electronic address for the user "{0}". + Not allowed to delete an electronic address for the user "{0}". No se permite eliminar una dirección electrónica para el usuario "{0}". - Electronic address removed + Electronic address removed Dirección electrónica eliminada - The electronic address "{0}" ({1}) has been deleted for "{2}". + The electronic address "{0}" ({1}) has been deleted for "{2}". La dirección electrónica "{0}" ({1}) ha sido suprimida para "{2}". - User updated + User updated Usuario actualizado - Your user has been updated. + Your user has been updated. Tu usuario ha sido actualizado. - Updating password failed + Updating password failed Error al actualizar la contraseña - Updating password failed + Updating password failed Error al actualizar la contraseña - Password updated + Password updated Contraseña actualizada - The password has been updated. + The password has been updated. La contraseña ha sido actualizada. - Edit User + Edit User Editar usuario - An electronic address "{0}" ({1}) has been added. + An electronic address "{0}" ({1}) has been added. Se ha añadido una dirección electrónica "{0}" ({1}). - Electronic address removed + Electronic address removed Dirección electrónica eliminada - The electronic address "{0}" ({1}) has been deleted for "{2}". + The electronic address "{0}" ({1}) has been deleted for "{2}". La dirección electrónica "{0}" ({1}) ha sido suprimida para "{2}". @@ -1226,21 +1228,33 @@ Haga clic en uno de los nodos para ver solo sus alternativas y variantes. Haga c Seleccionar todos los cambios actuales - Last Login + Last Login Última conexión - Contains modules related to management of users + Contains modules related to management of users Contiene módulos relacionados con la gestión de usuarios - Do you really want to discard the selected changes in the "{0}" workspace? + Do you really want to discard the selected changes in the "{0}" workspace? ¿Realmente deseas descartar los cambios seleccionados en el espacio de trabajo "{0}"? - Publish selected changes to {0} + Publish selected changes to {0} Publica los cambios seleccionados en {0} + + Sort by last login + Ordenar por última conexión + + + Sort by first and last name + Ordenar por nombre y apellidos + + + Sort by user accounts and roles + Ordenar por cuentas de usuario y funciones + diff --git a/Neos.Neos/Resources/Private/Translations/es/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/es/NodeTypes/Timable.xlf deleted file mode 100644 index 340e8367d84..00000000000 --- a/Neos.Neos/Resources/Private/Translations/es/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - Ocultar antes de - - Hide after - Ocultar después de - - - diff --git a/Neos.Neos/Resources/Private/Translations/fi/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/fi/NodeTypes/Timable.xlf deleted file mode 100644 index 4a478311924..00000000000 --- a/Neos.Neos/Resources/Private/Translations/fi/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - Piilota ennen - - Hide after - Piilota jälkeen - - - diff --git a/Neos.Neos/Resources/Private/Translations/fr/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/fr/NodeTypes/Timable.xlf deleted file mode 100644 index c166421d361..00000000000 --- a/Neos.Neos/Resources/Private/Translations/fr/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - Cacher avant - - Hide after - Cacher après - - - diff --git a/Neos.Neos/Resources/Private/Translations/hu/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/hu/NodeTypes/Timable.xlf deleted file mode 100644 index 414ebf4759f..00000000000 --- a/Neos.Neos/Resources/Private/Translations/hu/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - Elrejtés előtte - - Hide after - Elrejtés utána - - - diff --git a/Neos.Neos/Resources/Private/Translations/id_ID/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/id_ID/NodeTypes/Timable.xlf deleted file mode 100644 index 09ab3da96c0..00000000000 --- a/Neos.Neos/Resources/Private/Translations/id_ID/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - Sembunyikan sebelum - - Hide after - Sembunyikan setelah - - - diff --git a/Neos.Neos/Resources/Private/Translations/it/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/it/NodeTypes/Timable.xlf deleted file mode 100644 index 1c95b77d2ca..00000000000 --- a/Neos.Neos/Resources/Private/Translations/it/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - Nascondi prima di - - Hide after - Nascondi dopo - - - diff --git a/Neos.Neos/Resources/Private/Translations/ja/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/ja/NodeTypes/Timable.xlf deleted file mode 100644 index 59b14c57ee4..00000000000 --- a/Neos.Neos/Resources/Private/Translations/ja/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - Hide before - - Hide after - Hide after - - - diff --git a/Neos.Neos/Resources/Private/Translations/km/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/km/NodeTypes/Timable.xlf deleted file mode 100644 index 6f931df6d92..00000000000 --- a/Neos.Neos/Resources/Private/Translations/km/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - បាំង​មុន​ - - Hide after - លាក់តាមក្រោយ - - - diff --git a/Neos.Neos/Resources/Private/Translations/lv/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/lv/NodeTypes/Timable.xlf deleted file mode 100644 index 1f29ec0eed4..00000000000 --- a/Neos.Neos/Resources/Private/Translations/lv/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - Paslēpt pirms - - Hide after - Paslēpt pēc - - - diff --git a/Neos.Neos/Resources/Private/Translations/nl/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/nl/NodeTypes/Timable.xlf deleted file mode 100644 index 6107a6d87cd..00000000000 --- a/Neos.Neos/Resources/Private/Translations/nl/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - Verberg voor - - Hide after - Verberg na - - - diff --git a/Neos.Neos/Resources/Private/Translations/no/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/no/NodeTypes/Timable.xlf deleted file mode 100644 index 6c70c0d34a6..00000000000 --- a/Neos.Neos/Resources/Private/Translations/no/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - Skjul før - - Hide after - Skjul etter - - - diff --git a/Neos.Neos/Resources/Private/Translations/pl/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/pl/NodeTypes/Timable.xlf deleted file mode 100644 index 8aac4f01d99..00000000000 --- a/Neos.Neos/Resources/Private/Translations/pl/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - Ukryj przed - - Hide after - Ukryj po - - - diff --git a/Neos.Neos/Resources/Private/Translations/pt/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/pt/NodeTypes/Timable.xlf deleted file mode 100644 index 2df84924a91..00000000000 --- a/Neos.Neos/Resources/Private/Translations/pt/NodeTypes/Timable.xlf +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Hide before - Esconder antes - - - Hide after - Esconder depois - - - - diff --git a/Neos.Neos/Resources/Private/Translations/pt_BR/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/pt_BR/NodeTypes/Timable.xlf deleted file mode 100644 index b5cec09a0a8..00000000000 --- a/Neos.Neos/Resources/Private/Translations/pt_BR/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - Esconder antes - - Hide after - Esconder depois - - - diff --git a/Neos.Neos/Resources/Private/Translations/ru/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/ru/NodeTypes/Timable.xlf deleted file mode 100644 index f44568c43c6..00000000000 --- a/Neos.Neos/Resources/Private/Translations/ru/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - Скрыть перед - - Hide after - Скрыть после - - - diff --git a/Neos.Neos/Resources/Private/Translations/sr/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/sr/NodeTypes/Timable.xlf deleted file mode 100644 index e8521206e8f..00000000000 --- a/Neos.Neos/Resources/Private/Translations/sr/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - Сакриј пре - - Hide after - Сакриј после - - - diff --git a/Neos.Neos/Resources/Private/Translations/sv/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/sv/NodeTypes/Timable.xlf deleted file mode 100644 index c82055b6a57..00000000000 --- a/Neos.Neos/Resources/Private/Translations/sv/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - Dölj före - - Hide after - Dölj efter - - - diff --git a/Neos.Neos/Resources/Private/Translations/tl_PH/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/tl_PH/NodeTypes/Timable.xlf deleted file mode 100644 index 848fcb2c125..00000000000 --- a/Neos.Neos/Resources/Private/Translations/tl_PH/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - Itago bago - - Hide after - Itago pakatapos - - - diff --git a/Neos.Neos/Resources/Private/Translations/tr/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/tr/NodeTypes/Timable.xlf deleted file mode 100644 index cfcc8ee7420..00000000000 --- a/Neos.Neos/Resources/Private/Translations/tr/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - Öncesini gizle - - Hide after - Sonrasını gizle - - - diff --git a/Neos.Neos/Resources/Private/Translations/uk/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/uk/NodeTypes/Timable.xlf deleted file mode 100644 index 26b10035a73..00000000000 --- a/Neos.Neos/Resources/Private/Translations/uk/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - Приховати до - - Hide after - Приховати після - - - diff --git a/Neos.Neos/Resources/Private/Translations/vi/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/vi/NodeTypes/Timable.xlf deleted file mode 100644 index d28367676f7..00000000000 --- a/Neos.Neos/Resources/Private/Translations/vi/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - Ẩn trước khi - - Hide after - Ẩn sau khi - - - diff --git a/Neos.Neos/Resources/Private/Translations/zh/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/zh/NodeTypes/Timable.xlf deleted file mode 100644 index e1b697eb21a..00000000000 --- a/Neos.Neos/Resources/Private/Translations/zh/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - 隐藏前面的元素 - - Hide after - 隐藏后面的元素 - - - diff --git a/Neos.Neos/Resources/Private/Translations/zh_TW/NodeTypes/Timable.xlf b/Neos.Neos/Resources/Private/Translations/zh_TW/NodeTypes/Timable.xlf deleted file mode 100644 index add2106ad89..00000000000 --- a/Neos.Neos/Resources/Private/Translations/zh_TW/NodeTypes/Timable.xlf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Hide before - 在之前隱藏 - - Hide after - 於之後隱藏 - - - diff --git a/Neos.Neos/Tests/Functional/Fusion/NodeHelperTest.php b/Neos.Neos/Tests/Functional/Fusion/NodeHelperTest.php index 08a59dd2c37..203a0013ef8 100644 --- a/Neos.Neos/Tests/Functional/Fusion/NodeHelperTest.php +++ b/Neos.Neos/Tests/Functional/Fusion/NodeHelperTest.php @@ -119,7 +119,7 @@ protected function buildView() protected function setUp(): void { - $this->markTestSkipped('Skipped until we find a better way to mock node read models (see https://github.com/neos/neos-development-collection/issues/4317)'); + $this->markTestSkipped('Skipped. Either migrate to behat or find a better way to mock node read models. See https://github.com/neos/neos-development-collection/issues/4317'); parent::setUp(); $nodeSubjectProvider = new NodeSubjectProvider(); diff --git a/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php b/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php new file mode 100644 index 00000000000..71a262202a9 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php @@ -0,0 +1,81 @@ +timeableNodeVisibilityService->handleExceededNodeDates( + $contentRepositoryId, + $workspaceName + ); + + if (!$quiet) { + $this->output->outputLine(sprintf('Enabled %d nodes with exceeded timed dates.', $handlingResult->countByType(ChangedVisibilityType::NODE_WAS_ENABLED))); + foreach ($handlingResult->getByType(ChangedVisibilityType::NODE_WAS_ENABLED) as $result) { + $this->output->outputLine(sprintf( + '- NodeAggregateId: %s, DimensionSpacePoint: %s, Label: %s', + $result->node->nodeAggregateId->value, + join(',', $result->node->originDimensionSpacePoint->coordinates), + $result->node->getLabel() + ) + ); + } + + $this->output->outputLine(sprintf('Disabled %d nodes with exceeded timed dates.', $handlingResult->countByType(ChangedVisibilityType::NODE_WAS_DISABLED))); + foreach ($handlingResult->getByType(ChangedVisibilityType::NODE_WAS_DISABLED) as $result) { + $this->output->outputLine(sprintf( + '- NodeAggregateId: %s, DimensionSpacePoint: %s, Label: %s', + $result->node->nodeAggregateId->value, + join(',', $result->node->originDimensionSpacePoint->coordinates), + $result->node->getLabel() + ) + ); + } + } + } + + /** + * Run the execute command as daemon. + * + * @param string $contentRepository The content repository identifier. (Default: 'default') + * @param int $ttl The time to live for the daemon in seconds. Set to '0' for infinite. (Default: '900') + * @param int $interval Interval in seconds, when the command has to get executed. (Default: '60') + * @param bool $quiet Set to false if you need a more verbose output. (Default: 'true') + */ + public function runDaemonCommand(string $contentRepository = 'default', int $ttl = 900, int $interval = 60, bool $quiet = true): void + { + $startTime = microtime(true); + while (true) { + $this->executeCommand($contentRepository, $quiet); + + $currentTime = microtime(true) - $startTime; + if ($ttl !== 0 && $currentTime + $interval >= $ttl) { + break; + } + + if (!$quiet) { + $this->outputLine(sprintf('Wait for %d seconds before next run (%d/%d).', $interval, $currentTime, $ttl)); + } + sleep($interval); + } + + if (!$quiet) { + $this->outputLine(sprintf('Finished after %f seconds.', $currentTime)); + } + } +} diff --git a/Neos.TimeableNodeVisibility/Classes/Domain/ChangedVisibilities.php b/Neos.TimeableNodeVisibility/Classes/Domain/ChangedVisibilities.php new file mode 100644 index 00000000000..4e64be4ea52 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Classes/Domain/ChangedVisibilities.php @@ -0,0 +1,32 @@ +results = $results; + } + + public function countByType(ChangedVisibilityType $result): int + { + return count($this->getByType($result)); + } + + /** + * @return array + */ + public function getByType(ChangedVisibilityType $result): array + { + return array_filter($this->results, fn ($handlingResult) => $handlingResult->type === $result); + } +} diff --git a/Neos.TimeableNodeVisibility/Classes/Domain/ChangedVisibility.php b/Neos.TimeableNodeVisibility/Classes/Domain/ChangedVisibility.php new file mode 100644 index 00000000000..e25a42d48a8 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Classes/Domain/ChangedVisibility.php @@ -0,0 +1,27 @@ +contentRepositoryRegistry->get($contentRepositoryId); + $liveWorkspace = $contentRepository->getWorkspaceFinder()->findOneByName($workspaceName); + if ($liveWorkspace === null) { + throw WorkspaceDoesNotExist::butWasSupposedTo($workspaceName); + } + $nodeHiddenStateFinder = $contentRepository->projectionState(NodeHiddenStateFinder::class); + + $now = new \DateTimeImmutable(); + + $nodes = $this->getNodesWithExceededDates($contentRepository, $liveWorkspace, $now); + $results = []; + + foreach ($nodes as $node) { + $nodeIsHidden = $this->isHidden($node, $nodeHiddenStateFinder); + if ($this->needsEnabling($node, $now) && $nodeIsHidden) { + $contentRepository->handle( + EnableNodeAggregate::create( + $node->subgraphIdentity->contentStreamId, + $node->nodeAggregateId, + $node->subgraphIdentity->dimensionSpacePoint, + NodeVariantSelectionStrategy::STRATEGY_ALL_SPECIALIZATIONS + ) + ); + + $results[] = $result = ChangedVisibility::createForNodeWasEnabled($node); + $this->logResult($result); + + } + if ($this->needsDisabling($node, $now) && !$nodeIsHidden) { + $contentRepository->handle( + DisableNodeAggregate::create( + $node->subgraphIdentity->contentStreamId, + $node->nodeAggregateId, + $node->subgraphIdentity->dimensionSpacePoint, + NodeVariantSelectionStrategy::STRATEGY_ALL_SPECIALIZATIONS + ) + ); + + $results[] = $result = ChangedVisibility::createForNodeWasDisabled($node); + $this->logResult($result); + } + } + return new ChangedVisibilities(...$results); + } + + /** + * @return \Generator + */ + private function getNodesWithExceededDates(ContentRepository $contentRepository, Workspace $liveWorkspace, \DateTimeImmutable $now): \Generator + { + $dimensionSpacePoints = $contentRepository->getVariationGraph()->getDimensionSpacePoints(); + + foreach ($dimensionSpacePoints as $dimensionSpacePoint) { + + $contentGraph = $contentRepository->getContentGraph(); + + // We fetch without restriction to get also all disabled nodes + $subgraph = $contentGraph->getSubgraph( + $liveWorkspace->currentContentStreamId, + $dimensionSpacePoint, + VisibilityConstraints::withoutRestrictions() + ); + + $sitesNodeTypeName = NodeTypeName::fromString('Neos.Neos:Sites'); + $rootNode = $subgraph->findRootNodeByType($sitesNodeTypeName); + if ($rootNode === null) { + throw RootNodeAggregateDoesNotExist::butWasExpectedTo($sitesNodeTypeName); + } + + $nodes = $subgraph->findDescendantNodes( + $rootNode->nodeAggregateId, + FindDescendantNodesFilter::create( + nodeTypes: NodeTypeCriteria::createWithAllowedNodeTypeNames(NodeTypeNames::fromStringArray(['Neos.TimeableNodeVisibility:Timeable'])), + propertyValue: OrCriteria::create( + PropertyValueLessThanOrEqual::create(PropertyName::fromString('enableAfterDateTime'), $now->format(\DateTime::RFC3339)), + PropertyValueLessThanOrEqual::create(PropertyName::fromString('disableAfterDateTime'), $now->format(\DateTime::RFC3339)), + ) + + ) + ); + + foreach ($nodes as $node) { + + if (!$node->originDimensionSpacePoint->equals($dimensionSpacePoint)) { + // The node will be enabled by node in origin dimension space-point + continue; + } + + yield $node; + } + } + } + + private function isHidden(Node $node, NodeHiddenStateFinder $nodeHiddenStateFinder): bool + { + return $nodeHiddenStateFinder->findHiddenState( + $node->subgraphIdentity->contentStreamId, + $node->subgraphIdentity->dimensionSpacePoint, + $node->nodeAggregateId + )->isHidden; + } + + private function needsEnabling(Node $node, \DateTimeImmutable $now): bool + { + return $node->hasProperty('enableAfterDateTime') + && $node->getProperty('enableAfterDateTime') != null + && $node->getProperty('enableAfterDateTime') < $now + && ( + !$node->hasProperty('disableAfterDateTime') + || $node->getProperty('disableAfterDateTime') == null + || $node->getProperty('disableAfterDateTime') > $now + || $node->getProperty('disableAfterDateTime') < $node->getProperty('enableAfterDateTime') + ); + } + + private function needsDisabling(Node $node, \DateTimeImmutable $now): bool + { + return $node->hasProperty('disableAfterDateTime') + && $node->getProperty('disableAfterDateTime') != null + && $node->getProperty('disableAfterDateTime') < $now + && ( + !$node->hasProperty('enableAfterDateTime') + || $node->getProperty('enableAfterDateTime') == null + || $node->getProperty('enableAfterDateTime') > $now + || $node->getProperty('enableAfterDateTime') <= $node->getProperty('disableAfterDateTime') + ); + } + + private function logResult(ChangedVisibility $result): void + { + $this->logger->info( + sprintf('Timed node visibility: %s node [NodeAggregateId: %s, DimensionSpacePoints: %s]: %s', + $result->type->value, + $result->node->nodeAggregateId->value, + join(',', $result->node->originDimensionSpacePoint->coordinates), + $result->node->getLabel()) + ); + } +} diff --git a/Neos.TimeableNodeVisibility/Configuration/Settings.yaml b/Neos.TimeableNodeVisibility/Configuration/Settings.yaml new file mode 100644 index 00000000000..13ddd356f14 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Configuration/Settings.yaml @@ -0,0 +1,10 @@ +Neos: + Neos: + fusion: + autoInclude: + Neos.TimeableNodeVisibility: true + userInterface: + translation: + autoInclude: + Neos.TimeableNodeVisibility: + - 'NodeTypes/*' diff --git a/Neos.TimeableNodeVisibility/LICENSE b/Neos.TimeableNodeVisibility/LICENSE new file mode 100644 index 00000000000..10926e87f11 --- /dev/null +++ b/Neos.TimeableNodeVisibility/LICENSE @@ -0,0 +1,675 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. + diff --git a/Neos.TimeableNodeVisibility/NodeTypes/Mixin/Timeable.yaml b/Neos.TimeableNodeVisibility/NodeTypes/Mixin/Timeable.yaml new file mode 100644 index 00000000000..6505b90b0c4 --- /dev/null +++ b/Neos.TimeableNodeVisibility/NodeTypes/Mixin/Timeable.yaml @@ -0,0 +1,34 @@ +# Timeable Mixin +'Neos.TimeableNodeVisibility:Timeable': + abstract: true + ui: + inspector: + groups: + visibility: + label: 'Neos.Neos:Inspector:groups.visibility' + icon: 'icon-eye' + position: 100 + tab: meta + properties: + enableAfterDateTime: + type: DateTime + ui: + label: i18n + inspector: + group: 'visibility' + position: 10 + editorOptions: + format: 'd-m-Y H:i' + validation: + 'Neos.Neos/Validation/DateTimeValidator': [] + disableAfterDateTime: + type: DateTime + ui: + label: i18n + inspector: + group: 'visibility' + position: 20 + editorOptions: + format: 'd-m-Y H:i' + validation: + 'Neos.Neos/Validation/DateTimeValidator': [] diff --git a/Neos.TimeableNodeVisibility/NodeTypes/Override/Content.yaml b/Neos.TimeableNodeVisibility/NodeTypes/Override/Content.yaml new file mode 100644 index 00000000000..ba164430b33 --- /dev/null +++ b/Neos.TimeableNodeVisibility/NodeTypes/Override/Content.yaml @@ -0,0 +1,3 @@ +'Neos.Neos:Content': + superTypes: + 'Neos.TimeableNodeVisibility:Timeable': true diff --git a/Neos.TimeableNodeVisibility/NodeTypes/Override/Document.yaml b/Neos.TimeableNodeVisibility/NodeTypes/Override/Document.yaml new file mode 100644 index 00000000000..9c3744e8671 --- /dev/null +++ b/Neos.TimeableNodeVisibility/NodeTypes/Override/Document.yaml @@ -0,0 +1,3 @@ +'Neos.Neos:Document': + superTypes: + 'Neos.TimeableNodeVisibility:Timeable': true diff --git a/Neos.TimeableNodeVisibility/Readme.rst b/Neos.TimeableNodeVisibility/Readme.rst new file mode 100644 index 00000000000..1ef7e21921b --- /dev/null +++ b/Neos.TimeableNodeVisibility/Readme.rst @@ -0,0 +1,92 @@ +------------------------------------ +The Timeable Node Visibility package +------------------------------------ + +.. note:: This repository is a **read-only subsplit** of a package that is part of the + Neos project (learn more on `www.neos.io `_). + +If you want to use Neos, please have a look at the `Neos documentation `_ + + + +Documentation +------------- + +The Timeable Node Visibility package allows you to activate or deactivate nodes at a specific time. + +Adding the ``Neos.TimeableNodeVisibility:Timeable`` nodetype mixin as superType to your nodetype definition will enable +the feature for your nodetype. The mixin will add the two properties ``enableAfterDateTime`` and ``disableAfterDateTime`` +to configure, when your nodetype has to be enabled or disabled. + +NodeType Mixin: + - ``Neos.TimeableNodeVisibility:Timeable`` + +Properties: + - ``enableAfterDateTime`` (DateTime) + - ``disableAfterDateTime`` (DateTime) + +Per default the mixin is already applied to following nodetypes: + - ``Neos.Neos:Document`` + - ``Neos.Neos:Content`` + +An asynchronous job in background is (see: `Run the background job`_) checking if a node need to be enabled or disabled +an will execute that as a command in the ContentRepository. + +Install Package +=============== + +You can install the package with composer. + +.. code-block:: bash + + composer require neos/timeable-node-visibility + +Run the background job +====================== + +There are two ways of running the background job. Each way uses a dedicated command, provided by the package. + +1. **Run in a cronjob periodically** each minute / each five minutes. The command stops after each run and need to get +re-executed in your favorite time frame. + +.. code-block:: + + COMMAND: + neos.timeablenodevisibility:timeablenodevisibility:execute + + USAGE: + ./flow timeablenodevisibility:execute [] + + OPTIONS: + --content-repository contentRepository + --quiet quiet + + +2. **Run as daemon** for a longer period. The command keeps running for the given time (--ttl) and checks every interval +(--interval) for new nodes to enable or disable. + +.. code-block:: + + COMMAND: + neos.timeablenodevisibility:timeablenodevisibility:rundaemon + + USAGE: + ./flow timeablenodevisibility:rundaemon [] + + OPTIONS: + --content-repository The content repository identifier. (Default: 'default') + --ttl The time to live for the daemon in seconds. Set to '0' + for infinite. (Default: '900') + --interval Interval in seconds, when the command has to get + executed. (Default: '60') + --quiet Set to false if you need a more verbose output. + (Default: 'true') + + + +Contribute +---------- + +If you want to contribute to Neos, please have a look at +https://github.com/neos/neos-development-collection - it is the repository +used for development and all pull requests should go into it. \ No newline at end of file diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Fusion/Override/RawContent/NodeHeader.fusion b/Neos.TimeableNodeVisibility/Resources/Private/Fusion/Override/RawContent/NodeHeader.fusion new file mode 100644 index 00000000000..1e39c93f3c2 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Fusion/Override/RawContent/NodeHeader.fusion @@ -0,0 +1,8 @@ +prototype(Neos.Neos:RawContent.NodeHeader) { + visibilityInformations { + enableAfterDateTime = ${'hidden before ' + Date.format(q(node).property('enableAfterDateTime'), 'Y-m-d H:i:s')} + enableAfterDateTime.@if.hasEnableAfterDateTime = ${q(node).property('enableAfterDateTime')} + disableAfterDateTime = ${'hidden after ' + Date.format(q(node).property('disableAfterDateTime'), 'Y-m-d H:i:s')} + disableAfterDateTime.@if.hasDisableAfterDateTime = ${q(node).property('disableAfterDateTime')} + } +} diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Fusion/Root.fusion b/Neos.TimeableNodeVisibility/Resources/Private/Fusion/Root.fusion new file mode 100644 index 00000000000..b190f6bd5a0 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Fusion/Root.fusion @@ -0,0 +1 @@ +include: ./**/*.fusion diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/ar/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/ar/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..d41f3b43dfe --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/ar/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + إخفاء بعد + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/cs/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/cs/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..ea9b96f878d --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/cs/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + Skrýt po + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/da/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/da/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..aef8281f6bf --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/da/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + Skjul efter + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/de/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/de/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..60fa086f613 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/de/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Anzeigen nach + + Hide after + Verstecken nach + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/el/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/el/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..eb93576c46c --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/el/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + Hide after + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/en/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/en/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..7a9d27f15a1 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/en/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + + + Hide after + + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/es/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/es/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..3663c6ccb71 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/es/NodeTypes/Timeable.xlf @@ -0,0 +1,15 @@ + + + + + + Show after + Mostrar después + + + Hide after + Ocultar después de + + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/fi/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/fi/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..53dcf86c8a5 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/fi/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + Piilota jälkeen + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/fr/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/fr/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..c8aa230aaf8 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/fr/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + Cacher après + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/hu/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/hu/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..11ea96ded4f --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/hu/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + Elrejtés utána + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/id_ID/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/id_ID/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..67b5d2eed96 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/id_ID/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + Sembunyikan setelah + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/it/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/it/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..73e1569614c --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/it/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + Nascondi dopo + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/ja/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/ja/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..4b5ea5ae5cb --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/ja/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + Hide after + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/km/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/km/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..f720ec2912d --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/km/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + លាក់តាមក្រោយ + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/lv/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/lv/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..2483a9c5595 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/lv/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + Paslēpt pēc + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/nl/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/nl/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..8c777ce0ef0 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/nl/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + Verberg na + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/no/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/no/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..04f0497bb58 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/no/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + Skjul etter + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/pl/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/pl/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..4f9ddbd8482 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/pl/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + Ukryj po + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/pt/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/pt/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..5a0d9a93cfa --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/pt/NodeTypes/Timeable.xlf @@ -0,0 +1,14 @@ + + + + + + Show after + Show after + + Hide after + Esconder depois + + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/pt_BR/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/pt_BR/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..654d91fc886 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/pt_BR/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + Esconder depois + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/ru/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/ru/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..9cac5a6bc4a --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/ru/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + Скрыть после + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/sr/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/sr/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..3c598b0a5d0 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/sr/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + Сакриј после + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/sv/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/sv/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..2d58d49cdd8 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/sv/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + Dölj efter + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/tl_PH/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/tl_PH/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..9ca61d63cf7 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/tl_PH/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + Itago pakatapos + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/tr/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/tr/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..45e81cc388e --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/tr/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + Sonrasını gizle + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/uk/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/uk/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..1531ab8b16c --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/uk/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + Приховати після + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/vi/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/vi/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..ca4397bd903 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/vi/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + Ẩn sau khi + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/zh/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/zh/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..887c6b04531 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/zh/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + 隐藏后面的元素 + + + diff --git a/Neos.TimeableNodeVisibility/Resources/Private/Translations/zh_TW/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/zh_TW/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..8977543cbc2 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/zh_TW/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + Hide after + 於之後隱藏 + + + diff --git a/Neos.TimeableNodeVisibility/Tests/Behavior/Bootstrap/FeatureContext.php b/Neos.TimeableNodeVisibility/Tests/Behavior/Bootstrap/FeatureContext.php new file mode 100644 index 00000000000..64020879f1b --- /dev/null +++ b/Neos.TimeableNodeVisibility/Tests/Behavior/Bootstrap/FeatureContext.php @@ -0,0 +1,95 @@ +contentRepositoryRegistry = $this->getObject(ContentRepositoryRegistry::class); + + $this->setupCRTestSuiteTrait(); + } + + /** + * @When I handle exceeded node dates + */ + public function iHandleExceededNodeDates(): void + { + $service = $this->getObject(TimeableNodeVisibilityService::class); + $service->handleExceededNodeDates( + $this->currentContentRepository->id, + WorkspaceName::forLive() + ); + } + + /** + * @Then I expect this node to be :state + */ + public function iExpectThisNodeToBeState(string $state): void + { + $hiddenState = $this->currentContentRepository->projectionState(NodeHiddenStateFinder::class) + ->findHiddenState( + $this->currentContentStreamId, + $this->currentDimensionSpacePoint, + $this->currentNode->nodeAggregateId + ); + if ($hiddenState->isHidden === false && $state != "enabled" + || + $hiddenState->isHidden === true && $state != "disabled" + ) { + Assert::fail('Node has not the expected state'); + } + + } + + protected function getContentRepositoryService( + ContentRepositoryServiceFactoryInterface $factory + ): ContentRepositoryServiceInterface { + return $this->contentRepositoryRegistry->buildService( + $this->currentContentRepository->id, + $factory + ); + } + + protected function createContentRepository( + ContentRepositoryId $contentRepositoryId + ): ContentRepository { + $this->contentRepositoryRegistry->resetFactoryInstance($contentRepositoryId); + $contentRepository = $this->contentRepositoryRegistry->get($contentRepositoryId); + GherkinTableNodeBasedContentDimensionSourceFactory::reset(); + GherkinPyStringNodeBasedNodeTypeManagerFactory::reset(); + + return $contentRepository; + } +} diff --git a/Neos.TimeableNodeVisibility/Tests/Behavior/Features/HandleExceeded.feature b/Neos.TimeableNodeVisibility/Tests/Behavior/Features/HandleExceeded.feature new file mode 100644 index 00000000000..68df45e2731 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Tests/Behavior/Features/HandleExceeded.feature @@ -0,0 +1,392 @@ +@contentrepository +Feature: Simple handling of nodes with exceeded enableAfter and disableAfter datetime properties + + Background: + Given using no content dimensions + And using the following node types: + """yaml + 'Neos.ContentRepository:Root': {} + 'Neos.Neos:Sites': + superTypes: + 'Neos.ContentRepository:Root': true + 'Neos.Neos:Site': {} + 'Neos.TimeableNodeVisibility:Timeable': + properties: + 'disableAfterDateTime': + type: DateTime + 'enableAfterDateTime': + type: DateTime + 'Some.Package:Homepage': + superTypes: + 'Neos.Neos:Site': true + 'Neos.TimeableNodeVisibility:Timeable': true + 'Some.Package:Content': + superTypes: + 'Neos.TimeableNodeVisibility:Timeable': true + + """ + And using identifier "default", I define a content repository + And I am in content repository "default" + And the command CreateRootWorkspace is executed with payload: + | Key | Value | + | workspaceName | "live" | + | newContentStreamId | "cs-identifier" | + And the graph projection is fully up to date + And the command CreateRootNodeAggregateWithNode is executed with payload: + | Key | Value | + | contentStreamId | "cs-identifier" | + | nodeAggregateId | "lady-eleonode-rootford" | + | nodeTypeName | "Neos.Neos:Sites" | + And the graph projection is fully up to date + + + # <===========================|now|===========================> + # -----|Enable|++++++++++++++|+++|+++++++++++++|Disable|----- + Scenario: A enabled node with enableAfter in past and disableAfter in future must stay enabled + When I am in content stream "cs-identifier" and dimension space point {} + And the following CreateNodeAggregateWithNode commands are executed: + | nodeAggregateId | parentNodeAggregateId | nodeTypeName | initialPropertyValues | + | shernode-homes | lady-eleonode-rootford | Some.Package:Homepage | {} | + | duke-of-contentshire | shernode-homes | Some.Package:Content | {"enableAfterDateTime": {"__type": "DateTimeImmutable", "value": "1990-01-01 10:10:10"}, "disableAfterDateTime": {"__type": "DateTimeImmutable", "value": "2030-01-01 10:10:10"}} | + Then I expect node aggregate identifier "duke-of-contentshire" to lead to node cs-identifier;duke-of-contentshire;{} + And I expect exactly 4 events to be published on stream "ContentStream:cs-identifier" + + Then I handle exceeded node dates + And I expect this node to be enabled + And I expect exactly 4 events to be published on stream "ContentStream:cs-identifier" + + # <===========================|now|===========================> + # -----|Enable|++++++++++++++|---|+++++++++++++|Disable|----- + Scenario: A disabled node with enableAfter in past and disableAfter in future must be enabled + When I am in content stream "cs-identifier" and dimension space point {} + And the following CreateNodeAggregateWithNode commands are executed: + | nodeAggregateId | parentNodeAggregateId | nodeTypeName | initialPropertyValues | + | shernode-homes | lady-eleonode-rootford | Some.Package:Homepage | {} | + | duke-of-contentshire | shernode-homes | Some.Package:Content | {"enableAfterDateTime": {"__type": "DateTimeImmutable", "value": "1990-01-01 10:10:10"}, "disableAfterDateTime": {"__type": "DateTimeImmutable", "value": "2030-01-01 10:10:10"}} | + Then I expect node aggregate identifier "duke-of-contentshire" to lead to node cs-identifier;duke-of-contentshire;{} + And the command DisableNodeAggregate is executed with payload: + | Key | Value | + | nodeAggregateId | "duke-of-contentshire" | + | nodeVariantSelectionStrategy | "allVariants" | + And I expect exactly 5 events to be published on stream "ContentStream:cs-identifier" + + Then I handle exceeded node dates + And I expect this node to be enabled + And I expect exactly 6 events to be published on stream "ContentStream:cs-identifier" + + + # <===========================|now|===========================> + # +++++|Disable|-------------|+++|--------------|Enable|+++++ + Scenario: A enabled node with enableAfter in future and disableAfter past in must be disabled + When I am in content stream "cs-identifier" and dimension space point {} + And the following CreateNodeAggregateWithNode commands are executed: + | nodeAggregateId | parentNodeAggregateId | nodeTypeName | initialPropertyValues | + | shernode-homes | lady-eleonode-rootford | Some.Package:Homepage | {} | + | duke-of-contentshire | shernode-homes | Some.Package:Content | {"enableAfterDateTime": {"__type": "DateTimeImmutable", "value": "2030-01-01 10:10:10"},"disableAfterDateTime": {"__type": "DateTimeImmutable", "value": "1990-01-01 10:10:10"}} | + Then I expect node aggregate identifier "duke-of-contentshire" to lead to node cs-identifier;duke-of-contentshire;{} + And I expect exactly 4 events to be published on stream "ContentStream:cs-identifier" + + Then I handle exceeded node dates + And I expect this node to be disabled + And I expect exactly 5 events to be published on stream "ContentStream:cs-identifier" + + # <===========================|now|===========================> + # +++++|Disable|-------------|---|--------------|Enable|+++++ + Scenario: A disabled node with enableAfter in future and disableAfter past in must stay disabled + When I am in content stream "cs-identifier" and dimension space point {} + And the following CreateNodeAggregateWithNode commands are executed: + | nodeAggregateId | parentNodeAggregateId | nodeTypeName | initialPropertyValues | + | shernode-homes | lady-eleonode-rootford | Some.Package:Homepage | {} | + | duke-of-contentshire | shernode-homes | Some.Package:Content | {"enableAfterDateTime": {"__type": "DateTimeImmutable", "value": "2030-01-01 10:10:10"},"disableAfterDateTime": {"__type": "DateTimeImmutable", "value": "1990-01-01 10:10:10"}} | + Then I expect node aggregate identifier "duke-of-contentshire" to lead to node cs-identifier;duke-of-contentshire;{} + And the command DisableNodeAggregate is executed with payload: + | Key | Value | + | nodeAggregateId | "duke-of-contentshire" | + | nodeVariantSelectionStrategy | "allVariants" | + And I expect exactly 5 events to be published on stream "ContentStream:cs-identifier" + + Then I handle exceeded node dates + Then I expect this node to be disabled + And I expect exactly 5 events to be published on stream "ContentStream:cs-identifier" + + + # <===========================|now|===========================> + # ---|Enable|+++|Disable|----|+++|--------------------------- + Scenario: A enabled node with enableAfter and disableAfter in past, but enableAfter before disableAfter must be disabled + When I am in content stream "cs-identifier" and dimension space point {} + And the following CreateNodeAggregateWithNode commands are executed: + | nodeAggregateId | parentNodeAggregateId | nodeTypeName | initialPropertyValues | + | shernode-homes | lady-eleonode-rootford | Some.Package:Homepage | {} | + | duke-of-contentshire | shernode-homes | Some.Package:Content | {"enableAfterDateTime": {"__type": "DateTimeImmutable", "value": "1990-01-01 10:10:10"}, "disableAfterDateTime": {"__type": "DateTimeImmutable", "value": "1995-01-01 10:10:10"}} | + Then I expect node aggregate identifier "duke-of-contentshire" to lead to node cs-identifier;duke-of-contentshire;{} + And I expect exactly 4 events to be published on stream "ContentStream:cs-identifier" + + Then I handle exceeded node dates + And I expect this node to be disabled + And I expect exactly 5 events to be published on stream "ContentStream:cs-identifier" + + # <===========================|now|===========================> + # ---|Enable|+++|Disable|----|---|--------------------------- + Scenario: A disabled node with enableAfter and disableAfter in past, but enableAfter before disableAfter must stay disabled + When I am in content stream "cs-identifier" and dimension space point {} + And the following CreateNodeAggregateWithNode commands are executed: + | nodeAggregateId | parentNodeAggregateId | nodeTypeName | initialPropertyValues | + | shernode-homes | lady-eleonode-rootford | Some.Package:Homepage | {} | + | duke-of-contentshire | shernode-homes | Some.Package:Content | {"enableAfterDateTime": {"__type": "DateTimeImmutable", "value": "1990-01-01 10:10:10"}, "disableAfterDateTime": {"__type": "DateTimeImmutable", "value": "1995-01-01 10:10:10"}} | + Then I expect node aggregate identifier "duke-of-contentshire" to lead to node cs-identifier;duke-of-contentshire;{} + And the command DisableNodeAggregate is executed with payload: + | Key | Value | + | nodeAggregateId | "duke-of-contentshire" | + | nodeVariantSelectionStrategy | "allVariants" | + And I expect exactly 5 events to be published on stream "ContentStream:cs-identifier" + + Then I handle exceeded node dates + And I expect this node to be disabled + And I expect exactly 5 events to be published on stream "ContentStream:cs-identifier" + + + # <===========================|now|===========================> + # +++|Disable|---|Enable|++++|+++|+++++++++++++++++++++++++++ + Scenario: A enabled node with enableAfter and disableAfter in past, but disableAfter before enableAfter must stay enabled + When I am in content stream "cs-identifier" and dimension space point {} + And the following CreateNodeAggregateWithNode commands are executed: + | nodeAggregateId | parentNodeAggregateId | nodeTypeName | initialPropertyValues | + | shernode-homes | lady-eleonode-rootford | Some.Package:Homepage | {} | + | duke-of-contentshire | shernode-homes | Some.Package:Content | {"enableAfterDateTime": {"__type": "DateTimeImmutable", "value": "1995-01-01 10:10:10"}, "disableAfterDateTime": {"__type": "DateTimeImmutable", "value": "1990-01-01 10:10:10"}} | + Then I expect node aggregate identifier "duke-of-contentshire" to lead to node cs-identifier;duke-of-contentshire;{} + And I expect exactly 4 events to be published on stream "ContentStream:cs-identifier" + + Then I handle exceeded node dates + And I expect this node to be enabled + And I expect exactly 4 events to be published on stream "ContentStream:cs-identifier" + + # <===========================|now|===========================> + # +++|Disable|---|Enable|++++|---|+++++++++++++++++++++++++++ + Scenario: A disabled node with enableAfter and disableAfter in past, but disableAfter before enableAfter must be enabled + When I am in content stream "cs-identifier" and dimension space point {} + And the following CreateNodeAggregateWithNode commands are executed: + | nodeAggregateId | parentNodeAggregateId | nodeTypeName | initialPropertyValues | + | shernode-homes | lady-eleonode-rootford | Some.Package:Homepage | {} | + | duke-of-contentshire | shernode-homes | Some.Package:Content | {"enableAfterDateTime": {"__type": "DateTimeImmutable", "value": "1995-01-01 10:10:10"}, "disableAfterDateTime": {"__type": "DateTimeImmutable", "value": "1990-01-01 10:10:10"}} | + Then I expect node aggregate identifier "duke-of-contentshire" to lead to node cs-identifier;duke-of-contentshire;{} + And the command DisableNodeAggregate is executed with payload: + | Key | Value | + | nodeAggregateId | "duke-of-contentshire" | + | nodeVariantSelectionStrategy | "allVariants" | + And I expect exactly 5 events to be published on stream "ContentStream:cs-identifier" + + Then I handle exceeded node dates + And I expect this node to be enabled + And I expect exactly 6 events to be published on stream "ContentStream:cs-identifier" + + + # <===========================|now|===========================> + # +++++|Disable|-------------|+++|--------------------------- + Scenario: A enabled node with disableAfter past in must be disabled + When I am in content stream "cs-identifier" and dimension space point {} + And the following CreateNodeAggregateWithNode commands are executed: + | nodeAggregateId | parentNodeAggregateId | nodeTypeName | initialPropertyValues | + | shernode-homes | lady-eleonode-rootford | Some.Package:Homepage | {} | + | duke-of-contentshire | shernode-homes | Some.Package:Content | {"disableAfterDateTime": {"__type": "DateTimeImmutable", "value": "1990-01-01 10:10:10"}} | + Then I expect node aggregate identifier "duke-of-contentshire" to lead to node cs-identifier;duke-of-contentshire;{} + And I expect exactly 4 events to be published on stream "ContentStream:cs-identifier" + + Then I handle exceeded node dates + And I expect this node to be disabled + And I expect exactly 5 events to be published on stream "ContentStream:cs-identifier" + + # <===========================|now|===========================> + # +++++|Disable|-------------|---|--------------------------- + Scenario: A enabled node with disableAfter past in must stay disabled + When I am in content stream "cs-identifier" and dimension space point {} + And the following CreateNodeAggregateWithNode commands are executed: + | nodeAggregateId | parentNodeAggregateId | nodeTypeName | initialPropertyValues | + | shernode-homes | lady-eleonode-rootford | Some.Package:Homepage | {} | + | duke-of-contentshire | shernode-homes | Some.Package:Content | {"disableAfterDateTime": {"__type": "DateTimeImmutable", "value": "1990-01-01 10:10:10"}} | + Then I expect node aggregate identifier "duke-of-contentshire" to lead to node cs-identifier;duke-of-contentshire;{} + And the command DisableNodeAggregate is executed with payload: + | Key | Value | + | nodeAggregateId | "duke-of-contentshire" | + | nodeVariantSelectionStrategy | "allVariants" | + And I expect exactly 5 events to be published on stream "ContentStream:cs-identifier" + + Then I handle exceeded node dates + Then I expect this node to be disabled + And I expect exactly 5 events to be published on stream "ContentStream:cs-identifier" + + + # <===========================|now|===========================> + # -----|Enable|++++++++++++++|+++|+++++++++++++++++++++++++++ + Scenario: A enabled node with enableAfter past in must stay enabled + When I am in content stream "cs-identifier" and dimension space point {} + And the following CreateNodeAggregateWithNode commands are executed: + | nodeAggregateId | parentNodeAggregateId | nodeTypeName | initialPropertyValues | + | shernode-homes | lady-eleonode-rootford | Some.Package:Homepage | {} | + | duke-of-contentshire | shernode-homes | Some.Package:Content | {"enableAfterDateTime": {"__type": "DateTimeImmutable", "value": "1990-01-01 10:10:10"}} | + Then I expect node aggregate identifier "duke-of-contentshire" to lead to node cs-identifier;duke-of-contentshire;{} + And I expect exactly 4 events to be published on stream "ContentStream:cs-identifier" + + Then I handle exceeded node dates + And I expect this node to be enabled + And I expect exactly 4 events to be published on stream "ContentStream:cs-identifier" + + # <===========================|now|===========================> + # -----|Enable|++++++++++++++|---|+++++++++++++++++++++++++++ + Scenario: A disabled node with enableAfter past in must be enabled + When I am in content stream "cs-identifier" and dimension space point {} + And the following CreateNodeAggregateWithNode commands are executed: + | nodeAggregateId | parentNodeAggregateId | nodeTypeName | initialPropertyValues | + | shernode-homes | lady-eleonode-rootford | Some.Package:Homepage | {} | + | duke-of-contentshire | shernode-homes | Some.Package:Content | {"enableAfterDateTime": {"__type": "DateTimeImmutable", "value": "1990-01-01 10:10:10"}} | + Then I expect node aggregate identifier "duke-of-contentshire" to lead to node cs-identifier;duke-of-contentshire;{} + And the command DisableNodeAggregate is executed with payload: + | Key | Value | + | nodeAggregateId | "duke-of-contentshire" | + | nodeVariantSelectionStrategy | "allVariants" | + And I expect exactly 5 events to be published on stream "ContentStream:cs-identifier" + + Then I handle exceeded node dates + Then I expect this node to be enabled + And I expect exactly 6 events to be published on stream "ContentStream:cs-identifier" + + + # <===========================|now|===========================> + # ---------------------------|---|---|Enable|+++++|Disable|-- + Scenario: A disabled node with enableAfter and disableAfter in future must not be changed + When I am in content stream "cs-identifier" and dimension space point {} + And the following CreateNodeAggregateWithNode commands are executed: + | nodeAggregateId | parentNodeAggregateId | nodeTypeName | initialPropertyValues | + | shernode-homes | lady-eleonode-rootford | Some.Package:Homepage | {} | + | duke-of-contentshire | shernode-homes | Some.Package:Content | {"enableAfterDateTime": {"__type": "DateTimeImmutable", "value": "2029-01-01 10:10:10"}, "disableAfterDateTime": {"__type": "DateTimeImmutable", "value": "2030-01-01 10:10:10"}} | + Then I expect node aggregate identifier "duke-of-contentshire" to lead to node cs-identifier;duke-of-contentshire;{} + And the command DisableNodeAggregate is executed with payload: + | Key | Value | + | nodeAggregateId | "duke-of-contentshire" | + | nodeVariantSelectionStrategy | "allVariants" | + And I expect exactly 5 events to be published on stream "ContentStream:cs-identifier" + + + Then I handle exceeded node dates + Then I expect this node to be disabled + And I expect exactly 5 events to be published on stream "ContentStream:cs-identifier" + + # <===========================|now|===========================> + # ---------------------------|+++|---|Enable|+++++|Disable|-- + Scenario: A enabled node with enableAfter and disableAfter in future must not be changed + When I am in content stream "cs-identifier" and dimension space point {} + And the following CreateNodeAggregateWithNode commands are executed: + | nodeAggregateId | parentNodeAggregateId | nodeTypeName | initialPropertyValues | + | shernode-homes | lady-eleonode-rootford | Some.Package:Homepage | {} | + | duke-of-contentshire | shernode-homes | Some.Package:Content | {"enableAfterDateTime": {"__type": "DateTimeImmutable", "value": "2029-01-01 10:10:10"}, "disableAfterDateTime": {"__type": "DateTimeImmutable", "value": "2030-01-01 10:10:10"}} | + Then I expect node aggregate identifier "duke-of-contentshire" to lead to node cs-identifier;duke-of-contentshire;{} + And I expect exactly 4 events to be published on stream "ContentStream:cs-identifier" + + Then I handle exceeded node dates + And I expect this node to be enabled + And I expect exactly 4 events to be published on stream "ContentStream:cs-identifier" + + + # <===========================|now|===========================> + # +++++++++++++++++++++++++++|---|+++|Disable|-----|Enable|++ + Scenario: A disabled node with disableAfter and enableAfter in future must not be changed + When I am in content stream "cs-identifier" and dimension space point {} + And the following CreateNodeAggregateWithNode commands are executed: + | nodeAggregateId | parentNodeAggregateId | nodeTypeName | initialPropertyValues | + | shernode-homes | lady-eleonode-rootford | Some.Package:Homepage | {} | + | duke-of-contentshire | shernode-homes | Some.Package:Content | {"enableAfterDateTime": {"__type": "DateTimeImmutable", "value": "2029-01-01 10:10:10"}, "disableAfterDateTime": {"__type": "DateTimeImmutable", "value": "2030-01-01 10:10:10"}} | + Then I expect node aggregate identifier "duke-of-contentshire" to lead to node cs-identifier;duke-of-contentshire;{} + And the command DisableNodeAggregate is executed with payload: + | Key | Value | + | nodeAggregateId | "duke-of-contentshire" | + | nodeVariantSelectionStrategy | "allVariants" | + And I expect exactly 5 events to be published on stream "ContentStream:cs-identifier" + + Then I handle exceeded node dates + Then I expect this node to be disabled + And I expect exactly 5 events to be published on stream "ContentStream:cs-identifier" + + # <===========================|now|===========================> + # +++++++++++++++++++++++++++|+++|+++|Disable|-----|Enable|++ + Scenario: A enabled node with disableAfter and enableAfter in future must not be changed + When I am in content stream "cs-identifier" and dimension space point {} + And the following CreateNodeAggregateWithNode commands are executed: + | nodeAggregateId | parentNodeAggregateId | nodeTypeName | initialPropertyValues | + | shernode-homes | lady-eleonode-rootford | Some.Package:Homepage | {} | + | duke-of-contentshire | shernode-homes | Some.Package:Content | {"enableAfterDateTime": {"__type": "DateTimeImmutable", "value": "2029-01-01 10:10:10"}, "disableAfterDateTime": {"__type": "DateTimeImmutable", "value": "2030-01-01 10:10:10"}} | + Then I expect node aggregate identifier "duke-of-contentshire" to lead to node cs-identifier;duke-of-contentshire;{} + And I expect exactly 4 events to be published on stream "ContentStream:cs-identifier" + + Then I handle exceeded node dates + And I expect this node to be enabled + And I expect exactly 4 events to be published on stream "ContentStream:cs-identifier" + + + # <===========================|now|===========================> + # ---------------------------|---|---|Enable|+++++++++++++++ + Scenario: A disabled node with enableAfter in future must not be changed + When I am in content stream "cs-identifier" and dimension space point {} + And the following CreateNodeAggregateWithNode commands are executed: + | nodeAggregateId | parentNodeAggregateId | nodeTypeName | initialPropertyValues | + | shernode-homes | lady-eleonode-rootford | Some.Package:Homepage | {} | + | duke-of-contentshire | shernode-homes | Some.Package:Content | {"enableAfterDateTime": {"__type": "DateTimeImmutable", "value": "2029-01-01 10:10:10"}} | + Then I expect node aggregate identifier "duke-of-contentshire" to lead to node cs-identifier;duke-of-contentshire;{} + And the command DisableNodeAggregate is executed with payload: + | Key | Value | + | nodeAggregateId | "duke-of-contentshire" | + | nodeVariantSelectionStrategy | "allVariants" | + And I expect exactly 5 events to be published on stream "ContentStream:cs-identifier" + + + Then I handle exceeded node dates + Then I expect this node to be disabled + And I expect exactly 5 events to be published on stream "ContentStream:cs-identifier" + + # <===========================|now|===========================> + # ---------------------------|+++|---|Enable|+++++++++++++++ + Scenario: A enabled node with enableAfter in future must not be changed + When I am in content stream "cs-identifier" and dimension space point {} + And the following CreateNodeAggregateWithNode commands are executed: + | nodeAggregateId | parentNodeAggregateId | nodeTypeName | initialPropertyValues | + | shernode-homes | lady-eleonode-rootford | Some.Package:Homepage | {} | + | duke-of-contentshire | shernode-homes | Some.Package:Content | {"enableAfterDateTime": {"__type": "DateTimeImmutable", "value": "2029-01-01 10:10:10"}} | + Then I expect node aggregate identifier "duke-of-contentshire" to lead to node cs-identifier;duke-of-contentshire;{} + And I expect exactly 4 events to be published on stream "ContentStream:cs-identifier" + + Then I handle exceeded node dates + And I expect this node to be enabled + And I expect exactly 4 events to be published on stream "ContentStream:cs-identifier" + + + # <===========================|now|===========================> + # +++++++++++++++++++++++++++|---|+++|Disable|--------------- + Scenario: A disabled node with disableAfter in future must not be changed + When I am in content stream "cs-identifier" and dimension space point {} + And the following CreateNodeAggregateWithNode commands are executed: + | nodeAggregateId | parentNodeAggregateId | nodeTypeName | initialPropertyValues | + | shernode-homes | lady-eleonode-rootford | Some.Package:Homepage | {} | + | duke-of-contentshire | shernode-homes | Some.Package:Content | {"disableAfterDateTime": {"__type": "DateTimeImmutable", "value": "2030-01-01 10:10:10"}} | + Then I expect node aggregate identifier "duke-of-contentshire" to lead to node cs-identifier;duke-of-contentshire;{} + And the command DisableNodeAggregate is executed with payload: + | Key | Value | + | nodeAggregateId | "duke-of-contentshire" | + | nodeVariantSelectionStrategy | "allVariants" | + And I expect exactly 5 events to be published on stream "ContentStream:cs-identifier" + + Then I handle exceeded node dates + Then I expect this node to be disabled + And I expect exactly 5 events to be published on stream "ContentStream:cs-identifier" + + # <===========================|now|===========================> + # +++++++++++++++++++++++++++|+++|+++|Disable|--------------- + Scenario: A enabled node with disableAfter and enableAfter in future must not be changed + When I am in content stream "cs-identifier" and dimension space point {} + And the following CreateNodeAggregateWithNode commands are executed: + | nodeAggregateId | parentNodeAggregateId | nodeTypeName | initialPropertyValues | + | shernode-homes | lady-eleonode-rootford | Some.Package:Homepage | {} | + | duke-of-contentshire | shernode-homes | Some.Package:Content | {"disableAfterDateTime": {"__type": "DateTimeImmutable", "value": "2030-01-01 10:10:10"}} | + Then I expect node aggregate identifier "duke-of-contentshire" to lead to node cs-identifier;duke-of-contentshire;{} + And I expect exactly 4 events to be published on stream "ContentStream:cs-identifier" + + Then I handle exceeded node dates + And I expect this node to be enabled + And I expect exactly 4 events to be published on stream "ContentStream:cs-identifier" \ No newline at end of file diff --git a/Neos.TimeableNodeVisibility/Tests/Behavior/behat.yml.dist b/Neos.TimeableNodeVisibility/Tests/Behavior/behat.yml.dist new file mode 100644 index 00000000000..248c7a272e2 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Tests/Behavior/behat.yml.dist @@ -0,0 +1,15 @@ +# Behat distribution configuration +# +# Override with behat.yml for local configuration. +# + +default: + autoload: + '': "%paths.base%/Bootstrap" + suites: + cr: + paths: + - "%paths.base%/Features/" + contexts: + - FeatureContext: + diff --git a/Neos.TimeableNodeVisibility/composer.json b/Neos.TimeableNodeVisibility/composer.json new file mode 100644 index 00000000000..8c504a8ca8d --- /dev/null +++ b/Neos.TimeableNodeVisibility/composer.json @@ -0,0 +1,93 @@ +{ + "name": "neos/timeable-node-visibility", + "type": "neos-package", + "description": "Enable and disable nodes at a specific time.", + "support": { + "source": "https://github.com/neos/timeable-node-visibility.git", + "forum": "https://discuss.neos.io/", + "docs": "https://docs.neos.io/" + }, + "license": ["GPL-3.0-or-later"], + "require": { + "php": "^8.2", + "neos/flow": "*", + "neos/neos": "self.version", + "neos/contentrepository-core": "self.version" + }, + "autoload": { + "psr-4": { + "Neos\\TimeableNodeVisibility\\": "Classes" + } + }, + "autoload-dev": { + "psr-4": { + "Neos\\TimeableNodeVisibility\\Tests\\": "Tests" + } + }, + "extra": { + "applied-flow-migrations": [ + "TYPO3.TYPO3CR-20150510103823", + "TYPO3.FLOW3-201201261636", + "TYPO3.Fluid-201205031303", + "TYPO3.FLOW3-201205292145", + "TYPO3.FLOW3-201206271128", + "TYPO3.Flow-201211151101", + "TYPO3.Neos.NodeTypes-130516220640", + "TYPO3.TypoScript-130516234520", + "TYPO3.TypoScript-130516235550", + "TYPO3.TYPO3CR-130523180140", + "TYPO3.Neos.NodeTypes-201309111655", + "TYPO3.Neos-201310021548", + "TYPO3.Flow-201310031523", + "TYPO3.Flow-201405111147", + "TYPO3.Neos-201409071922", + "TYPO3.TYPO3CR-140911160326", + "TYPO3.Neos-201410010000", + "TYPO3.TYPO3CR-141101082142", + "TYPO3.Neos-20141113115300", + "TYPO3.Fluid-20141121091700", + "TYPO3.Neos-20141218134700", + "TYPO3.Fluid-20150214130800", + "TYPO3.Neos-201407061038", + "TYPO3.Flow-201212051340", + "TYPO3.Fluid-20141113120800", + "TYPO3.Flow-20141113121400", + "Typo3.Neos.NodeTypes-201309111655", + "TYPO3.TYPO3CR-20140911160326", + "TYPO3.Flow-201209251426", + "TYPO3.FLOW3-201209201112", + "TYPO3.Neos-20150303231600", + "TYPO3.Flow-20151113161300", + "TYPO3.Form-20160601101500", + "TYPO3.Flow-20161115140400", + "TYPO3.Flow-20161115140430", + "Neos.Flow-20161124204700", + "Neos.Flow-20161124204701", + "Neos.Twitter.Bootstrap-20161124204912", + "Neos.Form-20161124205254", + "Neos.Flow-20161124224015", + "Neos.Party-20161124225257", + "Neos.Eel-20161124230101", + "Neos.Kickstart-20161124230102", + "Neos.Setup-20161124230842", + "Neos.Imagine-20161124231742", + "Neos.Media-20161124233100", + "Neos.NodeTypes-20161125002300", + "Neos.SiteKickstarter-20161125002311", + "Neos.Neos-20161125002322", + "Neos.ContentRepository-20161125012000", + "Neos.Fusion-20161125013710", + "Neos.Setup-20161125014759", + "Neos.SiteKickstarter-20161125095901", + "Neos.Fusion-20161125104701", + "Neos.NodeTypes-20161125104800", + "Neos.Neos-20161125104802", + "Neos.Kickstarter-20161125110814", + "Neos.Neos-20161125122412", + "Neos.Flow-20161125124112", + "TYPO3.FluidAdaptor-20161130112935", + "Neos.Fusion-20161201202543", + "Neos.Fusion-20170120013047" + ] + } +} diff --git a/composer.json b/composer.json index 93e2955b2a6..808cbcc4419 100644 --- a/composer.json +++ b/composer.json @@ -81,7 +81,8 @@ "neos/nodetypes-html": "self.version", "neos/nodetypes-navigation": "self.version", "neos/nodetypes": "self.version", - "neos/site-kickstarter": "self.version" + "neos/site-kickstarter": "self.version", + "neos/timeable-node-visibility": "self.version" }, "suggest": { "neos/utility-schema": "Validate NodeType schema.", @@ -121,14 +122,16 @@ "@test:behat-cli -c Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/behat.yml.dist", "../../flow doctrine:migrate --quiet; ../../flow cr:setup", "@test:behat-cli -c Neos.Neos/Tests/Behavior/behat.yml", - "@test:behat-cli -c Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/behat.yml.dist" + "@test:behat-cli -c Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/behat.yml.dist", + "@test:behat-cli -c Neos.TimeableNodeVisibility/Tests/Behavior/behat.yml.dist" ], "test:behavioral:stop-on-failure": [ "@test:behat-cli -vvv --stop-on-failure -c Neos.ContentRepository.BehavioralTests/Tests/Behavior/behat.yml.dist", "@test:behat-cli -vvv --stop-on-failure -c Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/behat.yml.dist", "../../flow doctrine:migrate --quiet; ../../flow cr:setup", "@test:behat-cli -vvv --stop-on-failure -c Neos.Neos/Tests/Behavior/behat.yml", - "@test:behat-cli -vvv --stop-on-failure -c Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/behat.yml.dist" + "@test:behat-cli -vvv --stop-on-failure -c Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/behat.yml.dist", + "@test:behat-cli -vvv --stop-on-failure -c Neos.TimeableNodeVisibility/Tests/Behavior/behat.yml.dist" ], "test": [ "@test:unit", @@ -224,6 +227,9 @@ ], "Neos\\SiteKickstarter\\": [ "Neos.SiteKickstarter/Classes" + ], + "Neos\\TimeableNodeVisibility\\": [ + "Neos.TimeableNodeVisibility/Classes" ] } }, @@ -279,6 +285,9 @@ ], "Neos\\SiteKickstarter\\Tests\\": [ "Neos.SiteKickstarter/Tests" + ], + "Neos\\TimeableNodeVisibility\\Tests\\": [ + "Neos.TimeableNodeVisibility/Tests" ] } }, diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 19ba0c03157..0baf4881f34 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1,75 +1,5 @@ parameters: ignoreErrors: - - - message: "#^The internal method \"Neos\\\\ContentRepository\\\\Core\\\\Projection\\\\ContentGraph\\\\ContentGraphWithRuntimeCaches\\\\InMemoryCache\\:\\:disable\" is called\\.$#" - count: 1 - path: Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjection.php - - - - message: "#^The internal method \"Neos\\\\ContentRepository\\\\Core\\\\Projection\\\\ContentGraph\\\\ContentGraphWithRuntimeCaches\\\\InMemoryCache\\:\\:enable\" is called\\.$#" - count: 1 - path: Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjection.php - - - - message: "#^The internal method \"Neos\\\\ContentRepository\\\\Core\\\\EventStore\\\\EventPersister\\:\\:publishEvents\" is called\\.$#" - count: 2 - path: Neos.ContentRepository.BehavioralTests/Classes/Command/PerformanceMeasurementService.php - - - - message: "#^The internal method \"Neos\\\\ContentRepository\\\\Core\\\\Feature\\\\ContentStreamEventStreamName\\:\\:getEventStreamName\" is called\\.$#" - count: 2 - path: Neos.ContentRepository.BehavioralTests/Classes/Command/PerformanceMeasurementService.php - - - - message: "#^The internal method \"Neos\\\\ContentRepository\\\\Core\\\\Feature\\\\WorkspaceEventStreamName\\:\\:getEventStreamName\" is called\\.$#" - count: 1 - path: Neos.ContentRepository.Export/src/ImportService.php - - - - message: "#^The internal method \"Neos\\\\ContentRepository\\\\Core\\\\Feature\\\\ContentStreamEventStreamName\\:\\:getEventStreamName\" is called\\.$#" - count: 1 - path: Neos.ContentRepository.Export/src/Processors/EventExportProcessor.php - - - - message: "#^The internal method \"Neos\\\\ContentRepository\\\\Core\\\\Feature\\\\ContentStreamEventStreamName\\:\\:getEventStreamName\" is called\\.$#" - count: 1 - path: Neos.ContentRepository.Export/src/Processors/EventStoreImportProcessor.php - - - - message: "#^The internal method \"Neos\\\\ContentRepository\\\\Core\\\\Feature\\\\WorkspaceEventStreamName\\:\\:getEventStreamName\" is called\\.$#" - count: 1 - path: Neos.ContentRepository.Export/src/Processors/EventStoreImportProcessor.php - - - - message: "#^The internal method \"Neos\\\\ContentRepository\\\\Core\\\\Infrastructure\\\\Property\\\\PropertyConverter\\:\\:serializePropertyValues\" is called\\.$#" - count: 1 - path: Neos.ContentRepository.LegacyNodeMigration/Classes/NodeDataToEventsProcessor.php - - - - message: "#^The internal method \"Neos\\\\ContentRepository\\\\Core\\\\Feature\\\\ContentStreamEventStreamName\\:\\:getEventStreamName\" is called\\.$#" - count: 2 - path: Neos.ContentRepository.StructureAdjustment/src/Adjustment/DisallowedChildNodeAdjustment.php - - - - message: "#^The internal method \"Neos\\\\ContentRepository\\\\Core\\\\Feature\\\\ContentStreamEventStreamName\\:\\:getEventStreamName\" is called\\.$#" - count: 1 - path: Neos.ContentRepository.StructureAdjustment/src/Adjustment/PropertyAdjustment.php - - - - message: "#^The internal method \"Neos\\\\ContentRepository\\\\Core\\\\Feature\\\\ContentStreamEventStreamName\\:\\:getEventStreamName\" is called\\.$#" - count: 3 - path: Neos.ContentRepository.StructureAdjustment/src/Adjustment/TetheredNodeAdjustments.php - - - - message: "#^The internal method \"Neos\\\\ContentRepository\\\\Core\\\\Feature\\\\ContentStreamEventStreamName\\:\\:getEventStreamName\" is called\\.$#" - count: 1 - path: Neos.ContentRepository.StructureAdjustment/src/Adjustment/UnknownNodeTypeAdjustment.php - - - - message: "#^The internal method \"Neos\\\\ContentRepository\\\\Core\\\\EventStore\\\\EventPersister\\:\\:publishEvents\" is called\\.$#" - count: 1 - path: Neos.ContentRepository.StructureAdjustment/src/StructureAdjustmentService.php - - message: "#^The internal method \"Neos\\\\ContentRepository\\\\Core\\\\Projection\\\\Projections\\:\\:getClassNames\" is called\\.$#" count: 1 diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 419a5751771..c157d6569f9 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -12,10 +12,12 @@ parameters: - Neos.ContentRepository.Export/src - Neos.ContentRepository.LegacyNodeMigration/Classes - Neos.ContentRepository.NodeAccess/Classes + - Neos.ContentRepository.NodeMigration/src - Neos.ContentRepository.StructureAdjustment/src - Neos.ContentRepository.TestSuite/Classes - Neos.ContentRepositoryRegistry/Classes - Neos.Neos/Classes + - Neos.TimeableNodeVisibility/Classes - Neos.NodeTypes.Form/Classes # todo lint whole fusion package - Neos.Fusion/Classes/Core