feat(roles): Rappasoft list, slim create form, and 2-tab role view

1. Roles list now uses a Rappasoft table (RoleTable): search/sort, per-row view/edit/delete, and built-in bulk selection + 'Delete selected'. The /admin/roles page is a plain view embedding <livewire:role-table />. RoleForm create/edit now only has Name + Description (permissions removed). 2. New RoleView page (/admin/roles/{role}) with two tabs: - 'Details': header with role name + Back button; description with Edit/Delete buttons; table of users holding the role (avatar+name | last name | status). - 'Permissions': all permissions grouped by section (by resource), each with a toggle switch to grant/revoke for this role (Admin keeps 'manage all'). Removed the old RoleManager component/view (superseded). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-17 17:21:16 +02:00
parent 5092896a1e
commit 5587026446
9 changed files with 364 additions and 258 deletions
@@ -6,7 +6,6 @@ use Livewire\Component;
 use Livewire\Attributes\Layout;
 use Illuminate\Support\Facades\Auth;
 use Spatie\Permission\Models\Role;
-use Spatie\Permission\Models\Permission;
 use Spatie\Permission\PermissionRegistrar;

 #[Layout('layouts.app')]
@@ -16,7 +15,6 @@ class RoleForm extends Component

    public string $name = '';
    public string $description = '';
-    public array $rolePermissions = [];

    private const PROTECTED_ROLES = ['Admin'];
    private const CORE_PERMISSION = 'manage all';
@@ -26,10 +24,9 @@ class RoleForm extends Component
        abort_unless(Auth::user()?->can(self::CORE_PERMISSION), 403);

        if ($role && $role->exists) {
-            $this->role            = $role;
-            $this->name            = $role->name;
-            $this->description     = $role->description ?? '';
-            $this->rolePermissions = $role->permissions->pluck('name')->toArray();
+            $this->role        = $role;
+            $this->name        = $role->name;
+            $this->description = $role->description ?? '';
        }
    }

@@ -41,26 +38,17 @@ class RoleForm extends Component
        ], [], ['name' => 'nombre', 'description' => 'descripción']);

        if ($this->role) {
-            $isProtected = in_array($this->role->name, self::PROTECTED_ROLES, true);
-            if (! $isProtected) {
+            // Protected roles can't be renamed
+            if (! in_array($this->role->name, self::PROTECTED_ROLES, true)) {
                $this->role->name = $this->name;
            }
            $this->role->description = $this->description ?: null;
            $this->role->save();
-
-            $perms = $this->rolePermissions;
-            if ($this->role->name === 'Admin' && ! in_array(self::CORE_PERMISSION, $perms, true)) {
-                $perms[] = self::CORE_PERMISSION;
-            }
-            $this->role->syncPermissions($perms);
        } else {
-            $role = Role::create([
+            Role::create([
                'name'        => $this->name,
                'description' => $this->description ?: null,
            ]);
-            if (! empty($this->rolePermissions)) {
-                $role->syncPermissions($this->rolePermissions);
-            }
        }

        app(PermissionRegistrar::class)->forgetCachedPermissions();
@@ -72,7 +60,6 @@ class RoleForm extends Component
    public function render()
    {
        return view('livewire.roles.role-form', [
-            'permissions' => Permission::orderBy('name')->get(),
            'isProtected' => $this->role && in_array($this->role->name, self::PROTECTED_ROLES, true),
        ]);
    }
@@ -1,95 +0,0 @@
-<?php
-
-namespace App\Livewire;
-
-use Livewire\Component;
-use Livewire\Attributes\Layout;
-use Illuminate\Support\Facades\Auth;
-use Spatie\Permission\Models\Role;
-use Spatie\Permission\PermissionRegistrar;
-
-#[Layout('layouts.app')]
-class RoleManager extends Component
-{
-    // View modal
-    public ?int $viewingRole = null;
-
-    // Bulk selection
-    public array $selected = [];
-    public bool $selectAll = false;
-
-    private const PROTECTED_ROLES = ['Admin'];
-    private const CORE_PERMISSION = 'manage all';
-
-    public function mount(): void
-    {
-        abort_unless(Auth::user()?->can(self::CORE_PERMISSION), 403);
-    }
-
-    private function flushCache(): void
-    {
-        app(PermissionRegistrar::class)->forgetCachedPermissions();
-    }
-
-    public function updatedSelectAll($value): void
-    {
-        $this->selected = $value
-            ? Role::pluck('id')->map(fn ($id) => (string) $id)->toArray()
-            : [];
-    }
-
-    // ── View ─────────────────────────────────────────────────────────────────
-
-    public function openView(int $id): void
-    {
-        $this->viewingRole = $id;
-    }
-
-    public function closeView(): void
-    {
-        $this->viewingRole = null;
-    }
-
-    // ── Delete (single / bulk) ─────────────────────────────────────────────────
-
-    public function delete(int $id): void
-    {
-        $role = Role::findOrFail($id);
-        if (in_array($role->name, self::PROTECTED_ROLES, true)) {
-            $this->dispatch('notify', "El rol '{$role->name}' está protegido y no se puede borrar.");
-            return;
-        }
-        $role->delete();
-        $this->selected = array_values(array_diff($this->selected, [(string) $id, $id]));
-        $this->flushCache();
-        $this->dispatch('notify', 'Rol eliminado');
-    }
-
-    public function bulkDelete(): void
-    {
-        $roles = Role::whereIn('id', $this->selected)->get();
-        $deleted = 0;
-        $skipped = 0;
-        foreach ($roles as $role) {
-            if (in_array($role->name, self::PROTECTED_ROLES, true)) { $skipped++; continue; }
-            $role->delete();
-            $deleted++;
-        }
-        $this->selected = [];
-        $this->selectAll = false;
-        $this->flushCache();
-        $msg = "{$deleted} rol(es) eliminados";
-        if ($skipped) $msg .= " ({$skipped} protegido(s) omitido(s))";
-        $this->dispatch('notify', $msg);
-    }
-
-    public function render()
-    {
-        return view('livewire.role-manager', [
-            'roles'   => Role::with('permissions')->withCount('users')->orderBy('name')->get(),
-            'viewing' => $this->viewingRole
-                ? Role::with('permissions')->withCount('users')->find($this->viewingRole)
-                : null,
-        ]);
-    }
-}
@@ -0,0 +1,105 @@
+<?php
+
+namespace App\Livewire;
+
+use Rappasoft\LaravelLivewireTables\DataTableComponent;
+use Rappasoft\LaravelLivewireTables\Views\Column;
+use Illuminate\Database\Eloquent\Builder;
+use Spatie\Permission\Models\Role;
+use Spatie\Permission\PermissionRegistrar;
+
+class RoleTable extends DataTableComponent
+{
+    protected $model = Role::class;
+
+    private const PROTECTED_ROLES = ['Admin'];
+
+    public function configure(): void
+    {
+        $this->setPrimaryKey('id')
+             ->setDefaultSort('name', 'asc')
+             ->setSortingPillsEnabled(false);
+    }
+
+    public function builder(): Builder
+    {
+        return Role::withCount(['permissions', 'users']);
+    }
+
+    public function columns(): array
+    {
+        return [
+            Column::make(__('Name'), 'name')
+                  ->sortable()
+                  ->searchable()
+                  ->format(fn ($value, $row) =>
+                      '<a href="'.route('admin.roles.show', $row->id).'" class="font-semibold text-primary hover:underline" wire:navigate>'.e($value).'</a>'
+                      . (in_array($row->name, self::PROTECTED_ROLES, true) ? ' <span class="badge badge-ghost badge-xs">protegido</span>' : '')
+                  )
+                  ->html(),
+
+            Column::make(__('Description'), 'description')
+                  ->sortable()
+                  ->searchable()
+                  ->format(fn ($value) => $value
+                      ? '<span class="text-sm text-gray-500">'.e($value).'</span>'
+                      : '<span class="text-gray-300">—</span>')
+                  ->html(),
+
+            Column::make(__('Permissions'))
+                  ->label(fn ($row) => '<span class="badge badge-outline badge-sm">'.(int) $row->permissions_count.'</span>')
+                  ->html(),
+
+            Column::make(__('Users'))
+                  ->label(fn ($row) => '<span class="badge badge-ghost badge-sm">'.(int) $row->users_count.'</span>')
+                  ->html(),
+
+            Column::make(__('Actions'))
+                  ->label(function ($row) {
+                      $show = route('admin.roles.show', $row->id);
+                      $edit = route('admin.roles.edit', $row->id);
+                      $eye   = '<svg xmlns="http://www.w3.org/2000/svg" class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z"/><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z"/></svg>';
+                      $pencil = '<svg xmlns="http://www.w3.org/2000/svg" class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"/></svg>';
+                      $trash  = '<svg xmlns="http://www.w3.org/2000/svg" class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"/></svg>';
+
+                      $html  = '<div class="flex items-center gap-1">';
+                      $html .= '<a href="'.$show.'" class="btn btn-xs btn-ghost" title="Ver" wire:navigate>'.$eye.'</a>';
+                      $html .= '<a href="'.$edit.'" class="btn btn-xs btn-ghost text-info" title="Editar" wire:navigate>'.$pencil.'</a>';
+                      if (! in_array($row->name, self::PROTECTED_ROLES, true)) {
+                          $html .= '<button wire:click="deleteRole('.$row->id.')" wire:confirm="¿Eliminar el rol \''.e($row->name).'\'?" class="btn btn-xs btn-ghost text-error" title="Eliminar">'.$trash.'</button>';
+                      }
+                      $html .= '</div>';
+                      return $html;
+                  })
+                  ->html(),
+        ];
+    }
+
+    public function bulkActions(): array
+    {
+        return ['bulkDelete' => __('Delete selected')];
+    }
+
+    public function bulkDelete(): void
+    {
+        $roles = Role::whereIn('id', $this->selected)->get();
+        foreach ($roles as $role) {
+            if (in_array($role->name, self::PROTECTED_ROLES, true)) continue;
+            $role->delete();
+        }
+        $this->clearSelected();
+        app(PermissionRegistrar::class)->forgetCachedPermissions();
+        $this->dispatch('notify', __('Roles deleted'));
+    }
+
+    public function deleteRole(int $id): void
+    {
+        $role = Role::findOrFail($id);
+        if (in_array($role->name, self::PROTECTED_ROLES, true)) {
+            return;
+        }
+        $role->delete();
+        app(PermissionRegistrar::class)->forgetCachedPermissions();
+        $this->dispatch('notify', __('Role deleted'));
+    }
+}
@@ -0,0 +1,95 @@
+<?php
+
+namespace App\Livewire;
+
+use Livewire\Component;
+use Livewire\Attributes\Layout;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Str;
+use Spatie\Permission\Models\Role;
+use Spatie\Permission\Models\Permission;
+use Spatie\Permission\PermissionRegistrar;
+
+#[Layout('layouts.app')]
+class RoleView extends Component
+{
+    public Role $role;
+    public string $tab = 'ficha';   // ficha | permisos
+
+    private const PROTECTED_ROLES = ['Admin'];
+    private const CORE_PERMISSION = 'manage all';
+
+    public function mount(Role $role): void
+    {
+        abort_unless(Auth::user()?->can(self::CORE_PERMISSION), 403);
+        $this->role = $role;
+    }
+
+    public function setTab(string $tab): void
+    {
+        $this->tab = in_array($tab, ['ficha', 'permisos'], true) ? $tab : 'ficha';
+    }
+
+    public function togglePermission(string $permissionName): void
+    {
+        // Admin must always keep the core permission
+        if ($this->role->name === 'Admin'
+            && $permissionName === self::CORE_PERMISSION
+            && $this->role->hasPermissionTo($permissionName)) {
+            $this->dispatch('notify', "El rol Admin no puede perder '" . self::CORE_PERMISSION . "'.");
+            return;
+        }
+
+        if ($this->role->hasPermissionTo($permissionName)) {
+            $this->role->revokePermissionTo($permissionName);
+        } else {
+            $this->role->givePermissionTo($permissionName);
+        }
+
+        app(PermissionRegistrar::class)->forgetCachedPermissions();
+        $this->role->load('permissions');
+        $this->dispatch('notify', 'Permisos actualizados');
+    }
+
+    public function delete()
+    {
+        if (in_array($this->role->name, self::PROTECTED_ROLES, true)) {
+            $this->dispatch('notify', "El rol '{$this->role->name}' está protegido y no se puede borrar.");
+            return;
+        }
+        $this->role->delete();
+        app(PermissionRegistrar::class)->forgetCachedPermissions();
+        session()->flash('message', 'Rol eliminado.');
+
+        return $this->redirect(route('admin.roles'), navigate: true);
+    }
+
+    /** Section title for a permission name (groups by the resource / last word). */
+    private function sectionFor(string $name): string
+    {
+        if ($name === self::CORE_PERMISSION) {
+            return 'General';
+        }
+        $resource = Str::afterLast($name, ' ');
+        return Str::headline($resource ?: 'General');
+    }
+
+    public function render()
+    {
+        $users = $this->role->users()
+            ->orderBy('first_name')
+            ->orderBy('name')
+            ->get();
+
+        $grouped = Permission::orderBy('name')->get()
+            ->groupBy(fn ($perm) => $this->sectionFor($perm->name))
+            ->sortKeys();
+
+        return view('livewire.roles.role-view', [
+            'users'     => $users,
+            'grouped'   => $grouped,
+            'rolePerms' => $this->role->permissions->pluck('name')->toArray(),
+            'isProtected' => in_array($this->role->name, self::PROTECTED_ROLES, true),
+        ]);
+    }
+}