Fixed menus

* Added specific menu assignation * Added priorities to Builders and Menu elements * Fixed some features for Behat * Added extension for templating resolving in twig
elcodi · Jun 9, 2015 · f90ebd0 · f90ebd0
1 parent c262109
commit f90ebd0
Show file tree

Hide file tree

Showing 39 changed files with 321 additions and 69 deletions.
diff --git a/app/config/common/services.yml b/app/config/common/services.yml
@@ -26,4 +26,4 @@ services:
         arguments:
             - @templating.engine.twig
             - "Layout:_static.html.twig"
-            - [@elcodi.store_template]
+            - [@elcodi.store_template_bundle]
diff --git a/features/admin/login.feature b/features/admin/login.feature
@@ -26,4 +26,4 @@ Feature: Admin login
   Scenario: Logged user is redirected to home when goes to login page
     Given In admin, I am logged as "[email protected]" - "1234"
     When I go to "/admin/login"
-    Then I should be on "admin/store-setup-wizard"
+    Then I should be on "/admin"
diff --git a/features/admin/menu.feature b/features/admin/menu.feature
@@ -16,7 +16,6 @@ Feature: Admin menus
     And the page contains a "admin.manufacturer.plural" test attribute
     And the page contains a "admin.category.plural" test attribute
     And the page contains a "admin.communication.single" test attribute
-    And the page contains a "admin.shipping_payment.plural" test attribute
     And the page contains a "admin.coupon.plural" test attribute
     And the page contains a "admin.page.plural" test attribute
     And the page contains a "admin.mailing.plural" test attribute

diff --git a/src/Elcodi/Admin/CartBundle/Builder/MenuBuilder.php b/src/Elcodi/Admin/CartBundle/Builder/MenuBuilder.php
@@ -42,23 +42,12 @@ public function build(MenuInterface $menu)
                     ->setCode('shopping-cart')
                     ->setUrl('admin_order_list')
                     ->setTag('order')
+                    ->setPriority(16)
                     ->setActiveUrls([
                         'admin_order_edit',
                         'admin_customer_order_list',
                         'admin_customer_order_list',
                     ])
-            )
-            ->addSubnode(
-                $this
-                    ->menuNodeFactory
-                    ->create()
-                    ->setName('admin.customer.plural')
-                    ->setCode('users')
-                    ->setUrl('admin_customer_list')
-                    ->setTag('order')
-                    ->setActiveUrls([
-                        'admin_customer_edit',
-                    ])
             );
     }
 }
diff --git a/src/Elcodi/Admin/CartBundle/Resources/config/menu.yml b/src/Elcodi/Admin/CartBundle/Resources/config/menu.yml
@@ -8,4 +8,4 @@ services:
         arguments:
             - @elcodi.factory.menu_node
         tags:
-            - { name: menu.builder }
+            - { name: menu.builder, menu: admin, priority: 32 }
diff --git a/src/Elcodi/Admin/CoreBundle/Builder/MenuBuilder.php b/src/Elcodi/Admin/CoreBundle/Builder/MenuBuilder.php
@@ -65,7 +65,6 @@ public function build(MenuInterface $menu)
                     ->setName('admin.menu.design')
                     ->setCode('adjust')
                     ->setTag('design')
-                    ->setPriority(1)
             )
             ->addSubnode(
                 $this
@@ -74,7 +73,7 @@ public function build(MenuInterface $menu)
                     ->setName('admin.settings.plural')
                     ->setCode('gear')
                     ->setTag('settings')
-                    ->setPriority(2)
+                    ->setPriority(-32)
             );
     }
 }
diff --git a/src/Elcodi/Admin/CoreBundle/Resources/config/menu.yml b/src/Elcodi/Admin/CoreBundle/Resources/config/menu.yml
@@ -8,4 +8,4 @@ services:
         arguments:
             - @elcodi.factory.menu_node
         tags:
-            - { name: menu.builder }
+            - { name: menu.builder, menu: admin, priority: 32 }
diff --git a/src/Elcodi/Admin/CouponBundle/Builder/MenuBuilder.php b/src/Elcodi/Admin/CouponBundle/Builder/MenuBuilder.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of the Elcodi package.
+ *
+ * Copyright (c) 2014-2015 Elcodi.com
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * Feel free to edit as you please, and have fun.
+ *
+ * @author Marc Morera <[email protected]>
+ * @author Aldo Chiecchia <[email protected]>
+ * @author Elcodi Team <[email protected]>
+ */
+
+namespace Elcodi\Admin\CouponBundle\Builder;
+
+use Elcodi\Component\Menu\Builder\Abstracts\AbstractMenuBuilder;
+use Elcodi\Component\Menu\Builder\Interfaces\MenuBuilderInterface;
+use Elcodi\Component\Menu\Entity\Menu\Interfaces\MenuInterface;
+
+/**
+ * Class MenuBuilder
+ */
+class MenuBuilder extends AbstractMenuBuilder implements MenuBuilderInterface
+{
+    /**
+     * Build the menu
+     *
+     * @param MenuInterface $menu Menu
+     */
+    public function build(MenuInterface $menu)
+    {
+        $menu
+            ->addSubnode(
+                $this
+                    ->menuNodeFactory
+                    ->create()
+                    ->setName('admin.coupon.plural')
+                    ->setCode('ticket')
+                    ->setUrl('admin_coupon_list')
+                    ->setTag('catalog')
+                    ->setPriority(16)
+                    ->setActiveUrls([
+                        'admin_coupon_edit',
+                        'admin_coupon_new',
+                    ])
+            );
+    }
+}
diff --git a/src/Elcodi/Admin/CouponBundle/DependencyInjection/AdminCouponExtension.php b/src/Elcodi/Admin/CouponBundle/DependencyInjection/AdminCouponExtension.php
@@ -58,6 +58,7 @@ public function getConfigFiles(array $config)
     {
         return [
             'formTypes',
+            'menu',
         ];
     }
 

diff --git a/src/Elcodi/Admin/CouponBundle/Resources/config/menu.yml b/src/Elcodi/Admin/CouponBundle/Resources/config/menu.yml
@@ -0,0 +1,11 @@
+services:
+
+    #
+    # Menu builders
+    #
+    elcodi_admin.menu_builder.coupon:
+        class: Elcodi\Admin\CouponBundle\Builder\MenuBuilder
+        arguments:
+            - @elcodi.factory.menu_node
+        tags:
+            - { name: menu.builder, menu: admin, priority: 32 }
diff --git a/src/Elcodi/Admin/CurrencyBundle/Resources/config/menu.yml b/src/Elcodi/Admin/CurrencyBundle/Resources/config/menu.yml
@@ -8,4 +8,4 @@ services:
         arguments:
             - @elcodi.factory.menu_node
         tags:
-            - { name: menu.builder }
+            - { name: menu.builder, menu: admin, priority: 16 }
diff --git a/src/Elcodi/Admin/LanguageBundle/Resources/config/menu.yml b/src/Elcodi/Admin/LanguageBundle/Resources/config/menu.yml
@@ -8,4 +8,4 @@ services:
         arguments:
             - @elcodi.factory.menu_node
         tags:
-            - { name: menu.builder }
+            - { name: menu.builder, menu: admin, priority: 16 }
diff --git a/src/Elcodi/Admin/PageBundle/DependencyInjection/AdminPageExtension.php b/src/Elcodi/Admin/PageBundle/DependencyInjection/AdminPageExtension.php
@@ -59,6 +59,7 @@ public function getConfigFiles(array $config)
         return [
             'formTypes',
             'eventListeners',
+            'menu',
         ];
     }
 

diff --git a/src/Elcodi/Admin/PageBundle/Resources/config/menu.yml b/src/Elcodi/Admin/PageBundle/Resources/config/menu.yml
@@ -8,4 +8,4 @@ services:
         arguments:
             - @elcodi.factory.menu_node
         tags:
-            - { name: menu.builder }
+            - { name: menu.builder, menu: admin, priority: 16 }
diff --git a/src/Elcodi/Admin/PaymentBundle/Builder/MenuBuilder.php b/src/Elcodi/Admin/PaymentBundle/Builder/MenuBuilder.php
@@ -41,7 +41,7 @@ public function build(MenuInterface $menu)
                     ->setName('admin.settings.section.payment.title')
                     ->setTag('settings')
                     ->setCode('credit-card')
-                    ->setPriority(-8)
+                    ->setPriority(31)
             );
     }
 }
diff --git a/src/Elcodi/Admin/PaymentBundle/Resources/config/menu.yml b/src/Elcodi/Admin/PaymentBundle/Resources/config/menu.yml
@@ -8,4 +8,4 @@ services:
         arguments:
             - @elcodi.factory.menu_node
         tags:
-            - { name: menu.builder }
+            - { name: menu.builder, menu: admin, priority: 32 }
diff --git a/src/Elcodi/Admin/PluginBundle/Builder/MenuBuilder.php b/src/Elcodi/Admin/PluginBundle/Builder/MenuBuilder.php
@@ -41,7 +41,7 @@ public function build(MenuInterface $menu)
                     ->setName('admin.plugin.plural')
                     ->setCode('puzzle-piece')
                     ->setUrl('admin_plugin_list')
-                    ->setPriority(1)
+                    ->setPriority(-30)
                     ->setTag('settings')
                     ->setActiveUrls([
                         'admin_plugin_configure',
@@ -51,11 +51,18 @@ public function build(MenuInterface $menu)
                             ->menuNodeFactory
                             ->create()
                             ->setName('admin.plugin.app_store')
-                            ->setCode('puzzle-piece')
                             ->setUrl('admin_plugin_list')
-                            ->setPriority(-9999)
-                            ->setTag('settings')
+                            ->setPriority(9999)
                     )
+            )
+            ->addSubnode(
+                $this
+                    ->menuNodeFactory
+                    ->create()
+                    ->setName('admin.social.single')
+                    ->setCode('share-alt')
+                    ->setTag('settings')
+                    ->setPriority(32)
             );
     }
 }
diff --git a/src/Elcodi/Admin/PluginBundle/Builder/PluginMenuBuilder.php b/src/Elcodi/Admin/PluginBundle/Builder/PluginMenuBuilder.php
@@ -76,26 +76,68 @@ public function build(MenuInterface $menu)
     {
         $visiblePlugins = $this->filterVisiblePlugins();
 
-        foreach ($visiblePlugins as $visiblePlugin) {
+        $this
+            ->buildByPluginCategory(
+                $menu,
+                $visiblePlugins,
+                'payment',
+                'admin.settings.section.payment.title'
+            )
+            ->buildByPluginCategory(
+                $menu,
+                $visiblePlugins,
+                'shipping',
+                'admin.carrier.plural'
+            )
+            ->buildByPluginCategory(
+                $menu,
+                $visiblePlugins,
+                'social',
+                'admin.social.single'
+            );
+    }
+
+    /**
+     * Build by category and place all menu entries inside a family
+     *
+     * @param MenuInterface $menu           Menu
+     * @param Plugin[]      $plugins        Plugins
+     * @param string        $pluginCategory Plugin category
+     * @param string        $parentName     Parent name
+     *
+     * @return $this Self object
+     */
+    private function buildByPluginCategory(
+        MenuInterface $menu,
+        array $plugins,
+        $pluginCategory,
+        $parentName
+    ) {
+        foreach ($plugins as $plugin) {
+            if ($plugin->getCategory() !== $pluginCategory) {
+                continue;
+            }
+
             $pluginConfigurationRoute = $this
                 ->urlGenerator
                 ->generate('admin_plugin_configure', [
-                    'pluginHash' => $visiblePlugin->getHash(),
+                    'pluginHash' => $plugin->getHash(),
                 ]);
 
             $menuNode = $this
                 ->menuNodeFactory
                 ->create()
-                ->setName($visiblePlugin->getConfigurationValue('name'))
-                ->setCode($visiblePlugin->getConfigurationValue('fa_icon'))
+                ->setName($plugin->getConfigurationValue('name'))
+                ->setCode($plugin->getConfigurationValue('fa_icon'))
                 ->setUrl($pluginConfigurationRoute)
-                ->setTag('extra')
                 ->setEnabled(true);
 
             $menu
-                ->findSubnodeByName('admin.plugin.plural')
+                ->findSubnodeByName($parentName)
                 ->addSubnode($menuNode);
         }
+
+        return $this;
     }
 
     /**

diff --git a/src/Elcodi/Admin/PluginBundle/Resources/config/menu.yml b/src/Elcodi/Admin/PluginBundle/Resources/config/menu.yml
@@ -8,7 +8,7 @@ services:
         arguments:
             - @elcodi.factory.menu_node
         tags:
-            - { name: menu.builder }
+            - { name: menu.builder, menu: admin, priority: 32 }
 
     elcodi_admin.menu_builder.plugins:
         class: Elcodi\Admin\PluginBundle\Builder\PluginMenuBuilder
@@ -17,4 +17,4 @@ services:
             - @router
             - @elcodi.enabled_plugins
         tags:
-            - { name: menu.builder }
+            - { name: menu.builder, menu: admin, priority: 16 }
diff --git a/src/Elcodi/Admin/ProductBundle/Builder/MenuBuilder.php b/src/Elcodi/Admin/ProductBundle/Builder/MenuBuilder.php
@@ -34,38 +34,27 @@ class MenuBuilder extends AbstractMenuBuilder implements MenuBuilderInterface
     public function build(MenuInterface $menu)
     {
         $menu
-            ->addSubnode(
-                $this
-                    ->menuNodeFactory
-                    ->create()
-                    ->setName('admin.product.plural')
-                    ->setCode('gift')
-                    ->setUrl('admin_product_list')
-                    ->setTag('catalog')
-                    ->setActiveUrls([
-                        'admin_product_edit',
-                        'admin_product_new',
-                    ])
-            )
-            ->addSubnode(
-                $this
-                    ->menuNodeFactory
-                    ->create()
-                    ->setName('admin.coupon.plural')
-                    ->setCode('ticket')
-                    ->setUrl('admin_coupon_list')
-                    ->setTag('catalog')
-                    ->setActiveUrls([
-                        'admin_coupon_edit',
-                        'admin_coupon_new',
-                    ])
-            )
             ->addSubnode(
                 $this
                     ->menuNodeFactory
                     ->create()
                     ->setName('admin.categorization.single')
                     ->setCode('folder-open')
+                    ->setTag('catalog')
+                    ->setPriority(32)
+                    ->addSubnode(
+                        $this
+                            ->menuNodeFactory
+                            ->create()
+                            ->setName('admin.product.plural')
+                            ->setCode('gift')
+                            ->setUrl('admin_product_list')
+                            ->setTag('catalog')
+                            ->setActiveUrls([
+                                'admin_product_edit',
+                                'admin_product_new',
+                            ])
+                    )
                     ->addSubnode(
                         $this
                             ->menuNodeFactory

diff --git a/src/Elcodi/Admin/ProductBundle/Resources/config/menu.yml b/src/Elcodi/Admin/ProductBundle/Resources/config/menu.yml
@@ -8,4 +8,4 @@ services:
         arguments:
             - @elcodi.factory.menu_node
         tags:
-            - { name: menu.builder }
+            - { name: menu.builder, menu: admin, priority: 32 }
diff --git a/src/Elcodi/Admin/ShippingBundle/Builder/MenuBuilder.php b/src/Elcodi/Admin/ShippingBundle/Builder/MenuBuilder.php
@@ -41,7 +41,7 @@ public function build(MenuInterface $menu)
                     ->setName('admin.carrier.plural')
                     ->setTag('settings')
                     ->setCode('truck')
-                    ->setPriority(-4)
+                    ->setPriority(30)
             );
     }
 }
diff --git a/src/Elcodi/Admin/ShippingBundle/Resources/config/menu.yml b/src/Elcodi/Admin/ShippingBundle/Resources/config/menu.yml
@@ -8,4 +8,4 @@ services:
         arguments:
             - @elcodi.factory.menu_node
         tags:
-            - { name: menu.builder }
+            - { name: menu.builder, menu: admin, priority: 32 }
diff --git a/src/Elcodi/Admin/StoreBundle/Resources/config/menu.yml b/src/Elcodi/Admin/StoreBundle/Resources/config/menu.yml
@@ -8,4 +8,4 @@ services:
         arguments:
             - @elcodi.factory.menu_node
         tags:
-            - { name: menu.builder }
+            - { name: menu.builder, menu: admin, priority: 16 }
diff --git a/src/Elcodi/Admin/TemplateBundle/Resources/config/menu.yml b/src/Elcodi/Admin/TemplateBundle/Resources/config/menu.yml
@@ -8,4 +8,4 @@ services:
         arguments:
             - @elcodi.factory.menu_node
         tags:
-            - { name: menu.builder }
+            - { name: menu.builder, menu: admin, priority: 16 }