TASK: Remove b/c layer Node::$nodeAggregateId

neos · Jul 26, 2024 · 71abbee · 71abbee
1 parent dd5ed20
commit 71abbee
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 23 deletions.
diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Node.php b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Node.php
@@ -79,17 +79,6 @@
      */
     public ContentSubgraphIdentity $subgraphIdentity;
 
-    /**
-     * In PHP please use {@see $aggregateId} instead.
-     *
-     * For Fusion please use the upcoming FlowQuery operation:
-     * ```
-     * ${q(node).id()}
-     * ```
-     * @deprecated will be removed before the final 9.0 release
-     */
-    public NodeAggregateId $nodeAggregateId;
-
     /**
      * In PHP please use {@see $name} instead.
      *
@@ -134,7 +123,6 @@ private function __construct(
             throw new \InvalidArgumentException('The NodeName must be set if the Node is tethered.', 1695118377);
         }
         // legacy to be removed before Neos9
-        $this->nodeAggregateId = $this->aggregateId;
         $this->nodeName = $this->name;
         $this->subgraphIdentity = ContentSubgraphIdentity::create(
             $contentRepositoryId,

diff --git a/Neos.Neos/Classes/Domain/Repository/SiteRepository.php b/Neos.Neos/Classes/Domain/Repository/SiteRepository.php
@@ -110,7 +110,7 @@ public function findOneByNodeName(string|SiteNodeName $nodeName): ?Site
      * To find the correct site node by its descended child node leverage `findClosestNode`:
      * ```php
      * $siteNode = $subgraph->findClosestNode(
-     *     $node->nodeAggregateId,
+     *     $node->aggregateId,
      *     FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_SITE)
      * );
      * ```

diff --git a/Neos.Neos/Resources/Private/Templates/Service/Nodes/Index.html b/Neos.Neos/Resources/Private/Templates/Service/Nodes/Index.html
@@ -26,9 +26,9 @@ <h1>{neos:backend.translate(id: 'service.nodes.title', value: 'Nodes')}</h1>
                             </f:if>
                         </f:alias>
                         <label class="node-label">{node.label}</label>
-                        (<span class="node-identifier">{node.nodeAggregateId.value}</span>)
+                        (<span class="node-identifier">{node.aggregateId.value}</span>)
                         [<span class="node-type">{node.nodeTypeName.value}</span>]
-                        <f:link.action rel="node-show" controller="Service\Nodes" action="show" arguments="{identifier: node.nodeAggregateId.value}" format="html">{neos:backend.translate(id: 'service.nodes.show', value: 'Show')}</f:link.action>
+                        <f:link.action rel="node-show" controller="Service\Nodes" action="show" arguments="{identifier: node.aggregateId.value}" format="html">{neos:backend.translate(id: 'service.nodes.show', value: 'Show')}</f:link.action>
                     </li>
                 </f:for>
             </ul>

diff --git a/Neos.Neos/Resources/Private/Templates/Service/Nodes/Show.html b/Neos.Neos/Resources/Private/Templates/Service/Nodes/Show.html
@@ -13,7 +13,7 @@ <h1>{neos:backend.translate(id: 'node', value: 'Node')}: {node.label}</h1>
                     <caption>{neos:backend.translate(id: 'service.nodes.nodeProperties', value: 'Node Properties')}</caption>
                     <tr>
                         <th>_identifier</th>
-                        <td class="node-identifier">{node.nodeAggregateId.value}</td>
+                        <td class="node-identifier">{node.aggregateId.value}</td>
                     </tr>
                     <tr>
                         <th>_path</th>
@@ -48,7 +48,7 @@ <h1>{neos:backend.translate(id: 'node', value: 'Node')}: {node.label}</h1>
                         </f:else>
                     </f:if>
                 </f:alias>
-                <f:link.action rel="node-show" controller="Service\Nodes" action="show" arguments="{identifier: node.nodeAggregateId.value}" format="html">{neos:backend.translate(id: 'service.nodes.show', value: 'Show')}</f:link.action>
+                <f:link.action rel="node-show" controller="Service\Nodes" action="show" arguments="{identifier: node.aggregateId.value}" format="html">{neos:backend.translate(id: 'service.nodes.show', value: 'Show')}</f:link.action>
             </div>
         </div>
     </body>

diff --git a/Neos.Neos/Tests/Behavior/Features/Fusion/ContentCollection.feature b/Neos.Neos/Tests/Behavior/Features/Fusion/ContentCollection.feature
@@ -127,7 +127,7 @@ Feature: Tests for the "Neos.Neos:ContentCollection" Fusion prototype
     include: resource://Neos.Neos/Private/Fusion/Root.fusion
 
     prototype(Neos.Neos:Test.ContentType) < prototype(Neos.Fusion:Value) {
-      value = ${node.nodeAggregateId.value + ' (' + node.nodeTypeName.value + ') '}
+      value = ${q(node).id() + ' (' + node.nodeTypeName.value + ') '}
     }
 
     test = Neos.Neos:ContentCollection {

diff --git a/Neos.Neos/Tests/Behavior/Features/Fusion/FlowQuery.feature b/Neos.Neos/Tests/Behavior/Features/Fusion/FlowQuery.feature
@@ -95,7 +95,7 @@ Feature: Tests for the "Neos.ContentRepository" Flow Query methods.
       renderer = Neos.Fusion:Loop {
         items = ${props.nodes}
         itemName = 'node'
-        itemRenderer = ${node.nodeAggregateId.value}
+        itemRenderer = ${q(node).id()}
         @glue = ','
       }
     }

diff --git a/Neos.Neos/Tests/Behavior/Features/Fusion/Menu.feature b/Neos.Neos/Tests/Behavior/Features/Fusion/Menu.feature
@@ -101,7 +101,7 @@ Feature: Tests for the "Neos.Neos:Menu" and related Fusion prototypes
       renderer = Neos.Fusion:Loop {
         items = ${props.items}
         itemRenderer = afx`
-          {item.node.nodeAggregateId.value}<Neos.Neos:Test.Menu.ItemStateIndicator state={item.state.value} /> ({item.menuLevel}){String.chr(10)}
+          {q(item.node).id()}<Neos.Neos:Test.Menu.ItemStateIndicator state={item.state.value} /> ({item.menuLevel}){String.chr(10)}
           <Neos.Neos:Test.Menu items={item.subItems} @if={item.subItems} />
         `
       }

diff --git a/Neos.Workspace.Ui/Resources/Private/Templates/Workspace/Show.html b/Neos.Workspace.Ui/Resources/Private/Templates/Workspace/Show.html
@@ -32,7 +32,7 @@
 									<f:if condition="{document.changes -> f:count()} > 1">
 										<f:then>
 											<td class="check neos-priority1">
-												<label for="check-document-{document.documentNode.nodeAggregateId.value}" class="neos-checkbox"><f:form.checkbox id="check-document-{document.documentNode.nodeAggregateId.value}" class="neos-check-document" value="{document.documentNode.nodeAggregateId.value}"/><span></span></label>
+												<label for="check-document-{document.documentNode.aggregateId.value}" class="neos-checkbox"><f:form.checkbox id="check-document-{document.documentNode.aggregateId.value}" class="neos-check-document" value="{document.documentNode.aggregateId.value}"/><span></span></label>
 											</td>
 											<td class="neos-priority1 path-caption">
 										</f:then>
@@ -56,11 +56,11 @@
 										</div>
 									</td>
 									<td class="neos-action neos-folder">
-										<i class="fold-toggle fas fa-chevron-up icon-white" data-toggle="fold-{document.documentNode.nodeAggregateId.value}"></i>
+										<i class="fold-toggle fas fa-chevron-up icon-white" data-toggle="fold-{document.documentNode.aggregateId.value}"></i>
 									</td>
 								</tr>
 								<f:for each="{document.changes}" key="relativePath" as="change">
-									<tr class="neos-change fold-{document.documentNode.nodeAggregateId.value} document-{document.documentNode.nodeAggregateId.value}" data-nodepath="{relativePath}" data-ismoved="{f:if(condition: change.isMoved, then: 'true', else: 'false')}" data-isnew="{f:if(condition: change.isNew, then: 'true', else: 'false')}">
+									<tr class="neos-change fold-{document.documentNode.aggregateId.value} document-{document.documentNode.aggregateId.value}" data-nodepath="{relativePath}" data-ismoved="{f:if(condition: change.isMoved, then: 'true', else: 'false')}" data-isnew="{f:if(condition: change.isNew, then: 'true', else: 'false')}">
 										<td class="check neos-priority1">
 											<label for="{change.serializedNodeAddress}" class="neos-checkbox"><f:form.checkbox name="nodes[]" value="{change.serializedNodeAddress}" id="{change.serializedNodeAddress}" /><span></span></label>
 										</td>