change permissions

Author: dietercoopman

database/migrations/update_menus_table.php.stub

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdateMenusTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('menus', function (Blueprint $table) {
+            $table->string('permission')->after('route')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('menus', function (Blueprint $table) {
+            $table->dropColumn('permission');
+        });
+    }
+}

database/seeders/InforceSeeder.php

@@ -26,7 +26,7 @@ public function run()
         DB::table('role_has_permissions')->delete();
         DB::table('roles')->delete();
 
-        collect([ 'admin', 'user'])->each(function ($name) {
+        collect(['admin', 'user'])->each(function ($name) {
             DB::table('roles')->insert([
                 'name'       => $name,
                 'guard_name' => 'web'
@@ -37,6 +37,7 @@ public function run()
         collect(["customers", "suppliers", "products", "news"])->each(function ($section) use ($sortOrder) {
             Menu::create([
                 'name'       => ucfirst($section),
+                'permission' => 'menu.' . $section,
                 'sort_order' => $sortOrder++
             ]);
 
@@ -56,6 +57,7 @@ public function run()
 
         $usersMenu = Menu::create([
             'name'       => 'User management',
+            'permission' => 'menu.user-management',
             'sort_order' => $sortOrder++
         ]);
 
@@ -68,6 +70,7 @@ public function run()
             'parent_id'  => $usersMenu->id,
             'name'       => 'Manage users',
             'route'      => 'users.index',
+            'permission' => 'menu.user-management.manage-users',
             'sort_order' => $sortOrder++
         ]);
 
@@ -80,6 +83,7 @@ public function run()
             'parent_id'  => $usersMenu->id,
             'name'       => 'Manage roles',
             'route'      => 'users.roles',
+            'permission' => 'menu.user-management.manage-roles',
             'sort_order' => $sortOrder++
         ]);
 
@@ -92,6 +96,7 @@ public function run()
             'parent_id'  => $usersMenu->id,
             'name'       => 'Manage access',
             'route'      => 'users.access',
+            'permission' => 'menu.user-management.manage-access',
             'sort_order' => $sortOrder++
         ]);
 
@@ -102,6 +107,7 @@ public function run()
 
         $devMenu = Menu::create([
             'name'       => 'Developer menu',
+            'permission' => 'menu.developer-menu',
             'sort_order' => $sortOrder++
         ]);
 
@@ -114,6 +120,7 @@ public function run()
             'parent_id'  => $devMenu->id,
             'name'       => 'Permissions',
             'route'      => 'developers.permissions',
+            'permission' => 'menu.developer-menu.permissions',
             'sort_order' => $sortOrder++
         ]);
 
@@ -126,6 +133,7 @@ public function run()
             'parent_id'  => $devMenu->id,
             'name'       => 'Menus',
             'route'      => 'developers.menus',
+            'permission' => 'menu.developer-menu.menus',
             'sort_order' => $sortOrder++
         ]);
 
@@ -145,13 +153,12 @@ public function run()
         $developer->givePermissionTo('menu.developer-menu.permissions');
         $developer->givePermissionTo('menu.developer-menu.menus');
 
-        $user = User::create(['name' => 'John Doe' , 'email' => 'john@doe.com', 'password' => \Hash::make('password')]);
+        $user = User::create(['name' => 'John Doe', 'email' => 'john@doe.com', 'password' => \Hash::make('password')]);
 
         User::all()->each(function ($user) {
             $user->assignRole('superuser');
         });
 
 
-
     }
 }

resources/views/menu-ui/menu.blade.php

@@ -4,8 +4,14 @@
             @if(!$menu->id) {{ __('New') }} @endif
             {{ __('Menu') }}
             @if($menu->id): {{ $menu->name }} @endif
-
+            @if($menu->id)
+            <a href="{{ route('menu') }}" class="float-right bg-blue-500 text-white font-bold uppercase text-xs px-4 py-2 rounded shadow hover:shadow-md outline-none focus:outline-none mr-1 mb-1 ease-linear transition-all duration-150" type="button">
+                + {{ __('New') }}
+            </a>
+            @endif
         </h2>
+
+
     </x-slot>
     <div class="max-w-7xl mx-auto py-10 sm:px-6 lg:px-8">
         <x-jet-form-section submit="updateMenu">
@@ -71,15 +77,19 @@
 
                 <div class="col-span-6 sm:col-span-4">
                     <x-jet-label for="permission" value="{{ __('Permission') }}"/>
-                    menu.{{ \Str::slug($menu->name) }}
+                    {{ $menu->permission }}
                 </div>
-                @if(empty($menu->parent_id))
                 <div class="col-span-6 sm:col-span-4">
-                    <x-jet-label for="icon" value="{{ __('Menu icon') }}" />
-                    <x-jet-input id="icon" type="text" class="mt-1 block w-full" wire:model.defer="menu.icon" autocomplete="icon"/>
-                    <x-jet-input-error for="menu.icon" class="mt-2"/>
+                    <x-jet-label for="permission" value="{{ __('Label') }}"/>
+                    __('{{ $menu->name }}')
                 </div>
-                    @endif
+                @if(empty($menu->parent_id))
+                    <div class="col-span-6 sm:col-span-4">
+                        <x-jet-label for="icon" value="{{ __('Menu icon') }}"/>
+                        <x-jet-input id="icon" type="text" class="mt-1 block w-full" wire:model.defer="menu.icon" autocomplete="icon"/>
+                        <x-jet-input-error for="menu.icon" class="mt-2"/>
+                    </div>
+                @endif
             </x-slot>
             <x-slot name="actions">
                 <x-jet-action-message class="mr-3" on="saved">

src/Http/Livewire/Menu.php

@@ -30,9 +30,9 @@ public function mount(\LLoadoutInforce\Models\Menu $menu)
             $prefixInfo = $menu->prefixInfo;
             $order      = (!($menu->parent) ? $menu->sort_order * 100 : ($prefixInfo['root']->sort_order * 100) + $prefixInfo['count']);
             return [
-                'id'         => $menu->id,
-                'name'       => $prefixInfo['name'],
-                'order'      => $order
+                'id'    => $menu->id,
+                'name'  => $prefixInfo['name'],
+                'order' => $order
             ];
         });
         $this->parents = $parents->sortBy('order')->pluck('name', 'id')->toArray();
@@ -55,12 +55,17 @@ public function updateMenu()
         $this->validate();
         $this->menu->parent_id = $this->menu->parent_id == 0 ? null : $this->menu->parent_id;
 
-        Permission::firstOrCreate([
-            'name'       => 'menu.' . \Str::slug($this->menu->name),
-            'guard_name' => 'web'
-        ]);
+        if(!$this->menu->permission){
+            $this->menu->permission = $this->menu->prefixinfo['path'];
+            Permission::firstOrCreate([
+                'name'       => $this->menu->permission,
+                'guard_name' => 'web'
+            ]);
+
+        }
 
         $this->menu->save();
+
         $this->mount($this->menu);
         $this->emit('menuUpdated');
         $this->emit('saved');

src/LLoadoutInforceServiceProvider.php

@@ -50,6 +50,7 @@ private function publishAssets()
         $this->publishes([
             __DIR__.'/../database/migrations/create_inforce_tables.php.stub' => base_path('database/migrations/'. date('Y_m_d_His').'_create_inforce_tables.php'),
             __DIR__.'/../database/migrations/update_roles_table.php.stub' => base_path('database/migrations/'. date('Y_m_d_His').'_update_roles_table.php'),
+            __DIR__.'/../database/migrations/update_menus_table.php.stub' => base_path('database/migrations/'. date('Y_m_d_His').'_update_menus_table.php'),
         ], 'LLoadoutInforce-migrations');
 
         return $this;

src/Models/Menu.php

@@ -39,9 +39,4 @@ private function countParents($menu, &$count, &$root, &$path)
         }
     }
 
-    public function getPermissionAttribute()
-    {
-        return $this->prefixInfo['path'];
-    }
-
 }