Merge branch 'feature/new-sidebar-group-permissions' of...

Merge branch 'feature/new-sidebar-group-permissions' of https://github.com/mikemand/Platform into mikemand-feature/new-sidebar-group-permissions

* 'feature/new-sidebar-group-permissions' of https://github.com/mikemand/Platform:
  Fix namespace for Core sidebar extender
  Add sidebar permissions to allow turning groups on/off globally Closes #276

Modules/Core/Config/permissions.php

+<?php
+
+return [
+    'core.sidebar' => [
+        'group' => 'core::sidebar.show group',
+    ],
+];

Modules/Core/Sidebar/SidebarExtender.php

+<?php
+
+namespace Modules\Core\Sidebar;
+
+use Maatwebsite\Sidebar\Badge;
+use Maatwebsite\Sidebar\Group;
+use Maatwebsite\Sidebar\Item;
+use Maatwebsite\Sidebar\Menu;
+use Modules\User\Contracts\Authentication;
+
+class SidebarExtender implements \Maatwebsite\Sidebar\SidebarExtender
+{
+    /**
+     * @var Authentication
+     */
+    protected $auth;
+
+    /**
+     * @param Authentication $auth
+     *
+     * @internal param Guard $guard
+     */
+    public function __construct(Authentication $auth)
+    {
+        $this->auth = $auth;
+    }
+
+    /**
+     * @param Menu $menu
+     *
+     * @return Menu
+     */
+    public function extendWith(Menu $menu)
+    {
+        $menu->group(trans('core::sidebar.content'), function (Group $group) {
+            $group->weight(50);
+            $group->authorize(
+                $this->auth->hasAccess('core.sidebar.group')
+            );
+        });
+
+        return $menu;
+    }
+}

Modules/Page/Sidebar/SidebarExtender.php

@@ -46,10 +46,6 @@ class SidebarExtender implements \Maatwebsite\Sidebar\SidebarExtender
                     $this->auth->hasAccess('page.pages.index')
                 );
             });
-
-            $group->authorize(
-                $this->auth->hasAccess('page.*')
-            );
         });
 
         return $menu;

Modules/Translation/Resources/lang/core/en/sidebar.php

@@ -2,4 +2,5 @@
 
 return [
     'content' => 'Content',
+    'show group' => 'Show sidebar group',
 ];

Modules/Translation/Resources/lang/workshop/en/themes.php

@@ -10,4 +10,5 @@ return [
     'type' => 'Type',
     'list resource' => 'List themes',
     'show resource' => 'View themes',
+    'publish assets' => 'Publish assets',
 ];

Modules/Translation/Resources/lang/workshop/en/workshop.php

@@ -4,4 +4,5 @@ return [
     'title'   => 'Workshop',
     'modules' => 'Modules',
     'themes' => 'Themes',
+    'show sidebar group' => 'See sidebar group',
 ];

Modules/User/Database/Seeders/SentinelGroupSeedTableSeeder.php

@@ -38,17 +38,22 @@ class SentinelGroupSeedTableSeeder extends Seeder
         // Save the permissions
         $group = Sentinel::findRoleBySlug('admin');
         $group->permissions = [
+            'core.sidebar.group' => true,
+            /* Dashboard */
             'dashboard.index' => true,
             'dashboard.update' => true,
             'dashboard.reset' => true,
             /* Workbench */
+            'workshop.sidebar.group' => true,
             'workshop.modules.index' => true,
             'workshop.modules.show' => true,
+            'workshop.modules.update' => true,
             'workshop.modules.disable' => true,
             'workshop.modules.enable' => true,
-            'workshop.modules.update' => true,
+            'workshop.modules.publish' => true,
             'workshop.themes.index' => true,
             'workshop.themes.show' => true,
+            'workshop.themes.publish' => true,
             /* Roles */
             'user.roles.index' => true,
             'user.roles.create' => true,

Modules/Workshop/Config/permissions.php

 <?php
 
 return [
+    'workshop.sidebar' => [
+        'group' => 'workshop::workshop.show sidebar group',
+    ],
     'workshop.modules' => [
         'index' => 'workshop::modules.list resource',
         'show' => 'workshop::modules.show resource',
         'update' => 'workshop::modules.update resource',
         'disable' => 'workshop::modules.disable resource',
         'enable' => 'workshop::modules.enable resource',
-        'publish' => 'workshop::modules.publish assets'
+        'publish' => 'workshop::modules.publish assets',
     ],
     'workshop.themes' => [
         'index' => 'workshop::themes.list resource',
         'show' => 'workshop::themes.show resource',
-        'publish' => 'workshop::themes.publish assets'
+        'publish' => 'workshop::themes.publish assets',
     ],
 ];

Modules/Workshop/Sidebar/SidebarExtender.php

@@ -33,6 +33,9 @@ class SidebarExtender implements \Maatwebsite\Sidebar\SidebarExtender
     {
         $menu->group(trans('workshop::workshop.title'), function (Group $group) {
             $group->weight(100);
+            $group->authorize(
+                $this->auth->hasAccess('workshop.sidebar.group')
+            );
             $group->item(trans('workshop::workshop.modules'), function (Item $item) {
                 $item->icon('fa fa-cogs');
                 $item->weight(100);
@@ -49,10 +52,6 @@ class SidebarExtender implements \Maatwebsite\Sidebar\SidebarExtender
                     $this->auth->hasAccess('workshop.themes.index')
                 );
             });
-
-            $group->authorize(
-                $this->auth->hasAccess('workshop.*') or $this->auth->hasAccess('user.*') or $this->auth->hasAccess('setting.*')
-            );
         });
 
         return $menu;