cleanup and restructure

Author: dietercoopman

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

@@ -21,7 +21,7 @@
             <br/>
             @verbatim
                 <br/>@can(@endverbatim'{{ $permission->name }}'@verbatim)<br/>
-                &nbsp;&nbsp;//<br/>
+                &nbsp;&nbsp;&nbsp;&nbsp;/* code here */<br/>
                 @endcan<br/>
             @endverbatim
         </x-slot>

src/Http/Livewire/Menu.php

@@ -12,7 +12,7 @@ class Menu extends Component
     public  $menu;
     private $parents;
 
-    protected function rules()
+    protected function rules() : array
     {
         return [
             'menu.name'       => 'required|string',
@@ -23,7 +23,7 @@ protected function rules()
         ];
     }
 
-    public function mount(\LLoadoutInforce\Models\Menu $menu)
+    public function mount(\LLoadoutInforce\Models\Menu $menu) : void
     {
         $this->menu    = $menu;
         $parents       = \LLoadoutInforce\Models\Menu::with('parent')->get()->map(function ($menu) {
@@ -38,19 +38,19 @@ public function mount(\LLoadoutInforce\Models\Menu $menu)
         $this->parents = $parents->sortBy('order')->pluck('name', 'id')->toArray();
     }
 
-    public function render()
+    public function render() : \View
     {
         $menus   = \LLoadoutInforce\Models\Menu::with('menu.menu.menu')->orderBy('sort_order')->get();
         $parents = $this->parents;
         return view('LLoadoutInforce-views::menu-ui.menu', compact('menus', 'parents'));
     }
 
-    public function delete()
+    public function delete() : void
     {
         $this->menu->delete();
     }
 
-    public function updateMenu()
+    public function updateMenu() : void
     {
         $this->validate();
         $this->menu->parent_id = $this->menu->parent_id == 0 ? null : $this->menu->parent_id;
@@ -61,7 +61,6 @@ public function updateMenu()
                 'name'       => $this->menu->permission,
                 'guard_name' => 'web'
             ]);
-
         }
 
         $this->menu->save();

src/Http/Livewire/Permission.php

@@ -38,7 +38,7 @@ public function updatePermission()
         if($this->permission->isDirty()){
             $original = $this->permission->getOriginal('name');
             //update menu with this permission to new permission
-            $menu = \LLoadoutInforce\Models\Menu::wherePermission($original)->update(['permission' => $this->permission->name]);
+            \LLoadoutInforce\Models\Menu::wherePermission($original)->update(['permission' => $this->permission->name]);
         }
 
         $this->permission->save();

src/Http/Livewire/Traits/HandlesPermissions.php

@@ -6,6 +6,7 @@
 use LLoadoutInforce\Services\Grouper;
 use Spatie\Permission\Models\Permission;
 use Spatie\Permission\Models\Role;
+use Str;
 
 
 trait HandlesPermissions
@@ -32,7 +33,9 @@ private function forModel($model)
     {
         $this->selectedModel    = $model;
         $this->access           = Permission::all();
-        $this->permissionGroups = app(Grouper::class)->exec($this->access->pluck('name', 'id'));
+        $permissions = $this->access->pluck('name', 'id');
+        $dottedStrings = $this->makeDottedStringIfNotDotted($permissions);
+        $this->permissionGroups = app(Grouper::class)->exec($dottedStrings);
     }
 
     public function forGroup($group)
@@ -54,4 +57,14 @@ public function assignAll()
     {
         $this->selectedModel->givePermissionTo(Permission::where('name', 'like', $this->selectedGroup . ".%")->get());
     }
+
+    private function makeDottedStringIfNotDotted($strings)
+    {
+        return $strings->transform(function ($string) {
+            if (!Str::contains($string, '.')) {
+                return "can." . $string;
+            }
+            return $string;
+        });
+    }
 }

src/Services/Grouper.php

@@ -6,10 +6,6 @@ class Grouper
 
     public function exec($collectionOfDottedStrings, $grouped = [])
     {
-//        return $collectionOfDottedStrings->map(function ($dottedString, $key) use($grouped) {
-//            return data_set($grouped, $dottedString, $key, $overwrite = true);
-//        });
-
         $collectionOfDottedStrings->each(function ($dottedString, $key) use (&$grouped) {
             data_set($grouped, $dottedString, $key, $overwrite = true);
         });