From 98d151edcd066cfe7882bf06bfddd85fb696ce33 Mon Sep 17 00:00:00 2001 From: Denny Lubitz Date: Mon, 15 Jan 2024 17:10:29 +0100 Subject: [PATCH 01/13] FEATURE: Timeable node visibility --- .../CacheLifetimeOperationTest.php | 163 ----- Neos.Neos/NodeTypes/Mixin/Content.yaml | 1 - Neos.Neos/NodeTypes/Mixin/Document.yaml | 1 - Neos.Neos/NodeTypes/Mixin/Timable.yaml | 36 - .../Fusion/RawContent/NodeHeader.fusion | 4 - .../Translations/ar/NodeTypes/Timable.xlf | 13 - .../Translations/cs/NodeTypes/Timable.xlf | 13 - .../Translations/da/NodeTypes/Timable.xlf | 13 - .../Translations/de/NodeTypes/Timable.xlf | 13 - .../Translations/el/NodeTypes/Timable.xlf | 13 - .../Translations/en/NodeTypes/Timable.xlf | 13 - .../Translations/es/NodeTypes/Timable.xlf | 13 - .../Translations/fi/NodeTypes/Timable.xlf | 13 - .../Translations/fr/NodeTypes/Timable.xlf | 13 - .../Translations/hu/NodeTypes/Timable.xlf | 13 - .../Translations/id_ID/NodeTypes/Timable.xlf | 13 - .../Translations/it/NodeTypes/Timable.xlf | 13 - .../Translations/ja/NodeTypes/Timable.xlf | 13 - .../Translations/km/NodeTypes/Timable.xlf | 13 - .../Translations/lv/NodeTypes/Timable.xlf | 13 - .../Translations/nl/NodeTypes/Timable.xlf | 13 - .../Translations/no/NodeTypes/Timable.xlf | 13 - .../Translations/pl/NodeTypes/Timable.xlf | 13 - .../Translations/pt/NodeTypes/Timable.xlf | 15 - .../Translations/pt_BR/NodeTypes/Timable.xlf | 13 - .../Translations/ru/NodeTypes/Timable.xlf | 13 - .../Translations/sr/NodeTypes/Timable.xlf | 13 - .../Translations/sv/NodeTypes/Timable.xlf | 13 - .../Translations/tl_PH/NodeTypes/Timable.xlf | 13 - .../Translations/tr/NodeTypes/Timable.xlf | 13 - .../Translations/uk/NodeTypes/Timable.xlf | 13 - .../Translations/vi/NodeTypes/Timable.xlf | 13 - .../Translations/zh/NodeTypes/Timable.xlf | 13 - .../Translations/zh_TW/NodeTypes/Timable.xlf | 13 - ...imeableNodeVisibilityCommandController.php | 82 +++ .../Classes/Domain/HandlingResult.php | 28 + .../Classes/Domain/HandlingResultSet.php | 30 + .../Service/TimeableNodeVisibilityService.php | 171 +++++ .../Configuration/Settings.yaml | 10 + Neos.TimeableNodeVisibility/LICENSE | 675 ++++++++++++++++++ .../NodeTypes/Mixin/Timeable.yaml | 34 + .../NodeTypes/Override/Content.yaml | 3 + .../NodeTypes/Override/Document.yaml | 3 + .../Override/RawContent/NodeHeader.fusion | 8 + .../Resources/Private/Fusion/Root.fusion | 1 + .../Translations/de/NodeTypes/Timeable.xlf | 13 + .../Translations/en/NodeTypes/Timeable.xlf | 13 + Neos.TimeableNodeVisibility/composer.json | 93 +++ composer.json | 4 +- 49 files changed, 1167 insertions(+), 585 deletions(-) delete mode 100644 Neos.ContentRepository.NodeAccess/Tests/Unit/FlowQueryOperations/CacheLifetimeOperationTest.php delete mode 100644 Neos.Neos/NodeTypes/Mixin/Timable.yaml delete mode 100644 Neos.Neos/Resources/Private/Translations/ar/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/cs/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/da/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/de/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/el/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/en/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/es/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/fi/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/fr/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/hu/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/id_ID/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/it/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/ja/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/km/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/lv/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/nl/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/no/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/pl/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/pt/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/pt_BR/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/ru/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/sr/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/sv/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/tl_PH/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/tr/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/uk/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/vi/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/zh/NodeTypes/Timable.xlf delete mode 100644 Neos.Neos/Resources/Private/Translations/zh_TW/NodeTypes/Timable.xlf create mode 100644 Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php create mode 100644 Neos.TimeableNodeVisibility/Classes/Domain/HandlingResult.php create mode 100644 Neos.TimeableNodeVisibility/Classes/Domain/HandlingResultSet.php create mode 100644 Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php create mode 100644 Neos.TimeableNodeVisibility/Configuration/Settings.yaml create mode 100644 Neos.TimeableNodeVisibility/LICENSE create mode 100644 Neos.TimeableNodeVisibility/NodeTypes/Mixin/Timeable.yaml create mode 100644 Neos.TimeableNodeVisibility/NodeTypes/Override/Content.yaml create mode 100644 Neos.TimeableNodeVisibility/NodeTypes/Override/Document.yaml create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Fusion/Override/RawContent/NodeHeader.fusion create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Fusion/Root.fusion create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/de/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/en/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/composer.json 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.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/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/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/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.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php b/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php new file mode 100644 index 00000000000..8a880907c66 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php @@ -0,0 +1,82 @@ +timeableNodeVisibilityService->handleExeededNodeDates( + $contentRepositoryId, + $workspaceName + ); + + if (!$quiet) { + $this->output->outputLine(sprintf('Enabled %d nodes with exeeded timed dates.', $handlingResult->countByResult(HandlingResult::RESULT_ENABLED))); + foreach ($handlingResult->getByResult(HandlingResult::RESULT_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 exeeded timed dates.', $handlingResult->countByResult(HandlingResult::RESULT_DISABLED))); + foreach ($handlingResult->getByResult(HandlingResult::RESULT_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) + { + $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/HandlingResult.php b/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResult.php new file mode 100644 index 00000000000..6ce33360095 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResult.php @@ -0,0 +1,28 @@ +handlingResults[] = $handlingResult; + } + + public function countByResult(string $result) + { + return count(array_filter($this->handlingResults, fn($handlingResult) => $handlingResult->result === $result)); + } + + public function getByResult(string $result) + { + return array_filter($this->handlingResults, fn($handlingResult) => $handlingResult->result === $result); + } +} \ No newline at end of file diff --git a/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php b/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php new file mode 100644 index 00000000000..acb1561b75d --- /dev/null +++ b/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php @@ -0,0 +1,171 @@ +contentRepositoryRegistry->get($contentRepositoryId); + $liveWorkspace = $contentRepository->getWorkspaceFinder()->findOneByName($workspaceName); + $nodeHiddenStateFinder = $contentRepository->projectionState(NodeHiddenStateFinder::class); + + $now = new \DateTimeImmutable(); + + $nodes = $this->getNodesWithExceededDates($contentRepository, $liveWorkspace, $now); + $handledNodeResults = new HandlingResultSet(); + + foreach ($nodes as $node) { + if ($this->needsEnabling($node, $now) && $this->isHidden($node, $nodeHiddenStateFinder)) { + $contentRepository->handle( + EnableNodeAggregate::create( + $node->subgraphIdentity->contentStreamId, + $node->nodeAggregateId, + $node->subgraphIdentity->dimensionSpacePoint, + NodeVariantSelectionStrategy::STRATEGY_ALL_SPECIALIZATIONS + ) + ); + + $result = HandlingResult::createWithEnabled($node); + $handledNodeResults->add($result); + $this->logResult($result); + + } elseif ($this->needsDisabling($node, $now) && !$this->isHidden($node, $nodeHiddenStateFinder)) { + $contentRepository->handle( + DisableNodeAggregate::create( + $node->subgraphIdentity->contentStreamId, + $node->nodeAggregateId, + $node->subgraphIdentity->dimensionSpacePoint, + NodeVariantSelectionStrategy::STRATEGY_ALL_SPECIALIZATIONS + ) + ); + + $result = HandlingResult::createWithDisabled($node); + $handledNodeResults->add($result); + $this->logResult($result); + } + } + return $handledNodeResults; + } + + /** + * @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() + ); + + $rootNode = $subgraph->findRootNodeByType(NodeTypeName::fromString('Neos.Neos:Sites')); + + $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 spacepoint + continue; + } + + yield $node; + } + } + } + + private function isHidden(Node $node, ProjectionStateInterface $nodeHiddenStateFinder): bool + { + return $nodeHiddenStateFinder->findHiddenState( + $node->subgraphIdentity->contentStreamId, + $node->subgraphIdentity->dimensionSpacePoint, + $node->nodeAggregateId + )->isHidden; + } + + private function needsEnabling(Node $node, \DateTimeImmutable $now) + { + 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(mixed $node, \DateTimeImmutable $now) + { + 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(HandlingResult $result) + { + $this->logger->info( + sprintf('Timed node visibility: %s node [NodeAggregateId: %s, DimensionSpacePoints: %s]: %s', + $result->result, + $result->node->nodeAggregateId->value, + join(',', $result->node->originDimensionSpacePoint->coordinates), + $result->node->getLabel()) + ); + } +} \ No newline at end of file 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..3b604c4906f --- /dev/null +++ b/Neos.TimeableNodeVisibility/NodeTypes/Override/Content.yaml @@ -0,0 +1,3 @@ +'Neos.Neos:Content': + superTypes: + 'Neos.TimeableNodeVisibility:Timeable': true \ No newline at end of file diff --git a/Neos.TimeableNodeVisibility/NodeTypes/Override/Document.yaml b/Neos.TimeableNodeVisibility/NodeTypes/Override/Document.yaml new file mode 100644 index 00000000000..209e841721c --- /dev/null +++ b/Neos.TimeableNodeVisibility/NodeTypes/Override/Document.yaml @@ -0,0 +1,3 @@ +'Neos.Neos:Document': + superTypes: + 'Neos.TimeableNodeVisibility:Timeable': true \ 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/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/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/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 8f8f059a8e5..fa4b9bcf6f7 100644 --- a/composer.json +++ b/composer.json @@ -43,6 +43,7 @@ "neos/fusion-form": "^1.0 || ^2.0", "neos/form": "*", "neos/kickstarter": "~9.0.0", + "neos/timeable-node-visibility": "*", "enshrined/svg-sanitize": "^0.16.0" }, "replace": { @@ -80,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.", From 560697a438765af766a095705823313ccf7c5f04 Mon Sep 17 00:00:00 2001 From: Denny Lubitz Date: Mon, 15 Jan 2024 21:58:53 +0100 Subject: [PATCH 02/13] FEATURE: Timeable node visibility --- .composer.json | 6 +- ...imeableNodeVisibilityCommandController.php | 10 +- .../Service/TimeableNodeVisibilityService.php | 6 +- .../Behavior/Bootstrap/FeatureContext.php | 95 +++++ .../Behavior/Features/HandleExceeded.feature | 392 ++++++++++++++++++ .../Tests/Behavior/behat.yml.dist | 15 + composer.json | 6 +- 7 files changed, 518 insertions(+), 12 deletions(-) create mode 100644 Neos.TimeableNodeVisibility/Tests/Behavior/Bootstrap/FeatureContext.php create mode 100644 Neos.TimeableNodeVisibility/Tests/Behavior/Features/HandleExceeded.feature create mode 100644 Neos.TimeableNodeVisibility/Tests/Behavior/behat.yml.dist diff --git a/.composer.json b/.composer.json index 84335a184d5..1063581b68e 100644 --- a/.composer.json +++ b/.composer.json @@ -36,14 +36,16 @@ "../../bin/behat -f progress -c Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/behat.yml.dist", "../../flow doctrine:migrate --quiet; ../../flow cr:setup", "../../bin/behat -f progress -c Neos.Neos/Tests/Behavior/behat.yml", - "../../bin/behat -f progress -c Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/behat.yml.dist" + "../../bin/behat -f progress -c Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/behat.yml.dist", + "../../bin/behat -f progress -c Neos.TimeableNodeVisibility/Tests/Behavior/behat.yml.dist" ], "test:behavioral:stop-on-failure": [ "../../bin/behat -vvv --stop-on-failure -f progress -c Neos.ContentRepository.BehavioralTests/Tests/Behavior/behat.yml.dist", "../../bin/behat -vvv --stop-on-failure -f progress -c Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/behat.yml.dist", "../../flow doctrine:migrate --quiet; ../../flow cr:setup", "../../bin/behat -vvv --stop-on-failure -f progress -c Neos.Neos/Tests/Behavior/behat.yml", - "../../bin/behat -vvv --stop-on-failure -f progress -c Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/behat.yml.dist" + "../../bin/behat -vvv --stop-on-failure -f progress -c Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/behat.yml.dist", + "../../bin/behat -vvv --stop-on-failure -f progress -c Neos.TimeableNodeVisibility/Tests/Behavior/behat.yml.dist" ], "test": [ "@test:unit", diff --git a/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php b/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php index 8a880907c66..d1885901e25 100644 --- a/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php +++ b/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php @@ -20,13 +20,13 @@ public function executeCommand(string $contentRepository = 'default', bool $quie $contentRepositoryId = ContentRepositoryId::fromString($contentRepository); $workspaceName = WorkspaceName::fromString('live'); - $handlingResult = $this->timeableNodeVisibilityService->handleExeededNodeDates( + $handlingResult = $this->timeableNodeVisibilityService->handleExceededNodeDates( $contentRepositoryId, $workspaceName ); if (!$quiet) { - $this->output->outputLine(sprintf('Enabled %d nodes with exeeded timed dates.', $handlingResult->countByResult(HandlingResult::RESULT_ENABLED))); + $this->output->outputLine(sprintf('Enabled %d nodes with exceeded timed dates.', $handlingResult->countByResult(HandlingResult::RESULT_ENABLED))); foreach ($handlingResult->getByResult(HandlingResult::RESULT_ENABLED) as $result) { $this->output->outputLine(sprintf( '- NodeAggregateId: %s, DimensionSpacePoint: %s, Label: %s', @@ -37,7 +37,7 @@ public function executeCommand(string $contentRepository = 'default', bool $quie ); } - $this->output->outputLine(sprintf('Disabled %d nodes with exeeded timed dates.', $handlingResult->countByResult(HandlingResult::RESULT_DISABLED))); + $this->output->outputLine(sprintf('Disabled %d nodes with exceeded timed dates.', $handlingResult->countByResult(HandlingResult::RESULT_DISABLED))); foreach ($handlingResult->getByResult(HandlingResult::RESULT_DISABLED) as $result) { $this->output->outputLine(sprintf( '- NodeAggregateId: %s, DimensionSpacePoint: %s, Label: %s', @@ -58,10 +58,10 @@ public function executeCommand(string $contentRepository = 'default', bool $quie * @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) + public function runDaemonCommand(string $contentRepository = 'default', int $ttl = 900, int $interval = 60, bool $quiet = true): void { $startTime = microtime(true); - while(true) { + while (true) { $this->executeCommand($contentRepository, $quiet); $currentTime = microtime(true) - $startTime; diff --git a/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php b/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php index acb1561b75d..2e0045754d2 100644 --- a/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php +++ b/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php @@ -35,7 +35,7 @@ class TimeableNodeVisibilityService #[Flow\Inject] protected LoggerInterface $logger; - public function handleExeededNodeDates(ContentRepositoryId $contentRepositoryId, WorkspaceName $workspaceName): HandlingResultSet + public function handleExceededNodeDates(ContentRepositoryId $contentRepositoryId, WorkspaceName $workspaceName): HandlingResultSet { $contentRepository = $this->contentRepositoryRegistry->get($contentRepositoryId); $liveWorkspace = $contentRepository->getWorkspaceFinder()->findOneByName($workspaceName); @@ -145,7 +145,7 @@ private function needsEnabling(Node $node, \DateTimeImmutable $now) ); } - private function needsDisabling(mixed $node, \DateTimeImmutable $now) + private function needsDisabling(mixed $node, \DateTimeImmutable $now): bool { return $node->hasProperty('disableAfterDateTime') && $node->getProperty('disableAfterDateTime') != null @@ -158,7 +158,7 @@ private function needsDisabling(mixed $node, \DateTimeImmutable $now) ); } - private function logResult(HandlingResult $result) + private function logResult(HandlingResult $result): void { $this->logger->info( sprintf('Timed node visibility: %s node [NodeAggregateId: %s, DimensionSpacePoints: %s]: %s', 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/composer.json b/composer.json index fa4b9bcf6f7..32446cbeed6 100644 --- a/composer.json +++ b/composer.json @@ -120,14 +120,16 @@ "../../bin/behat -f progress -c Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/behat.yml.dist", "../../flow doctrine:migrate --quiet; ../../flow cr:setup", "../../bin/behat -f progress -c Neos.Neos/Tests/Behavior/behat.yml", - "../../bin/behat -f progress -c Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/behat.yml.dist" + "../../bin/behat -f progress -c Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/behat.yml.dist", + "../../bin/behat -f progress -c Neos.TimeableNodeVisibility/Tests/Behavior/behat.yml.dist" ], "test:behavioral:stop-on-failure": [ "../../bin/behat -vvv --stop-on-failure -f progress -c Neos.ContentRepository.BehavioralTests/Tests/Behavior/behat.yml.dist", "../../bin/behat -vvv --stop-on-failure -f progress -c Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/behat.yml.dist", "../../flow doctrine:migrate --quiet; ../../flow cr:setup", "../../bin/behat -vvv --stop-on-failure -f progress -c Neos.Neos/Tests/Behavior/behat.yml", - "../../bin/behat -vvv --stop-on-failure -f progress -c Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/behat.yml.dist" + "../../bin/behat -vvv --stop-on-failure -f progress -c Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/behat.yml.dist", + "../../bin/behat -vvv --stop-on-failure -f progress -c Neos.TimeableNodeVisibility/Tests/Behavior/behat.yml.dist" ], "test": [ "@test:unit", From 29d868e77c68e91a4085527bb23f0e6610c66379 Mon Sep 17 00:00:00 2001 From: Denny Lubitz Date: Mon, 15 Jan 2024 22:49:54 +0100 Subject: [PATCH 03/13] FEATURE: Timeable node visibility --- Neos.TimeableNodeVisibility/Classes/Domain/HandlingResult.php | 2 +- .../Classes/Domain/HandlingResultSet.php | 2 +- .../Classes/Service/TimeableNodeVisibilityService.php | 2 +- Neos.TimeableNodeVisibility/NodeTypes/Override/Content.yaml | 2 +- Neos.TimeableNodeVisibility/NodeTypes/Override/Document.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResult.php b/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResult.php index 6ce33360095..56511e56f53 100644 --- a/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResult.php +++ b/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResult.php @@ -25,4 +25,4 @@ public static function createWithDisabled(Node $node): static { return new static($node, static::RESULT_DISABLED); } -} \ No newline at end of file +} diff --git a/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResultSet.php b/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResultSet.php index 4fac5b3d15a..68dd8a9f4b2 100644 --- a/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResultSet.php +++ b/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResultSet.php @@ -27,4 +27,4 @@ public function getByResult(string $result) { return array_filter($this->handlingResults, fn($handlingResult) => $handlingResult->result === $result); } -} \ No newline at end of file +} diff --git a/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php b/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php index 2e0045754d2..e76dd6a77ec 100644 --- a/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php +++ b/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php @@ -168,4 +168,4 @@ private function logResult(HandlingResult $result): void $result->node->getLabel()) ); } -} \ No newline at end of file +} diff --git a/Neos.TimeableNodeVisibility/NodeTypes/Override/Content.yaml b/Neos.TimeableNodeVisibility/NodeTypes/Override/Content.yaml index 3b604c4906f..ba164430b33 100644 --- a/Neos.TimeableNodeVisibility/NodeTypes/Override/Content.yaml +++ b/Neos.TimeableNodeVisibility/NodeTypes/Override/Content.yaml @@ -1,3 +1,3 @@ 'Neos.Neos:Content': superTypes: - 'Neos.TimeableNodeVisibility:Timeable': true \ No newline at end of file + 'Neos.TimeableNodeVisibility:Timeable': true diff --git a/Neos.TimeableNodeVisibility/NodeTypes/Override/Document.yaml b/Neos.TimeableNodeVisibility/NodeTypes/Override/Document.yaml index 209e841721c..9c3744e8671 100644 --- a/Neos.TimeableNodeVisibility/NodeTypes/Override/Document.yaml +++ b/Neos.TimeableNodeVisibility/NodeTypes/Override/Document.yaml @@ -1,3 +1,3 @@ 'Neos.Neos:Document': superTypes: - 'Neos.TimeableNodeVisibility:Timeable': true \ No newline at end of file + 'Neos.TimeableNodeVisibility:Timeable': true From 50a4bbf946f3df921234e631091d6bf5d46eabac Mon Sep 17 00:00:00 2001 From: Denny Lubitz Date: Tue, 16 Jan 2024 14:15:58 +0100 Subject: [PATCH 04/13] FEATURE: Timeable node visibility --- .../Classes/NodeDataToEventsProcessor.php | 2 +- .../Classes/Domain/HandlingResult.php | 9 ++++----- .../Classes/Domain/HandlingResultSet.php | 13 ++++++++----- .../Service/TimeableNodeVisibilityService.php | 17 +++++++++++++---- phpstan.neon.dist | 1 + 5 files changed, 27 insertions(+), 15 deletions(-) diff --git a/Neos.ContentRepository.LegacyNodeMigration/Classes/NodeDataToEventsProcessor.php b/Neos.ContentRepository.LegacyNodeMigration/Classes/NodeDataToEventsProcessor.php index 4ea8a74d16f..830d1412ec3 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++; } /** diff --git a/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResult.php b/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResult.php index 56511e56f53..4051f863d53 100644 --- a/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResult.php +++ b/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResult.php @@ -4,16 +4,15 @@ use Neos\ContentRepository\Core\Projection\ContentGraph\Node; -class HandlingResult +final class HandlingResult { - const RESULT_ENABLED = 'ENABLED'; - const RESULT_DISABLED = 'DISABLED'; + public const RESULT_ENABLED = 'ENABLED'; + public const RESULT_DISABLED = 'DISABLED'; private function __construct( public readonly Node $node, public readonly string $result, - ) - { + ) { } public static function createWithEnabled(Node $node): static diff --git a/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResultSet.php b/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResultSet.php index 68dd8a9f4b2..53d0cf54014 100644 --- a/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResultSet.php +++ b/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResultSet.php @@ -13,18 +13,21 @@ public function __construct() { } - public function add(HandlingResult $handlingResult) + public function add(HandlingResult $handlingResult): void { $this->handlingResults[] = $handlingResult; } - public function countByResult(string $result) + public function countByResult(string $result): int { - return count(array_filter($this->handlingResults, fn($handlingResult) => $handlingResult->result === $result)); + return count($this->getByResult($result)); } - public function getByResult(string $result) + /** + * @return array + */ + public function getByResult(string $result): array { - return array_filter($this->handlingResults, fn($handlingResult) => $handlingResult->result === $result); + return array_filter($this->handlingResults, fn ($handlingResult) => $handlingResult->result === $result); } } diff --git a/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php b/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php index e76dd6a77ec..13da94d0de9 100644 --- a/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php +++ b/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php @@ -25,6 +25,8 @@ use Neos\ContentRepository\Core\Projection\ProjectionStateInterface; use Neos\TimeableNodeVisibility\Domain\HandlingResult; use Neos\TimeableNodeVisibility\Domain\HandlingResultSet; +use Neos\ContentRepository\Core\SharedModel\Exception\WorkspaceDoesNotExist; +use Neos\ContentRepository\Core\SharedModel\Exception\RootNodeAggregateDoesNotExist; #[Flow\Scope('singleton')] class TimeableNodeVisibilityService @@ -39,6 +41,9 @@ public function handleExceededNodeDates(ContentRepositoryId $contentRepositoryId { $contentRepository = $this->contentRepositoryRegistry->get($contentRepositoryId); $liveWorkspace = $contentRepository->getWorkspaceFinder()->findOneByName($workspaceName); + if ($liveWorkspace === null) { + throw WorkspaceDoesNotExist::butWasSupposedTo($workspaceName); + } $nodeHiddenStateFinder = $contentRepository->projectionState(NodeHiddenStateFinder::class); $now = new \DateTimeImmutable(); @@ -97,7 +102,11 @@ private function getNodesWithExceededDates(ContentRepository $contentRepository, VisibilityConstraints::withoutRestrictions() ); - $rootNode = $subgraph->findRootNodeByType(NodeTypeName::fromString('Neos.Neos:Sites')); + $sitesNodeTypeName = NodeTypeName::fromString('Neos.Neos:Sites'); + $rootNode = $subgraph->findRootNodeByType($sitesNodeTypeName); + if ($rootNode === null) { + throw RootNodeAggregateDoesNotExist::butWasExpectedTo($sitesNodeTypeName); + } $nodes = $subgraph->findDescendantNodes( $rootNode->nodeAggregateId, @@ -123,7 +132,7 @@ private function getNodesWithExceededDates(ContentRepository $contentRepository, } } - private function isHidden(Node $node, ProjectionStateInterface $nodeHiddenStateFinder): bool + private function isHidden(Node $node, NodeHiddenStateFinder $nodeHiddenStateFinder): bool { return $nodeHiddenStateFinder->findHiddenState( $node->subgraphIdentity->contentStreamId, @@ -132,7 +141,7 @@ private function isHidden(Node $node, ProjectionStateInterface $nodeHiddenStateF )->isHidden; } - private function needsEnabling(Node $node, \DateTimeImmutable $now) + private function needsEnabling(Node $node, \DateTimeImmutable $now): bool { return $node->hasProperty('enableAfterDateTime') && $node->getProperty('enableAfterDateTime') != null @@ -145,7 +154,7 @@ private function needsEnabling(Node $node, \DateTimeImmutable $now) ); } - private function needsDisabling(mixed $node, \DateTimeImmutable $now): bool + private function needsDisabling(Node $node, \DateTimeImmutable $now): bool { return $node->hasProperty('disableAfterDateTime') && $node->getProperty('disableAfterDateTime') != null diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 76fda9e7a20..7d57475afb6 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -16,6 +16,7 @@ parameters: - Neos.ContentRepositoryRegistry/Classes - Neos.Neos/Classes - Neos.NodeTypes.Form/Classes + - Neos.TimeableNodeVisibility/Classes bootstrapFiles: - bootstrap-phpstan.php rules: From 46fae4e9f3e121ba6ab9902cc8490a796c630229 Mon Sep 17 00:00:00 2001 From: Denny Lubitz Date: Fri, 26 Jan 2024 17:23:04 +0100 Subject: [PATCH 05/13] TASK: No need for singleton of a command controller --- .../Classes/Command/TimeableNodeVisibilityCommandController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php b/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php index d1885901e25..908d7611c29 100644 --- a/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php +++ b/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php @@ -9,7 +9,6 @@ use Neos\TimeableNodeVisibility\Service\TimeableNodeVisibilityService; use Neos\TimeableNodeVisibility\Domain\HandlingResult; -#[Flow\Scope('singleton')] class TimeableNodeVisibilityCommandController extends CommandController { #[Flow\Inject] From 5342f4334edd944047c19d0f7960e4ecb4fab9ef Mon Sep 17 00:00:00 2001 From: Denny Lubitz Date: Fri, 26 Jan 2024 17:23:47 +0100 Subject: [PATCH 06/13] TASK: Reuse hidden state --- .../Classes/Service/TimeableNodeVisibilityService.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php b/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php index 13da94d0de9..f906d100b7c 100644 --- a/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php +++ b/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php @@ -22,7 +22,6 @@ use Neos\ContentRepository\Core\Feature\NodeDisabling\Command\DisableNodeAggregate; use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\PropertyValue\Criteria\OrCriteria; use Neos\ContentRepository\Core\Projection\ContentGraph\Node; -use Neos\ContentRepository\Core\Projection\ProjectionStateInterface; use Neos\TimeableNodeVisibility\Domain\HandlingResult; use Neos\TimeableNodeVisibility\Domain\HandlingResultSet; use Neos\ContentRepository\Core\SharedModel\Exception\WorkspaceDoesNotExist; @@ -52,7 +51,8 @@ public function handleExceededNodeDates(ContentRepositoryId $contentRepositoryId $handledNodeResults = new HandlingResultSet(); foreach ($nodes as $node) { - if ($this->needsEnabling($node, $now) && $this->isHidden($node, $nodeHiddenStateFinder)) { + $nodeIsHidden = $this->isHidden($node, $nodeHiddenStateFinder); + if ($this->needsEnabling($node, $now) && $nodeIsHidden) { $contentRepository->handle( EnableNodeAggregate::create( $node->subgraphIdentity->contentStreamId, @@ -66,7 +66,8 @@ public function handleExceededNodeDates(ContentRepositoryId $contentRepositoryId $handledNodeResults->add($result); $this->logResult($result); - } elseif ($this->needsDisabling($node, $now) && !$this->isHidden($node, $nodeHiddenStateFinder)) { + } + if ($this->needsDisabling($node, $now) && !$nodeIsHidden) { $contentRepository->handle( DisableNodeAggregate::create( $node->subgraphIdentity->contentStreamId, From 6202cf6c7c37d33d4795173e591b43072e7c1a8e Mon Sep 17 00:00:00 2001 From: mhsdesign <85400359+mhsdesign@users.noreply.github.com> Date: Wed, 31 Jan 2024 13:53:42 +0100 Subject: [PATCH 07/13] TASK: Refactor to `HandlingResultType` --- .../TimeableNodeVisibilityCommandController.php | 14 +++++++------- .../Classes/Domain/HandlingResult.php | 13 +++++-------- .../Classes/Domain/HandlingResultSet.php | 6 +++--- .../Classes/Domain/HandlingResultType.php | 11 +++++++++++ .../Service/TimeableNodeVisibilityService.php | 2 +- 5 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 Neos.TimeableNodeVisibility/Classes/Domain/HandlingResultType.php diff --git a/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php b/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php index 908d7611c29..8ccba29e60f 100644 --- a/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php +++ b/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php @@ -2,12 +2,12 @@ namespace Neos\TimeableNodeVisibility\Command; +use Neos\ContentRepository\Core\Factory\ContentRepositoryId; +use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; use Neos\Flow\Annotations as Flow; use Neos\Flow\Cli\CommandController; -use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; -use Neos\ContentRepository\Core\Factory\ContentRepositoryId; +use Neos\TimeableNodeVisibility\Domain\HandlingResultType; use Neos\TimeableNodeVisibility\Service\TimeableNodeVisibilityService; -use Neos\TimeableNodeVisibility\Domain\HandlingResult; class TimeableNodeVisibilityCommandController extends CommandController { @@ -25,8 +25,8 @@ public function executeCommand(string $contentRepository = 'default', bool $quie ); if (!$quiet) { - $this->output->outputLine(sprintf('Enabled %d nodes with exceeded timed dates.', $handlingResult->countByResult(HandlingResult::RESULT_ENABLED))); - foreach ($handlingResult->getByResult(HandlingResult::RESULT_ENABLED) as $result) { + $this->output->outputLine(sprintf('Enabled %d nodes with exceeded timed dates.', $handlingResult->countByResult(HandlingResultType::ENABLED))); + foreach ($handlingResult->getByResult(HandlingResultType::ENABLED) as $result) { $this->output->outputLine(sprintf( '- NodeAggregateId: %s, DimensionSpacePoint: %s, Label: %s', $result->node->nodeAggregateId->value, @@ -36,8 +36,8 @@ public function executeCommand(string $contentRepository = 'default', bool $quie ); } - $this->output->outputLine(sprintf('Disabled %d nodes with exceeded timed dates.', $handlingResult->countByResult(HandlingResult::RESULT_DISABLED))); - foreach ($handlingResult->getByResult(HandlingResult::RESULT_DISABLED) as $result) { + $this->output->outputLine(sprintf('Disabled %d nodes with exceeded timed dates.', $handlingResult->countByResult(HandlingResultType::DISABLED))); + foreach ($handlingResult->getByResult(HandlingResultType::DISABLED) as $result) { $this->output->outputLine(sprintf( '- NodeAggregateId: %s, DimensionSpacePoint: %s, Label: %s', $result->node->nodeAggregateId->value, diff --git a/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResult.php b/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResult.php index 4051f863d53..86158b05018 100644 --- a/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResult.php +++ b/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResult.php @@ -6,22 +6,19 @@ final class HandlingResult { - public const RESULT_ENABLED = 'ENABLED'; - public const RESULT_DISABLED = 'DISABLED'; - private function __construct( public readonly Node $node, - public readonly string $result, + public readonly HandlingResultType $type ) { } - public static function createWithEnabled(Node $node): static + public static function createWithEnabled(Node $node): self { - return new static($node, static::RESULT_ENABLED); + return new self($node, HandlingResultType::ENABLED); } - public static function createWithDisabled(Node $node): static + public static function createWithDisabled(Node $node): self { - return new static($node, static::RESULT_DISABLED); + return new self($node, HandlingResultType::DISABLED); } } diff --git a/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResultSet.php b/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResultSet.php index 53d0cf54014..e31377aa36f 100644 --- a/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResultSet.php +++ b/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResultSet.php @@ -18,7 +18,7 @@ public function add(HandlingResult $handlingResult): void $this->handlingResults[] = $handlingResult; } - public function countByResult(string $result): int + public function countByResult(HandlingResultType $result): int { return count($this->getByResult($result)); } @@ -26,8 +26,8 @@ public function countByResult(string $result): int /** * @return array */ - public function getByResult(string $result): array + public function getByResult(HandlingResultType $result): array { - return array_filter($this->handlingResults, fn ($handlingResult) => $handlingResult->result === $result); + return array_filter($this->handlingResults, fn ($handlingResult) => $handlingResult->type === $result); } } diff --git a/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResultType.php b/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResultType.php new file mode 100644 index 00000000000..b3c13b48b5e --- /dev/null +++ b/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResultType.php @@ -0,0 +1,11 @@ +logger->info( sprintf('Timed node visibility: %s node [NodeAggregateId: %s, DimensionSpacePoints: %s]: %s', - $result->result, + $result->type->value, $result->node->nodeAggregateId->value, join(',', $result->node->originDimensionSpacePoint->coordinates), $result->node->getLabel()) From 522dc5c9bca43304cba78e8cb21d50d85a28236d Mon Sep 17 00:00:00 2001 From: mhsdesign <85400359+mhsdesign@users.noreply.github.com> Date: Wed, 31 Jan 2024 13:57:00 +0100 Subject: [PATCH 08/13] TASK: Rename `HandlingResultSet` and make it immutable --- .../{HandlingResultSet.php => HandlingResults.php} | 12 ++++-------- .../Service/TimeableNodeVisibilityService.php | 14 ++++++-------- 2 files changed, 10 insertions(+), 16 deletions(-) rename Neos.TimeableNodeVisibility/Classes/Domain/{HandlingResultSet.php => HandlingResults.php} (68%) diff --git a/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResultSet.php b/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResults.php similarity index 68% rename from Neos.TimeableNodeVisibility/Classes/Domain/HandlingResultSet.php rename to Neos.TimeableNodeVisibility/Classes/Domain/HandlingResults.php index e31377aa36f..d69903af158 100644 --- a/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResultSet.php +++ b/Neos.TimeableNodeVisibility/Classes/Domain/HandlingResults.php @@ -2,20 +2,16 @@ namespace Neos\TimeableNodeVisibility\Domain; -class HandlingResultSet +class HandlingResults { /** * @var HandlingResult[] */ - private array $handlingResults = []; + private array $handlingResults; - public function __construct() + public function __construct(HandlingResult ...$handlingResults) { - } - - public function add(HandlingResult $handlingResult): void - { - $this->handlingResults[] = $handlingResult; + $this->handlingResults = $handlingResults; } public function countByResult(HandlingResultType $result): int diff --git a/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php b/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php index 341f2b9dc08..0064b15ca15 100644 --- a/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php +++ b/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php @@ -23,7 +23,7 @@ use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\PropertyValue\Criteria\OrCriteria; use Neos\ContentRepository\Core\Projection\ContentGraph\Node; use Neos\TimeableNodeVisibility\Domain\HandlingResult; -use Neos\TimeableNodeVisibility\Domain\HandlingResultSet; +use Neos\TimeableNodeVisibility\Domain\HandlingResults; use Neos\ContentRepository\Core\SharedModel\Exception\WorkspaceDoesNotExist; use Neos\ContentRepository\Core\SharedModel\Exception\RootNodeAggregateDoesNotExist; @@ -36,7 +36,7 @@ class TimeableNodeVisibilityService #[Flow\Inject] protected LoggerInterface $logger; - public function handleExceededNodeDates(ContentRepositoryId $contentRepositoryId, WorkspaceName $workspaceName): HandlingResultSet + public function handleExceededNodeDates(ContentRepositoryId $contentRepositoryId, WorkspaceName $workspaceName): HandlingResults { $contentRepository = $this->contentRepositoryRegistry->get($contentRepositoryId); $liveWorkspace = $contentRepository->getWorkspaceFinder()->findOneByName($workspaceName); @@ -48,7 +48,7 @@ public function handleExceededNodeDates(ContentRepositoryId $contentRepositoryId $now = new \DateTimeImmutable(); $nodes = $this->getNodesWithExceededDates($contentRepository, $liveWorkspace, $now); - $handledNodeResults = new HandlingResultSet(); + $results = []; foreach ($nodes as $node) { $nodeIsHidden = $this->isHidden($node, $nodeHiddenStateFinder); @@ -62,8 +62,7 @@ public function handleExceededNodeDates(ContentRepositoryId $contentRepositoryId ) ); - $result = HandlingResult::createWithEnabled($node); - $handledNodeResults->add($result); + $results[] = $result = HandlingResult::createWithEnabled($node); $this->logResult($result); } @@ -77,12 +76,11 @@ public function handleExceededNodeDates(ContentRepositoryId $contentRepositoryId ) ); - $result = HandlingResult::createWithDisabled($node); - $handledNodeResults->add($result); + $results[] = $result = HandlingResult::createWithDisabled($node); $this->logResult($result); } } - return $handledNodeResults; + return new HandlingResults(...$results); } /** From a50ca7be476ee22885260e85380c9e5abac4ce2f Mon Sep 17 00:00:00 2001 From: mhsdesign <85400359+mhsdesign@users.noreply.github.com> Date: Wed, 31 Jan 2024 14:18:00 +0100 Subject: [PATCH 09/13] TASK: Rename `HandlingResult*` to `ChangedVisibility*` --- ...imeableNodeVisibilityCommandController.php | 10 +++--- .../Classes/Domain/ChangedVisibilities.php | 32 +++++++++++++++++++ .../Classes/Domain/ChangedVisibility.php | 27 ++++++++++++++++ .../Classes/Domain/ChangedVisibilityType.php | 14 ++++++++ .../Classes/Domain/HandlingResult.php | 24 -------------- .../Classes/Domain/HandlingResultType.php | 11 ------- .../Classes/Domain/HandlingResults.php | 29 ----------------- .../Service/TimeableNodeVisibilityService.php | 19 ++++++----- 8 files changed, 89 insertions(+), 77 deletions(-) create mode 100644 Neos.TimeableNodeVisibility/Classes/Domain/ChangedVisibilities.php create mode 100644 Neos.TimeableNodeVisibility/Classes/Domain/ChangedVisibility.php create mode 100644 Neos.TimeableNodeVisibility/Classes/Domain/ChangedVisibilityType.php delete mode 100644 Neos.TimeableNodeVisibility/Classes/Domain/HandlingResult.php delete mode 100644 Neos.TimeableNodeVisibility/Classes/Domain/HandlingResultType.php delete mode 100644 Neos.TimeableNodeVisibility/Classes/Domain/HandlingResults.php diff --git a/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php b/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php index 8ccba29e60f..71a262202a9 100644 --- a/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php +++ b/Neos.TimeableNodeVisibility/Classes/Command/TimeableNodeVisibilityCommandController.php @@ -6,7 +6,7 @@ use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName; use Neos\Flow\Annotations as Flow; use Neos\Flow\Cli\CommandController; -use Neos\TimeableNodeVisibility\Domain\HandlingResultType; +use Neos\TimeableNodeVisibility\Domain\ChangedVisibilityType; use Neos\TimeableNodeVisibility\Service\TimeableNodeVisibilityService; class TimeableNodeVisibilityCommandController extends CommandController @@ -25,8 +25,8 @@ public function executeCommand(string $contentRepository = 'default', bool $quie ); if (!$quiet) { - $this->output->outputLine(sprintf('Enabled %d nodes with exceeded timed dates.', $handlingResult->countByResult(HandlingResultType::ENABLED))); - foreach ($handlingResult->getByResult(HandlingResultType::ENABLED) as $result) { + $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, @@ -36,8 +36,8 @@ public function executeCommand(string $contentRepository = 'default', bool $quie ); } - $this->output->outputLine(sprintf('Disabled %d nodes with exceeded timed dates.', $handlingResult->countByResult(HandlingResultType::DISABLED))); - foreach ($handlingResult->getByResult(HandlingResultType::DISABLED) as $result) { + $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, 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 @@ +handlingResults = $handlingResults; - } - - public function countByResult(HandlingResultType $result): int - { - return count($this->getByResult($result)); - } - - /** - * @return array - */ - public function getByResult(HandlingResultType $result): array - { - return array_filter($this->handlingResults, fn ($handlingResult) => $handlingResult->type === $result); - } -} diff --git a/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php b/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php index 0064b15ca15..1e761c51f14 100644 --- a/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php +++ b/Neos.TimeableNodeVisibility/Classes/Service/TimeableNodeVisibilityService.php @@ -22,11 +22,14 @@ use Neos\ContentRepository\Core\Feature\NodeDisabling\Command\DisableNodeAggregate; use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\PropertyValue\Criteria\OrCriteria; use Neos\ContentRepository\Core\Projection\ContentGraph\Node; -use Neos\TimeableNodeVisibility\Domain\HandlingResult; -use Neos\TimeableNodeVisibility\Domain\HandlingResults; +use Neos\TimeableNodeVisibility\Domain\ChangedVisibility; +use Neos\TimeableNodeVisibility\Domain\ChangedVisibilities; use Neos\ContentRepository\Core\SharedModel\Exception\WorkspaceDoesNotExist; use Neos\ContentRepository\Core\SharedModel\Exception\RootNodeAggregateDoesNotExist; +/** + * @internal + */ #[Flow\Scope('singleton')] class TimeableNodeVisibilityService { @@ -36,7 +39,7 @@ class TimeableNodeVisibilityService #[Flow\Inject] protected LoggerInterface $logger; - public function handleExceededNodeDates(ContentRepositoryId $contentRepositoryId, WorkspaceName $workspaceName): HandlingResults + public function handleExceededNodeDates(ContentRepositoryId $contentRepositoryId, WorkspaceName $workspaceName): ChangedVisibilities { $contentRepository = $this->contentRepositoryRegistry->get($contentRepositoryId); $liveWorkspace = $contentRepository->getWorkspaceFinder()->findOneByName($workspaceName); @@ -62,7 +65,7 @@ public function handleExceededNodeDates(ContentRepositoryId $contentRepositoryId ) ); - $results[] = $result = HandlingResult::createWithEnabled($node); + $results[] = $result = ChangedVisibility::createForNodeWasEnabled($node); $this->logResult($result); } @@ -76,11 +79,11 @@ public function handleExceededNodeDates(ContentRepositoryId $contentRepositoryId ) ); - $results[] = $result = HandlingResult::createWithDisabled($node); + $results[] = $result = ChangedVisibility::createForNodeWasDisabled($node); $this->logResult($result); } } - return new HandlingResults(...$results); + return new ChangedVisibilities(...$results); } /** @@ -122,7 +125,7 @@ private function getNodesWithExceededDates(ContentRepository $contentRepository, foreach ($nodes as $node) { if (!$node->originDimensionSpacePoint->equals($dimensionSpacePoint)) { - // The node will be enabled by node in origin dimension spacepoint + // The node will be enabled by node in origin dimension space-point continue; } @@ -166,7 +169,7 @@ private function needsDisabling(Node $node, \DateTimeImmutable $now): bool ); } - private function logResult(HandlingResult $result): void + private function logResult(ChangedVisibility $result): void { $this->logger->info( sprintf('Timed node visibility: %s node [NodeAggregateId: %s, DimensionSpacePoints: %s]: %s', From 576a021680e8ae581f36f4f7ffbedd09dd1910e5 Mon Sep 17 00:00:00 2001 From: mhsdesign <85400359+mhsdesign@users.noreply.github.com> Date: Sun, 4 Feb 2024 22:50:16 +0100 Subject: [PATCH 10/13] TASK: Run ComposerManifestMerger --- composer.json | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index 0470adef97d..b830c34fc9e 100644 --- a/composer.json +++ b/composer.json @@ -9,8 +9,8 @@ "neos/flow-development-collection": "9.0.x-dev", "doctrine/dbal": "^2.8", "doctrine/migrations": "*", - "neos/eventstore": "^1", - "neos/eventstore-doctrineadapter": "^1", + "neos/eventstore": "~1.0.0", + "neos/eventstore-doctrineadapter": "~1.0.0", "php": "^8.2", "neos/error-messages": "*", "neos/utility-objecthandling": "*", @@ -33,18 +33,18 @@ "neos/utility-unicode": "*", "doctrine/orm": "^2.6", "ext-dom": "*", + "ext-libxml": "*", "neos/twitter-bootstrap": "^3.0.6", "neos/utility-files": "*", "neos/utility-mediatypes": "*", "doctrine/common": "^2.7 || ^3.0", + "enshrined/svg-sanitize": "^0.16.0", "neos/imagine": "^3.1.0", "imagine/imagine": "*", "neos/party": "~7.0.3", "neos/fusion-form": "^1.0 || ^2.0", "neos/form": "*", - "neos/kickstarter": "~9.0.0", - "neos/timeable-node-visibility": "*", - "enshrined/svg-sanitize": "^0.16.0" + "neos/kickstarter": "~9.0.0" }, "replace": { "packagefactory/atomicfusion-afx": "*", @@ -115,21 +115,22 @@ "test:functional": [ "../../bin/phpunit --colors --stop-on-failure -c ../../Build/BuildEssentials/PhpUnit/FunctionalTests.xml Neos.ContentRepository.Core/Tests/Functional" ], + "test:behat-cli": "../../bin/behat -f progress --strict --no-interaction", "test:behavioral": [ - "../../bin/behat -f progress -c Neos.ContentRepository.BehavioralTests/Tests/Behavior/behat.yml.dist", - "../../bin/behat -f progress -c Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/behat.yml.dist", + "@test:behat-cli -c Neos.ContentRepository.BehavioralTests/Tests/Behavior/behat.yml.dist", + "@test:behat-cli -c Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/behat.yml.dist", "../../flow doctrine:migrate --quiet; ../../flow cr:setup", - "../../bin/behat -f progress -c Neos.Neos/Tests/Behavior/behat.yml", - "../../bin/behat -f progress -c Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/behat.yml.dist", - "../../bin/behat -f progress -c Neos.TimeableNodeVisibility/Tests/Behavior/behat.yml.dist" + "@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.TimeableNodeVisibility/Tests/Behavior/behat.yml.dist" ], "test:behavioral:stop-on-failure": [ - "../../bin/behat -vvv --stop-on-failure -f progress -c Neos.ContentRepository.BehavioralTests/Tests/Behavior/behat.yml.dist", - "../../bin/behat -vvv --stop-on-failure -f progress -c Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/behat.yml.dist", + "@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", - "../../bin/behat -vvv --stop-on-failure -f progress -c Neos.Neos/Tests/Behavior/behat.yml", - "../../bin/behat -vvv --stop-on-failure -f progress -c Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/behat.yml.dist", - "../../bin/behat -vvv --stop-on-failure -f progress -c Neos.TimeableNodeVisibility/Tests/Behavior/behat.yml.dist" + "@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.TimeableNodeVisibility/Tests/Behavior/behat.yml.dist" ], "test": [ "@test:unit", @@ -225,6 +226,9 @@ ], "Neos\\SiteKickstarter\\": [ "Neos.SiteKickstarter/Classes" + ], + "Neos\\TimeableNodeVisibility\\": [ + "Neos.TimeableNodeVisibility/Classes" ] } }, @@ -280,6 +284,9 @@ ], "Neos\\SiteKickstarter\\Tests\\": [ "Neos.SiteKickstarter/Tests" + ], + "Neos\\TimeableNodeVisibility\\Tests\\": [ + "Neos.TimeableNodeVisibility/Tests" ] } }, From 796e212749f286d6a6a87e3f56085bbf552b69e9 Mon Sep 17 00:00:00 2001 From: Denny Lubitz Date: Wed, 7 Feb 2024 19:47:32 +0100 Subject: [PATCH 11/13] TASK: Add readme --- Neos.TimeableNodeVisibility/Readme.rst | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Neos.TimeableNodeVisibility/Readme.rst diff --git a/Neos.TimeableNodeVisibility/Readme.rst b/Neos.TimeableNodeVisibility/Readme.rst new file mode 100644 index 00000000000..328b36099be --- /dev/null +++ b/Neos.TimeableNodeVisibility/Readme.rst @@ -0,0 +1,19 @@ +---------------------- +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 `_). + +The Timeable Node Visibility package allows yout to enable or disable nodes at a given +point in time. + +If you want to use Neos, please have a look at the `Neos documentation +`_ + +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. From 2d82a317da3b2d86218bbf2a1c0f2760da393c2d Mon Sep 17 00:00:00 2001 From: Denny Lubitz Date: Fri, 9 Feb 2024 15:13:21 +0100 Subject: [PATCH 12/13] Task: Add documentation --- Neos.TimeableNodeVisibility/Readme.rst | 87 +++++++++++++++++++++++--- 1 file changed, 80 insertions(+), 7 deletions(-) diff --git a/Neos.TimeableNodeVisibility/Readme.rst b/Neos.TimeableNodeVisibility/Readme.rst index 328b36099be..1ef7e21921b 100644 --- a/Neos.TimeableNodeVisibility/Readme.rst +++ b/Neos.TimeableNodeVisibility/Readme.rst @@ -1,19 +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 `_). -The Timeable Node Visibility package allows yout to enable or disable nodes at a given -point in time. +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') + -If you want to use Neos, please have a look at the `Neos documentation -`_ 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. +used for development and all pull requests should go into it. \ No newline at end of file From dd1b2cb6a412da0cb5d169241af69dd9310d9f6a Mon Sep 17 00:00:00 2001 From: Denny Lubitz Date: Fri, 9 Feb 2024 16:13:58 +0100 Subject: [PATCH 13/13] Task: Move translations --- .../Private/Translations/ar/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Private/Translations/cs/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Private/Translations/da/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Private/Translations/el/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Private/Translations/es/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Private/Translations/fi/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Private/Translations/fr/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Private/Translations/hu/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Translations/id_ID/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Private/Translations/it/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Private/Translations/ja/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Private/Translations/km/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Private/Translations/lv/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Private/Translations/nl/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Private/Translations/no/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Private/Translations/pl/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Private/Translations/pt/NodeTypes/Timeable.xlf | 14 ++++++++++++++ .../Translations/pt_BR/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Private/Translations/ru/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Private/Translations/sr/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Private/Translations/sv/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Translations/tl_PH/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Private/Translations/tr/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Private/Translations/uk/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Private/Translations/vi/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Private/Translations/zh/NodeTypes/Timeable.xlf | 13 +++++++++++++ .../Translations/zh_TW/NodeTypes/Timeable.xlf | 13 +++++++++++++ 27 files changed, 352 insertions(+) create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/ar/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/cs/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/da/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/el/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/es/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/fi/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/fr/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/hu/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/id_ID/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/it/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/ja/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/km/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/lv/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/nl/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/no/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/pl/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/pt/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/pt_BR/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/ru/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/sr/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/sv/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/tl_PH/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/tr/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/uk/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/vi/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/zh/NodeTypes/Timeable.xlf create mode 100644 Neos.TimeableNodeVisibility/Resources/Private/Translations/zh_TW/NodeTypes/Timeable.xlf 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/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/es/NodeTypes/Timeable.xlf b/Neos.TimeableNodeVisibility/Resources/Private/Translations/es/NodeTypes/Timeable.xlf new file mode 100644 index 00000000000..30cd65d2b18 --- /dev/null +++ b/Neos.TimeableNodeVisibility/Resources/Private/Translations/es/NodeTypes/Timeable.xlf @@ -0,0 +1,13 @@ + + + + + + Show after + Show after + + 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 + 於之後隱藏 + + +