TASK: Adjust fusion code to use Neos.Node.getNodeType

neos · Apr 30, 2024 · 28d4087 · 28d4087
1 parent 3e34094
commit 28d4087
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Neos.ContentRepository.NodeAccess/Configuration/Testing/NodeTypes.yaml b/Neos.ContentRepository.NodeAccess/Configuration/Testing/NodeTypes.yaml
@@ -104,7 +104,7 @@
 'Neos.ContentRepository.Testing:PageWithConfiguredLabel':
   superTypes:
     'Neos.ContentRepository.Testing:Page': true
-  label: "${q(node).property('title') || q(node).property('text') || ((node.nodeType.label || node.nodeType.name) + ' (' + node.name + ')')}"
+  label: "${q(node).property('title') || q(node).property('text') || node.nodeTypeName + ' (' + node.name + ')')}"
   ui:
     label: 'Labeled Page'
 

diff --git a/Neos.Neos/Resources/Private/Fusion/RawContent/NodeHeader.fusion b/Neos.Neos/Resources/Private/Fusion/RawContent/NodeHeader.fusion
@@ -1,7 +1,7 @@
 prototype(Neos.Neos:RawContent.NodeHeader) < prototype(Neos.Fusion:Component) {
 
-  labelParts = ${String.split(node.nodeType.label, ':')}
-  icon = ${node.nodeType.fullConfiguration.ui.icon}
+  labelParts = ${String.split(Neos.Node.getNodeType(node).label, ':')}
+  icon = ${Neos.Node.getNodeType(node).fullConfiguration.ui.icon}
   visibilityInformations = Neos.Fusion:DataStructure {
     hidden = 'hidden'
     hidden.@if.isHidden = ${node.hidden}
@@ -11,7 +11,7 @@ prototype(Neos.Neos:RawContent.NodeHeader) < prototype(Neos.Fusion:Component) {
   renderer = afx`
     <header>
       <i class={'fas fa-' + props.icon + ' ' + props.icon} @if={props.icon}></i>&nbsp;
-      {(node.tethered || q(node).is('[instanceof Neos.Neos:Document]')) ? node.label : Translation.translate(props.labelParts[2], node.nodeType.label, [], props.labelParts[1], props.labelParts[0])}
+      {(node.classification.tethered || q(node).is('[instanceof Neos.Neos:Document]')) ? node.label : Translation.translate(props.labelParts[2], Neos.Node.getNodeType(node).label, [], props.labelParts[1], props.labelParts[0])}
       <span @if={props.visibilityInformations}> - {props.visibilityInformations}</span>
     </header>
   `

diff --git a/Neos.Neos/Resources/Private/Fusion/RawContent/NodeProperties.fusion b/Neos.Neos/Resources/Private/Fusion/RawContent/NodeProperties.fusion
@@ -1,6 +1,6 @@
 prototype(Neos.Neos:RawContent.NodeProperties) < prototype(Neos.Fusion:Component) {
   @private {
-    items = ${node.nodeType.properties}
+    items = ${Neos.Node.getNodeType(node).properties}
     items.@process.sort = ${Neos.Array.sortByPropertyPath(value, 'ui.inspector.position')}
   }