Fixed issues with aside menu after config structure changes

Author: gorkalaucirica

composer.json

@@ -27,6 +27,7 @@
         "phpspec/phpspec": "^3.3",
         "symfony/asset": "^3.3",
         "symfony/console": "^3.3",
+        "symfony/debug-bundle": "^3.3",
         "symfony/twig-bundle": "^3.3",
         "symfony/var-dumper": "^3.3",
         "symfony/web-server-bundle": "^3.3",

src/LIN3S/PatternLibraryBuilder/Resources/templates/layouts/aside.html.twig

@@ -1,4 +1,4 @@
-{% macro accordion_menu(children, breadcrumbs) %}
+{% macro accordion_menu(children, pages, breadcrumbs) %}
     {% import _self as macros %}
 
     {% set items = [] %}
@@ -20,39 +20,40 @@
 
         {% set items = items|merge([{
             header: accordion_item_title,
-            content: macros.accordion_menu(item.children, breadcrumbs),
+            content: macros.accordion_menu(item.children, item.pages, breadcrumbs),
             modifiers: modifiers,
             class_name: item_class_name,
             finder_value: item_title
         }]) %}
+    {% endfor %}
 
-        {% for item in item.pages %}
-            {% set accordion_item_title %}
-                {% embed '@Lin3sPatternLibraryBuilder/components/link.html.twig' with {
-                    url: '/design-system/' ~ item.slug,
-                    target: '_self'
-                } %}
-                    {%- block link_content -%}
-                        {% include '@Lin3sPatternLibraryBuilder/components/status.html.twig' with {
-                            level: item.status|default('    '),
-                            tag: 'span'
-                        } %}
-                        {{ item.title }}
-                    {%- endblock -%}
-                {% endembed %}
-            {% endset %}
+    {% for item in pages %}
+        {% set item_title = item.title|replace({'-': ' '}) %}
+        {% set accordion_item_title %}
+            {% embed '@Lin3sPatternLibraryBuilder/components/link.html.twig' with {
+                url: '/design-system/' ~ item.slug,
+                target: '_self'
+            } %}
+                {%- block link_content -%}
+                    {% include '@Lin3sPatternLibraryBuilder/components/status.html.twig' with {
+                    level: item.status|default('    '),
+                    tag: 'span'
+                    } %}
+                    {{ item.title }}
+                {%- endblock -%}
+            {% endembed %}
+        {% endset %}
 
-            {% set modifiers = modifiers|merge(['leaf']) %}
-            {% set item_class_name = 'finder__subject' %}
+        {% set modifiers = [] %}
+        {% set item_class_name = 'finder__subject' %}
 
-            {% set items = items|merge([{
-                header: accordion_item_title,
-                content: null,
-                modifiers:  modifiers|merge(['leaf']) ,
-                class_name: 'finder__subject',
-                finder_value: item_title
-            }]) %}
-        {% endfor %}
+        {% set items = items|merge([{
+            header: accordion_item_title,
+            content: null,
+            modifiers:  modifiers|merge(['leaf']) ,
+            class_name: 'finder__subject',
+            finder_value: item_title
+        }]) %}
     {% endfor %}
 
     {% include '@Lin3sPatternLibraryBuilder/components/accordion.html.twig' with {
@@ -75,7 +76,7 @@
         } %}
             {% block finder_subjects %}
                 {% import '@Lin3sPatternLibraryBuilder/layouts/aside.html.twig' as aside %}
-                {{ aside.accordion_menu(menu.children, breadcrumbs) }}
+                {{ aside.accordion_menu(menu.children, menu.pages, breadcrumbs) }}
             {% endblock %}
         {% endembed %}
     </div>

tests/Application/app/AppKernel.php

@@ -14,6 +14,7 @@
 namespace Tests\LIN3S\PatternLibraryBuilder;
 
 use LIN3S\PatternLibraryBuilder\Symfony\Lin3sPatternLibraryBuilderBundle;
+use Symfony\Bundle\DebugBundle\DebugBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
 use Symfony\Bundle\TwigBundle\TwigBundle;
@@ -40,6 +41,7 @@ public function registerBundles() : array
 
         if ('dev' === $this->getEnvironment()) {
             $bundles[] = new WebServerBundle();
+            $bundles[] = new DebugBundle();
         }
 
         return $bundles;