Merge pull request #16 from techdivision/task/prevent-deep-content-ne…

…sting TASK // Prevent deep content nesting and refactor structure
techdivision · Apr 2, 2024 · 42c7c64 · 42c7c64
2 parents a2f0749 + f363c76
commit 42c7c64
Show file tree

Hide file tree

Showing 47 changed files with 1,443 additions and 306 deletions.
diff --git a/Classes/Eel/CssClassMappingHelper.php b/Classes/Eel/CssClassMappingHelper.php
@@ -1,38 +1,38 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace TechDivision\NodeTypes\FlexColumnLayouts\Eel;
 
+/**
+ * This file is part of the TechDivision.NodeTypes.FlexColumnLayouts package.
+ *
+ * TechDivision - neos@techdivision.com
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
+
 use Neos\Flow\Annotations as Flow;
 use Neos\Eel\ProtectedContextAwareInterface;
 
-
-/*
-* This file is part of the TechDivision.NodeTypes.FlexColumnLayouts package.
-*
-* TechDivision - neos@techdivision.com
-*
-* This package is Open Source Software. For the full copyright and license
-* information, please view the LICENSE file which was distributed with this
-* source code.
-*/
-
 class CssClassMappingHelper implements ProtectedContextAwareInterface
 {
     /**
      * @var array
      * @Flow\InjectConfiguration("cssClassMapping")
      */
-    protected $cssClassMapping;
+    protected array $cssClassMapping;
 
     /**
      * replaces class values from class string with according css classes from
      * other frameworks
+     *
      * @param string $concatenatedCssClasses
      * @param string $configurationKey
      * @return string
      */
-    public function replace($concatenatedCssClasses, $configurationKey): string
+    public function replace(string $concatenatedCssClasses, string $configurationKey): string
     {
         if (array_key_exists($configurationKey, $this->cssClassMapping) === false) {
             return $concatenatedCssClasses;
@@ -43,7 +43,7 @@ public function replace($concatenatedCssClasses, $configurationKey): string
         $replacedCssClasses = [];
 
         foreach ($cssClasses as $cssClass) {
-            if (trim($cssClass) === ''){
+            if (trim($cssClass) === '') {
                 continue;
             }
             if (array_key_exists($cssClass, $replacements)) {
@@ -59,12 +59,10 @@ public function replace($concatenatedCssClasses, $configurationKey): string
 
     /**
      * @param string $methodName
-     *
      * @return boolean
      */
     public function allowsCallOfMethod($methodName): bool
     {
         return true;
     }
-
-}
+}
diff --git a/Configuration/NodeTypes.Content.OneColumn.yaml b/Configuration/NodeTypes.Content.OneColumn.yaml
diff --git a/Configuration/NodeTypes.FlexCollection.yaml b/Configuration/NodeTypes.FlexCollection.yaml
diff --git a/Configuration/NodeTypes.Override.Content.Column.yaml b/Configuration/NodeTypes.Override.Content.Column.yaml
diff --git a/...n/Settings.CssClassMapping.Bootstrap.yaml → ...iguration/Settings.FlexColumnLayouts.yaml b/...n/Settings.CssClassMapping.Bootstrap.yaml → ...iguration/Settings.FlexColumnLayouts.yaml
@@ -3,7 +3,6 @@ TechDivision:
     FlexColumnLayouts:
       cssClassMapping:
         bootstrap:
-
           'flex': 'd-flex'
 
           'flex-col': 'flex-column'
@@ -115,7 +114,6 @@ TechDivision:
           'lg:items-center': 'align-items-lg-center'
           'xl:items-center': 'align-items-xl-center'
 
-
           #ADVANCED Configuration/NodeTypes.FlexCollection.yaml properties
 
           'content-between': 'align-content-between'

diff --git a/Configuration/Settings.Fusion.yaml b/Configuration/Settings.Fusion.yaml
@@ -0,0 +1,4 @@
+Neos:
+  Fusion:
+    defaultContext:
+      'CssClassMapping': 'TechDivision\NodeTypes\FlexColumnLayouts\Eel\CssClassMappingHelper'
diff --git a/Configuration/Settings.yaml → Configuration/Settings.Neos.yaml b/Configuration/Settings.yaml → Configuration/Settings.Neos.yaml
@@ -9,6 +9,3 @@ Neos:
           TechDivision.NodeTypes.FlexColumnLayouts:
             - 'Main'
             - 'NodeTypes/*'
-  Fusion:
-    defaultContext:
-      'CssClassMapping': 'TechDivision\NodeTypes\FlexColumnLayouts\Eel\CssClassMappingHelper'
diff --git a/Migrations/ContentRepository/Version20200904150412.yaml b/Migrations/ContentRepository/Version20200904150412.yaml
@@ -1,119 +1,90 @@
 up:
   comments: 'This migration changes all your existing grid columns'
   migration:
-    -
-      filters:
-        -
-          type: 'NodeType'
+    - filters:
+        - type: 'NodeType'
           settings:
             nodeType: 'Neos.Neos:ContentCollection'
-        -
-          type: 'NodeName'
+        - type: 'NodeName'
           settings:
             nodeName: 'column0'
 
       transformations:
-        -
-          type: 'ChangeNodeType'
+        - type: 'ChangeNodeType'
           settings:
             newType: 'TechDivision.NodeTypes.FlexColumnLayouts:FlexCollection.FirstColumn'
-    -
-      filters:
-        -
-          type: 'NodeType'
+    - filters:
+        - type: 'NodeType'
           settings:
             nodeType: 'Neos.Neos:ContentCollection'
-        -
-          type: 'NodeName'
+        - type: 'NodeName'
           settings:
             nodeName: 'column1'
 
       transformations:
-        -
-          type: 'ChangeNodeType'
+        - type: 'ChangeNodeType'
           settings:
             newType: 'TechDivision.NodeTypes.FlexColumnLayouts:FlexCollection.SecondColumn'
-    -
-      filters:
-        -
-          type: 'NodeType'
+    - filters:
+        - type: 'NodeType'
           settings:
             nodeType: 'Neos.Neos:ContentCollection'
-        -
-          type: 'NodeName'
+        - type: 'NodeName'
           settings:
             nodeName: 'column2'
 
       transformations:
-        -
-          type: 'ChangeNodeType'
+        - type: 'ChangeNodeType'
           settings:
             newType: 'TechDivision.NodeTypes.FlexColumnLayouts:FlexCollection.ThirdColumn'
-    -
-      filters:
-        -
-          type: 'NodeType'
+    - filters:
+        - type: 'NodeType'
           settings:
             nodeType: 'Neos.Neos:ContentCollection'
-        -
-          type: 'NodeName'
+        - type: 'NodeName'
           settings:
             nodeName: 'column3'
 
       transformations:
-        -
-          type: 'ChangeNodeType'
+        - type: 'ChangeNodeType'
           settings:
             newType: 'TechDivision.NodeTypes.FlexColumnLayouts:FlexCollection.FourthColumn'
 
 down:
   migration:
-    -
-      filters:
-        -
-          type: 'NodeType'
+    - filters:
+        - type: 'NodeType'
           settings:
             nodeType: 'TechDivision.NodeTypes.FlexColumnLayouts:FlexCollection.FirstColumn'
 
       transformations:
-        -
-          type: 'ChangeNodeType'
+        - type: 'ChangeNodeType'
           settings:
             newType: 'Neos.Neos:ContentCollection'
-    -
-      filters:
-        -
-          type: 'NodeType'
+    - filters:
+        - type: 'NodeType'
           settings:
             nodeType: 'TechDivision.NodeTypes.FlexColumnLayouts:FlexCollection.SecondColumn'
 
       transformations:
-        -
-          type: 'ChangeNodeType'
+        - type: 'ChangeNodeType'
           settings:
             newType: 'Neos.Neos:ContentCollection'
-    -
-      filters:
-        -
-          type: 'NodeType'
+    - filters:
+        - type: 'NodeType'
           settings:
             nodeType: 'TechDivision.NodeTypes.FlexColumnLayouts:FlexCollection.ThirdColumn'
 
       transformations:
-        -
-          type: 'ChangeNodeType'
+        - type: 'ChangeNodeType'
           settings:
             newType: 'Neos.Neos:ContentCollection'
-    -
-      filters:
-        -
-          type: 'NodeType'
+    - filters:
+        - type: 'NodeType'
           settings:
             nodeType: 'TechDivision.NodeTypes.FlexColumnLayouts:FlexCollection.FourthColumn'
 
       transformations:
-        -
-          type: 'ChangeNodeType'
+        - type: 'ChangeNodeType'
           settings:
             newType: 'Neos.Neos:ContentCollection'
-
diff --git a/NodeTypes/Content/OneColumn.yaml b/NodeTypes/Content/OneColumn.yaml
@@ -0,0 +1,37 @@
+'TechDivision.NodeTypes.FlexColumnLayouts:OneColumn':
+  superTypes:
+    'Neos.NodeTypes.ColumnLayouts:Column': true
+    'Neos.Neos:ContentCollection': true
+  ui:
+    label: 'One column content'
+    position: 100
+  properties:
+    layout:
+      defaultValue: '100'
+      ui:
+        reloadIfChanged: true
+        inspector:
+          editorOptions:
+            values:
+              '100':
+                label: '100%'
+    flexDirection: []
+    flexWrap: []
+    flexAlignItems: []
+    flexAlignContent: []
+    smFlexDirection: []
+    smFlexWrap: []
+    smFlexAlignItems: []
+    smFlexAlignContent: []
+    mdFlexDirection: []
+    mdFlexWrap: []
+    mdFlexAlignItems: []
+    mdFlexAlignContent: []
+    lgFlexDirection: []
+    lgFlexWrap: []
+    lgFlexAlignItems: []
+    lgFlexAlignContent: []
+    xlFlexDirection: []
+    xlFlexWrap: []
+    xlFlexAlignItems: []
+    xlFlexAlignContent: []