change old module getmenu data to new adminmenubuilder class #1045

luyadev · Oct 24, 2016 · e5dd057 · e5dd057
1 parent 7476db7
commit e5dd057
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 46 deletions.
diff --git a/core/base/AdminModuleInterface.php b/core/base/AdminModuleInterface.php
@@ -14,4 +14,11 @@
  */
 interface AdminModuleInterface
 {
+    /**
+     * The menu object from the {{\luya\admin\components\AdminMenuBuilder}} class in order to store and build the administration
+     * module menu elements.
+     * 
+     * @return array|\luya\admin\components\AdminMenuBuilderInterface
+     */
+    public function getMenu();
 }
diff --git a/envs/dev/modules/ngresttest/Module.php b/envs/dev/modules/ngresttest/Module.php
@@ -2,6 +2,8 @@
 
 namespace ngresttest;
 
+use luya\admin\components\AdminMenuBuilder;
+
 class Module extends \luya\admin\base\Module
 {
     public $apis = [
@@ -10,9 +12,8 @@ class Module extends \luya\admin\base\Module
 
     public function getMenu()
     {
-        return $this->node('Table', 'extension') // instead of extension, choose icon from https://design.google.com/icons/
+        return (new AdminMenuBuilder($this))->node('Table', 'extension') // instead of extension, choose icon from https://design.google.com/icons/
             ->group('GROUP')
-                ->itemApi('Table', 'ngresttest-table-index', 'label', 'api-ngresttest-table') // instead of label, choose icon from https://design.google.com/icons/
-        ->menu();
+                ->itemApi('Table', 'ngresttest-table-index', 'label', 'api-ngresttest-table');
     }
 }
diff --git a/modules/account/src/admin/Module.php b/modules/account/src/admin/Module.php
@@ -2,6 +2,8 @@
 
 namespace luya\account\admin;
 
+use luya\admin\components\AdminMenuBuilder;
+
 class Module extends \luya\admin\base\Module
 {
     public $apis = [
@@ -10,9 +12,9 @@ class Module extends \luya\admin\base\Module
 
     public function getMenu()
     {
-        return $this->node('Accounts', 'supervisor_account')
-        ->group('Übersicht')
-        ->itemApi('Benutzer', 'accountadmin-user-index', 'account_circle', 'api-account-user')
-        ->menu();
+        return (new AdminMenuBuilder($this))
+        ->node('Accounts', 'supervisor_account')
+            ->group('Übersicht')
+                ->itemApi('Benutzer', 'accountadmin-user-index', 'account_circle', 'api-account-user');
     }
 }
diff --git a/modules/cms/src/admin/Module.php b/modules/cms/src/admin/Module.php
@@ -9,6 +9,7 @@
 use luya\cms\admin\importers\CmslayoutImporter;
 use luya\cms\admin\importers\PropertyConsistencyImporter;
 use luya\base\CoreModuleInterface;
+use luya\admin\components\AdminMenuBuilder;
 
 class Module extends \luya\admin\base\Module implements CoreModuleInterface
 {
@@ -88,7 +89,7 @@ class Module extends \luya\admin\base\Module implements CoreModuleInterface
 
     public function getMenu()
     {
-        return $this
+        return (new AdminMenuBuilder($this))
             ->nodeRoute('menu_node_cms', 'content_copy', 'cmsadmin-default-index', 'cmsadmin/default/index', 'luya\cms\models\NavItem')
             ->node('menu_node_cmssettings', 'settings')
                 ->group('menu_group_env')
@@ -97,8 +98,7 @@ public function getMenu()
                     ->itemApi('menu_group_item_env_layouts', 'cmsadmin-layout-index', 'view_quilt', 'api-cms-layout')
                 ->group('menu_group_elements')
                     ->itemApi('menu_group_item_elements_group', 'cmsadmin-blockgroup-index', 'view_module', 'api-cms-blockgroup')
-                    ->itemApi('menu_group_item_elements_blocks', 'cmsadmin-block-index', 'format_align_left', 'api-cms-block')
-            ->menu();
+                    ->itemApi('menu_group_item_elements_blocks', 'cmsadmin-block-index', 'format_align_left', 'api-cms-block');
     }
 
     public function extendPermissionApis()

diff --git a/modules/crawler/src/admin/Module.php b/modules/crawler/src/admin/Module.php
@@ -3,6 +3,7 @@
 namespace luya\crawler\admin;
 
 use Yii;
+use luya\admin\components\AdminMenuBuilder;
 
 class Module extends \luya\admin\base\Module
 {
@@ -12,17 +13,6 @@ class Module extends \luya\admin\base\Module
         'api-crawler-searchdata' => 'luya\crawler\admin\apis\SearchdataController',
     ];
 
-    public function getMenu()
-    {
-        return $this->node('crawler', 'find_in_page')
-            ->group('crawler_indexing')
-                ->itemApi('crawler_index', 'crawleradmin-index-index', 'list', 'api-crawler-index')
-                //->itemApi('crawler_builderindex'), 'crawleradmin-builderindex-index', 'visibility_off', 'api-crawler-builderindex')
-            ->group('Anylatics')
-            ->itemApi('Searchdata', 'crawleradmin-searchdata-index', 'label', 'api-crawler-searchdata')
-        ->menu();
-    }
-
     public $translations = [
         [
             'prefix' => 'crawleradmin*',
@@ -32,6 +22,15 @@ public function getMenu()
             ],
         ],
     ];
+
+    public function getMenu()
+    {
+        return (new AdminMenuBuilder($this))->node('crawler', 'find_in_page')
+        ->group('crawler_indexing')
+        ->itemApi('crawler_index', 'crawleradmin-index-index', 'list', 'api-crawler-index')
+        ->group('Anylatics')
+        ->itemApi('Searchdata', 'crawleradmin-searchdata-index', 'label', 'api-crawler-searchdata');
+    }
 
     public static function t($message, array $params = [])
     {

diff --git a/modules/gallery/src/admin/Module.php b/modules/gallery/src/admin/Module.php
@@ -3,6 +3,7 @@
 namespace luya\gallery\admin;
 
 use Yii;
+use luya\admin\components\AdminMenuBuilder;
 
 class Module extends \luya\admin\base\Module
 {
@@ -11,15 +12,6 @@ class Module extends \luya\admin\base\Module
         'api-gallery-cat' => 'luya\gallery\admin\apis\CatController',
     ];
 
-    public function getMenu()
-    {
-        return $this->node('gallery', 'photo_album')
-            ->group('gallery_administrate')
-                ->itemApi('album', 'galleryadmin-album-index', 'camera', 'api-gallery-album')
-                ->itemApi('cat', 'galleryadmin-cat-index', 'collections', 'api-gallery-cat')
-        ->menu();
-    }
-
     public $translations = [
         [
             'prefix' => 'galleryadmin*',
@@ -29,6 +21,14 @@ public function getMenu()
             ],
         ],
     ];
+
+    public function getMenu()
+    {
+        return (new AdminMenuBuilder($this))->node('gallery', 'photo_album')
+            ->group('gallery_administrate')
+                ->itemApi('album', 'galleryadmin-album-index', 'camera', 'api-gallery-album')
+                ->itemApi('cat', 'galleryadmin-cat-index', 'collections', 'api-gallery-cat');
+    }
 
     public static function t($message, array $params = [])
     {

diff --git a/modules/news/src/admin/Module.php b/modules/news/src/admin/Module.php
@@ -3,6 +3,7 @@
 namespace luya\news\admin;
 
 use Yii;
+use luya\admin\components\AdminMenuBuilder;
 
 class Module extends \luya\admin\base\Module
 {
@@ -12,17 +13,6 @@ class Module extends \luya\admin\base\Module
         'api-news-cat' => 'luya\news\admin\apis\CatController',
     ];
 
-    public function getMenu()
-    {
-        return $this
-        ->node('news', 'local_library')
-            ->group('news_administrate')
-                ->itemApi('article', 'newsadmin-article-index', 'edit', 'api-news-article')
-                ->itemApi('cat', 'newsadmin-cat-index', 'bookmark_border', 'api-news-cat')
-                ->itemApi('tag', 'newsadmin-tag-index', 'label_outline', 'api-news-tag')
-        ->menu();
-    }
-
     public $translations = [
         [
             'prefix' => 'newsadmin*',
@@ -32,6 +22,16 @@ public function getMenu()
             ],
         ],
     ];
+
+    public function getMenu()
+    {
+        return (new AdminMenuBuilder($this))
+            ->node('news', 'local_library')
+                ->group('news_administrate')
+                    ->itemApi('article', 'newsadmin-article-index', 'edit', 'api-news-article')
+                    ->itemApi('cat', 'newsadmin-cat-index', 'bookmark_border', 'api-news-cat')
+                    ->itemApi('tag', 'newsadmin-tag-index', 'label_outline', 'api-news-tag');
+    }
 
     public static function t($message, array $params = [])
     {

diff --git a/modules/remoteadmin/src/Module.php b/modules/remoteadmin/src/Module.php
@@ -2,6 +2,7 @@
 namespace luya\remoteadmin;
 
 use luya\base\CoreModuleInterface;
+use luya\admin\components\AdminMenuBuilder;
 
 class Module extends \luya\admin\base\Module implements CoreModuleInterface
 {
@@ -11,10 +12,9 @@ class Module extends \luya\admin\base\Module implements CoreModuleInterface
 
     public function getMenu()
     {
-        return $this->node('Remote', 'dashboard')
-        ->group('Daten')
-        ->itemRoute('Status', 'remoteadmin/status/index', 'device_hub')
-        ->itemApi('Seiten', 'remoteadmin-site-index', 'cloud', 'api-remote-site')
-        ->menu();
+        return (new AdminMenuBuilder($this))->node('Remote', 'dashboard')
+            ->group('Daten')
+                ->itemRoute('Status', 'remoteadmin/status/index', 'device_hub')
+                ->itemApi('Seiten', 'remoteadmin-site-index', 'cloud', 'api-remote-site');
     }
 }