Merge pull request #4 from techdivision/task/bugfixes

TASK // Bugfixes And Refactoring
techdivision · May 6, 2024 · 22ff8dd · 22ff8dd
2 parents 0b5c4cf + 905e403
commit 22ff8dd
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 15 deletions.
diff --git a/...Fusion/ContentNodeTypes/ChildNodes.fusion → .../Private/Fusion/Content/ChildNodes.fusion b/...Fusion/ContentNodeTypes/ChildNodes.fusion → .../Private/Fusion/Content/ChildNodes.fusion
@@ -4,21 +4,12 @@ prototype(TechDivision.Card.Decks:ChildNodes) < prototype(Neos.Fusion:Join) {
     cardArea = Neos.Neos:ContentComponent {
         @context.childNodeEntryPoint = ${q(node).property('childNodeEntryPoint') ? q(node).property('childNodeEntryPoint') : []}
         @context.cardsLayout = ${q(node).property('cardsLayout') ? q(node).property('cardsLayout') : ''}
-        @context.showHiddenInMenus = Neos.Fusion:Case {
-            hideHiddenDocuments {
-                condition = ${q(node).property('showHiddenInMenus') == false}
-                renderer = ${q(childNodeEntryPoint).children('[instanceof Neos.Neos:Document][_hiddenInIndex][_hiddenInIndex != true]').get()}
-            }
-            showHiddenDocuments {
-                condition = ${q(node).property('showHiddenInMenus') == true}
-                renderer = ${q(childNodeEntryPoint).children('[instanceof Neos.Neos:Document]').get()}
-            }
-        }
 
         childNodesRenderer = Neos.Fusion:Loop {
-            items = ${showHiddenInMenus}
+            items = ${q(node).property('showHiddenInMenus') == false ? q(childNodeEntryPoint).children('[instanceof Neos.Neos:Document][_hiddenInIndex][_hiddenInIndex != true]').get() : q(childNodeEntryPoint).children('[instanceof Neos.Neos:Document]').get()}
             itemName = 'node'
             itemRenderer = TechDivision.Card:Integration.Card {
+                node = ${node}
                 cardLayout.overrideCardLayout {
                     @position = 'before defaultCardLayout'
                     condition = ${cardsLayout}
@@ -53,4 +44,4 @@ prototype(TechDivision.Card.Decks:ChildNodes) < prototype(Neos.Fusion:Join) {
             2 = ${Neos.Caching.descendantOfTag(childNodeEntryPoint)}
         }
     }
-}
+}
diff --git a/...sion/ContentNodeTypes/ContentCards.fusion → ...rivate/Fusion/Content/ContentCards.fusion b/...sion/ContentNodeTypes/ContentCards.fusion → ...rivate/Fusion/Content/ContentCards.fusion
diff --git a/.../Fusion/ContentNodeTypes/NodeTypes.fusion → ...s/Private/Fusion/Content/NodeTypes.fusion b/.../Fusion/ContentNodeTypes/NodeTypes.fusion → ...s/Private/Fusion/Content/NodeTypes.fusion
@@ -10,6 +10,7 @@ prototype(TechDivision.Card.Decks:NodeTypes) < prototype(Neos.Fusion:Join) {
             items = ${q(site).find(Array.join(Array.map(nodeTypes, x => '[instanceof ' + x + ']'), ',')).get()}
             itemName = 'node'
             itemRenderer = TechDivision.Card:Integration.Card {
+                node = ${node}
                 cardLayout.overrideCardLayout {
                     @position = 'before defaultCardLayout'
                     condition = ${cardsLayout}
@@ -45,4 +46,4 @@ prototype(TechDivision.Card.Decks:NodeTypes) < prototype(Neos.Fusion:Join) {
         }
     }
 
-}
+}
diff --git a/...ion/ContentNodeTypes/SelectedNodes.fusion → ...ivate/Fusion/Content/SelectedNodes.fusion b/...ion/ContentNodeTypes/SelectedNodes.fusion → ...ivate/Fusion/Content/SelectedNodes.fusion
@@ -10,6 +10,7 @@ prototype(TechDivision.Card.Decks:SelectedNodes) < prototype(Neos.Fusion:Join) {
             items =  ${q(node).property('selectedNodes') ? q(node).property('selectedNodes') : []}
             itemName = 'node'
             itemRenderer = TechDivision.Card:Integration.Card {
+                node = ${node}
                 cardLayout.overrideCardLayout {
                     @position = 'before defaultCardLayout'
                     condition = ${cardsLayout}
@@ -44,4 +45,4 @@ prototype(TechDivision.Card.Decks:SelectedNodes) < prototype(Neos.Fusion:Join) {
             2 = ${Neos.Caching.nodeTag(selectedNodes)}
         }
     }
-}
+}
diff --git a/...n/OverrideNodeTypes/Neos.Neos:Page.fusion → ...ate/Fusion/Override/Neos.Neos:Page.fusion b/...n/OverrideNodeTypes/Neos.Neos:Page.fusion → ...ate/Fusion/Override/Neos.Neos:Page.fusion
diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
     "GPL-3.0-or-later"
   ],
   "require": {
-    "techdivision/card" : "^1.0 || ^2.0"
+    "techdivision/card" : "^2.1"
   },
   "extra": {
     "neos": {