hide built in permissions and menus for editing

dietercoopman · dietercoopman · commit 83f23b70759b · 2021-08-27T20:39:37.000+02:00
diff --git a/database/migrations/create_inforce_tables.php.stub b/database/migrations/create_inforce_tables.php.stub
@@ -18,8 +18,10 @@ class CreateInforceTables extends Migration
             $table->bigInteger('parent_id')->nullable();
             $table->string('name');
             $table->string('route')->nullable();
+            $table->string('permission')->nullable();
             $table->bigInteger('sort_order');
             $table->text('icon')->nullable();
+            $table->boolean('editable')->default(true);
             $table->timestamps();
         });
     }
diff --git a/database/migrations/update_permissions_table.stub b/database/migrations/update_permissions_table.stub
@@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class UpdateMenusTable extends Migration
+class UpdatePermissionsTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,8 +13,8 @@ class UpdateMenusTable extends Migration
      */
     public function up()
     {
-        Schema::table('menus', function (Blueprint $table) {
-            $table->string('permission')->after('route')->nullable();
+        Schema::table('permissions', function (Blueprint $table) {
+            $table->boolean('editable')->default(true);
         });
     }
 
@@ -25,8 +25,8 @@ class UpdateMenusTable extends Migration
      */
     public function down()
     {
-        Schema::table('menus', function (Blueprint $table) {
-            $table->dropColumn('permission');
+        Schema::table('permissions', function (Blueprint $table) {
+            $table->dropColumn('editable');
         });
     }
 }
diff --git a/database/seeders/InforceSeeder.php b/database/seeders/InforceSeeder.php
@@ -37,93 +37,107 @@ public function run()
             ]);
         });
 
-        $sortOrder = 0;
+        $sortOrder = 999;
 
         $usersMenu = Menu::create([
             'name'       => 'User management',
             'permission' => 'menu.user-management',
-            'sort_order' => $sortOrder++
+            'sort_order' => $sortOrder++,
+            'editable'   => false
         ]);
 
         Permission::create([
             'name'       => 'menu.user-management',
-            'guard_name' => 'web'
+            'guard_name' => 'web',
+            'editable'   => false
         ]);
 
         Menu::create([
             'parent_id'  => $usersMenu->id,
             'name'       => 'Manage users',
             'route'      => 'users.index',
             'permission' => 'menu.user-management.manage-users',
-            'sort_order' => $sortOrder++
+            'sort_order' => $sortOrder++,
+            'editable'   => false
         ]);
 
         Permission::create([
             'name'       => 'menu.user-management.manage-users',
-            'guard_name' => 'web'
+            'guard_name' => 'web',
+            'editable'   => false
         ]);
 
         Menu::create([
             'parent_id'  => $usersMenu->id,
             'name'       => 'Manage roles',
             'route'      => 'users.roles',
             'permission' => 'menu.user-management.manage-roles',
-            'sort_order' => $sortOrder++
+            'sort_order' => $sortOrder++,
+            'editable'   => false
         ]);
 
         Permission::create([
             'name'       => 'menu.user-management.manage-roles',
-            'guard_name' => 'web'
+            'guard_name' => 'web',
+            'editable'   => false
         ]);
 
         Menu::create([
             'parent_id'  => $usersMenu->id,
             'name'       => 'Manage access',
             'route'      => 'users.access',
             'permission' => 'menu.user-management.manage-access',
-            'sort_order' => $sortOrder++
+            'sort_order' => $sortOrder++,
+            'editable'   => false
         ]);
 
         Permission::create([
             'name'       => 'menu.user-management.manage-access',
-            'guard_name' => 'web'
+            'guard_name' => 'web',
+            'editable'   => false
         ]);
 
         $devMenu = Menu::create([
             'name'       => 'Developer menu',
             'permission' => 'menu.developer-menu',
-            'sort_order' => $sortOrder++
+            'sort_order' => $sortOrder++,
+            'editable'   => false
         ]);
 
         Permission::create([
             'name'       => 'menu.developer-menu',
-            'guard_name' => 'web'
+            'guard_name' => 'web',
+            'editable'   => false
         ]);
 
         Menu::create([
             'parent_id'  => $devMenu->id,
             'name'       => 'Permissions',
             'route'      => 'developers.permissions',
             'permission' => 'menu.developer-menu.permissions',
-            'sort_order' => $sortOrder++
+            'sort_order' => $sortOrder++,
+            'editable'   => false
         ]);
 
         Permission::create([
             'name'       => 'menu.developer-menu.permissions',
-            'guard_name' => 'web'
+            'guard_name' => 'web',
+            'editable'   => false
         ]);
 
         Menu::create([
             'parent_id'  => $devMenu->id,
             'name'       => 'Menus',
             'route'      => 'developers.menus',
             'permission' => 'menu.developer-menu.menus',
-            'sort_order' => $sortOrder++
+            'sort_order' => $sortOrder++,
+            'editable'   => false
         ]);
 
         Permission::create([
             'name'       => 'menu.developer-menu.menus',
-            'guard_name' => 'web'
+            'guard_name' => 'web',
+            'editable'   => false
         ]);
 
         $developer = Role::create(['name' => 'superuser']);
diff --git a/resources/views/menu-ui/navigation-item.blade.php b/resources/views/menu-ui/navigation-item.blade.php
@@ -5,7 +5,7 @@
                 <li class="rounded-sm relative px-4 py-2 hover:bg-gray-100">
                     <button class="w-full text-left flex items-center outline-none focus:outline-none">
                     <span class="flex pr-1 flex-1">
-                        @if($showPerks)
+                        @if($showPerks && $menu->editable)
                             <a class="flex" href="{{ route('menu',$__menu->id) }}">
                             <svg style="height: 10px;margin-top: 4px;margin-right:10px" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
                                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15.232 5.232l3.536 3.536m-2.036-5.036a2.5 2.5 0 113.536 3.536L6.5 21.036H3v-3.572L16.732 3.732z"/>
@@ -25,7 +25,7 @@
                 </li>
             @else
                 <li class="flex px-3 py-1 hover:bg-gray-100 block px-4 py-2 text-sm leading-5 text-gray-700 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 transition duration-150 ease-in-out">
-                    @if($showPerks)
+                    @if($showPerks && $menu->editable)
                         <a class="flex" href="{{ route('menu',$__menu->id) }}">
                             <svg style="height: 10px;margin-top: 4px;margin-right:10px" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
                                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15.232 5.232l3.536 3.536m-2.036-5.036a2.5 2.5 0 113.536 3.536L6.5 21.036H3v-3.572L16.732 3.732z"/>
diff --git a/resources/views/menu-ui/navigation.blade.php b/resources/views/menu-ui/navigation.blade.php
@@ -5,7 +5,7 @@
             <div class="relative text-sm" x-data="{ open: false }">
                 <div class="group inline-block">
                     <i class="absolute top-1.5 -left-3.5 text-gray-500" style="width: 15px;height:15px">{!! $menu->icon !!}</i>
-                    @if($showPerks)
+                    @if($showPerks && $menu->editable)
                         <a class="flex absolute top-1.5 -left-3.5 text-gray-500" href="{{ route('menu',$menu->id) }}">
                             <svg style="height: 10px;margin-top: 2px;margin-right:10px" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
                                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15.232 5.232l3.536 3.536m-2.036-5.036a2.5 2.5 0 113.536 3.536L6.5 21.036H3v-3.572L16.732 3.732z"/>
diff --git a/src/Http/Livewire/MenusTable.php b/src/Http/Livewire/MenusTable.php
@@ -17,16 +17,14 @@ class MenusTable extends DataTableComponent
     public function query(): Builder
     {
         return Menu::query()
-            ->when($this->getFilter('search'), fn ($query, $term) => $query->where('name', 'like', '%'.$term.'%')->orWhere('route', 'like', '%'.$term.'%'));
+            ->when($this->getFilter('search'), fn ($query, $term) => $query->where('name', 'like', '%'.$term.'%')->orWhere('route', 'like', '%'.$term.'%'))->whereEditable(true);
 
     }
 
     public function columns(): array
     {
 
         return [
-            Column::make('ID', 'id')
-                ->sortable(),
             Column::make('Name', 'name')
                 ->sortable(),
             Column::make('Route', 'route')
diff --git a/src/Http/Livewire/PermissionsTable.php b/src/Http/Livewire/PermissionsTable.php
@@ -20,15 +20,13 @@ class PermissionsTable extends DataTableComponent
     public function query(): Builder
     {
         return Permission::query()
-            ->when($this->getFilter('search'), fn ($query, $term) => $query->where('name', 'like', '%'.$term.'%'));
+            ->when($this->getFilter('search'), fn ($query, $term) => $query->where('name', 'like', '%'.$term.'%'))->whereEditable(true);
     }
 
     public function columns(): array
     {
 
         return [
-            Column::make('ID', 'id')
-                ->sortable(),
             Column::make('Name', 'name')
                 ->sortable(),
         ];
diff --git a/src/Http/Livewire/RolesTable.php b/src/Http/Livewire/RolesTable.php
@@ -27,8 +27,6 @@ public function columns(): array
     {
 
         return [
-            Column::make('ID', 'id')
-                ->sortable(),
             Column::make('Name', 'name')
                 ->sortable(),
         ];
diff --git a/src/Http/Livewire/UsersTable.php b/src/Http/Livewire/UsersTable.php
@@ -28,8 +28,6 @@ public function columns(): array
     {
 
         return [
-            Column::make('ID', 'id')
-                ->sortable(),
             Column::make('Name', 'name')
                 ->sortable(),
             Column::make('Email', 'email')
diff --git a/src/LLoadoutInforceServiceProvider.php b/src/LLoadoutInforceServiceProvider.php
@@ -50,7 +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'),
+            __DIR__.'/../database/migrations/update_permissions_table.stub' => base_path('database/migrations/'. date('Y_m_d_His').'_update_permissions_table.php'),
         ], 'LLoadoutInforce-migrations');
 
         return $this;

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema;`
`4`	`4`	`use Illuminate\Database\Schema\Blueprint;`
`5`	`5`	`use Illuminate\Database\Migrations\Migration;`
`6`	`6`
`7`		`-class UpdateMenusTable extends Migration`
	`7`	`+class UpdatePermissionsTable extends Migration`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* Run the migrations.`
`@@ -13,8 +13,8 @@ class UpdateMenusTable extends Migration`
`13`	`13`	`*/`
`14`	`14`	`public function up()`
`15`	`15`	`{`
`16`		`- Schema::table('menus', function (Blueprint $table) {`
`17`		`- $table->string('permission')->after('route')->nullable();`
	`16`	`+ Schema::table('permissions', function (Blueprint $table) {`
	`17`	`+ $table->boolean('editable')->default(true);`
`18`	`18`	`});`
`19`	`19`	`}`
`20`	`20`
`@@ -25,8 +25,8 @@ class UpdateMenusTable extends Migration`
`25`	`25`	`*/`
`26`	`26`	`public function down()`
`27`	`27`	`{`
`28`		`- Schema::table('menus', function (Blueprint $table) {`
`29`		`- $table->dropColumn('permission');`
	`28`	`+ Schema::table('permissions', function (Blueprint $table) {`
	`29`	`+ $table->dropColumn('editable');`
`30`	`30`	`});`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,16 +17,14 @@ class MenusTable extends DataTableComponent`
`17`	`17`	`public function query(): Builder`
`18`	`18`	`{`
`19`	`19`	`return Menu::query()`
`20`		`- ->when($this->getFilter('search'), fn ($query, $term) => $query->where('name', 'like', '%'.$term.'%')->orWhere('route', 'like', '%'.$term.'%'));`
	`20`	`+ ->when($this->getFilter('search'), fn ($query, $term) => $query->where('name', 'like', '%'.$term.'%')->orWhere('route', 'like', '%'.$term.'%'))->whereEditable(true);`
`21`	`21`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`public function columns(): array`
`25`	`25`	`{`
`26`	`26`
`27`	`27`	`return [`
`28`		`- Column::make('ID', 'id')`
`29`		`- ->sortable(),`
`30`	`28`	`Column::make('Name', 'name')`
`31`	`29`	`->sortable(),`
`32`	`30`	`Column::make('Route', 'route')`
Original file line number	Diff line number	Diff line change
`@@ -20,15 +20,13 @@ class PermissionsTable extends DataTableComponent`
`20`	`20`	`public function query(): Builder`
`21`	`21`	`{`
`22`	`22`	`return Permission::query()`
`23`		`- ->when($this->getFilter('search'), fn ($query, $term) => $query->where('name', 'like', '%'.$term.'%'));`
	`23`	`+ ->when($this->getFilter('search'), fn ($query, $term) => $query->where('name', 'like', '%'.$term.'%'))->whereEditable(true);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public function columns(): array`
`27`	`27`	`{`
`28`	`28`
`29`	`29`	`return [`
`30`		`- Column::make('ID', 'id')`
`31`		`- ->sortable(),`
`32`	`30`	`Column::make('Name', 'name')`
`33`	`31`	`->sortable(),`
`34`	`32`	`];`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,6 @@ public function columns(): array`
`27`	`27`	`{`
`28`	`28`
`29`	`29`	`return [`
`30`		`- Column::make('ID', 'id')`
`31`		`- ->sortable(),`
`32`	`30`	`Column::make('Name', 'name')`
`33`	`31`	`->sortable(),`
`34`	`32`	`];`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,6 @@ public function columns(): array`
`28`	`28`	`{`
`29`	`29`
`30`	`30`	`return [`
`31`		`- Column::make('ID', 'id')`
`32`		`- ->sortable(),`
`33`	`31`	`Column::make('Name', 'name')`
`34`	`32`	`->sortable(),`
`35`	`33`	`Column::make('Email', 'email')`