javier/construprogress
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(roles): role create/edit as a full page instead of a modal

Browse Source 
Per feedback, 'New role' (and Edit) now open a dedicated page instead of a
modal:
- New RoleForm full-page component + view at /admin/roles/create and
  /admin/roles/{role}/edit (name, description, permission checkboxes; saves
  and redirects back to the list).
- RoleManager trimmed: the create/edit modal and its logic removed; 'New role'
  and the per-row/view-modal Edit are now links to the new pages.
- Kept the read-only View modal, single + bulk delete, and protections.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Javier Braña
2026-06-17 17:05:01 +02:00
parent 938e704a67
commit 5092896a1e
5 changed files with 163 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Livewire/RoleForm.php
+79
View File
@@ -0,0 +1,79 @@
<?php
namespace App\Livewire;
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')]
class RoleForm extends Component
{
public ?Role $role = null;
public string $name = '';
public string $description = '';
public array $rolePermissions = [];
private const PROTECTED_ROLES = ['Admin'];
private const CORE_PERMISSION = 'manage all';
public function mount(?Role $role = null): void
{
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();
}
}
public function save()
{
$this->validate([
'name' => 'required|string|max:50|unique:roles,name' . ($this->role ? ',' . $this->role->id : ''),
'description' => 'nullable|string|max:255',
], [], ['name' => 'nombre', 'description' => 'descripción']);
if ($this->role) {
$isProtected = in_array($this->role->name, self::PROTECTED_ROLES, true);
if (! $isProtected) {
$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([
'name' => $this->name,
'description' => $this->description ?: null,
]);
if (! empty($this->rolePermissions)) {
$role->syncPermissions($this->rolePermissions);
}
}
app(PermissionRegistrar::class)->forgetCachedPermissions();
session()->flash('message', 'Rol guardado correctamente.');
return $this->redirect(route('admin.roles'), navigate: true);
}
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),
]);
}
}
app/Livewire/RoleManager.php
+3 -82
View File
@@ -6,19 +6,11 @@ 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')]
class RoleManager extends Component
{
// Create / edit modal
public bool $showForm = false;
public ?int $editingRole = null;
public string $name = '';
public string $description = '';
public array $rolePermissions = []; // selected permission names
// View modal
public ?int $viewingRole = null;
@@ -46,77 +38,6 @@ class RoleManager extends Component
: [];
}
// ── Create / Edit ────────────────────────────────────────────────────────
public function openCreate(): void
{
$this->resetForm();
$this->showForm = true;
}
public function openEdit(int $id): void
{
$role = Role::with('permissions')->findOrFail($id);
$this->editingRole = $role->id;
$this->name = $role->name;
$this->description = $role->description ?? '';
$this->rolePermissions = $role->permissions->pluck('name')->toArray();
$this->resetErrorBag();
$this->viewingRole = null; // close the view modal if open
$this->showForm = true;
}
public function save(): void
{
$this->validate([
'name' => 'required|string|max:50|unique:roles,name' . ($this->editingRole ? ',' . $this->editingRole : ''),
'description' => 'nullable|string|max:255',
], [], ['name' => 'nombre', 'description' => 'descripción']);
if ($this->editingRole) {
$role = Role::findOrFail($this->editingRole);
$isProtected = in_array($role->name, self::PROTECTED_ROLES, true);
// Protected roles can't be renamed
if (! $isProtected) {
$role->name = $this->name;
}
$role->description = $this->description ?: null;
$role->save();
$perms = $this->rolePermissions;
// Admin always keeps the core permission
if ($role->name === 'Admin' && ! in_array(self::CORE_PERMISSION, $perms, true)) {
$perms[] = self::CORE_PERMISSION;
}
$role->syncPermissions($perms);
} else {
$role = Role::create([
'name' => $this->name,
'description' => $this->description ?: null,
]);
if (! empty($this->rolePermissions)) {
$role->syncPermissions($this->rolePermissions);
}
}
$this->flushCache();
$this->closeForm();
$this->dispatch('notify', 'Rol guardado correctamente');
}
public function closeForm(): void
{
$this->showForm = false;
$this->resetForm();
}
private function resetForm(): void
{
$this->reset(['editingRole', 'name', 'description', 'rolePermissions']);
$this->resetErrorBag();
}
// ── View ─────────────────────────────────────────────────────────────────
public function openView(int $id): void
@@ -155,6 +76,7 @@ class RoleManager extends Component
$deleted++;
}
$this->selected = [];
$this->selectAll = false;
$this->flushCache();
$msg = "{$deleted} rol(es) eliminados";
if ($skipped) $msg .= " ({$skipped} protegido(s) omitido(s))";
@@ -164,9 +86,8 @@ class RoleManager extends Component
public function render()
{
return view('livewire.role-manager', [
'roles' => Role::with('permissions')->withCount('users')->orderBy('name')->get(),
'permissions' => Permission::orderBy('name')->get(),
'viewing' => $this->viewingRole
'roles' => Role::with('permissions')->withCount('users')->orderBy('name')->get(),
'viewing' => $this->viewingRole
? Role::with('permissions')->withCount('users')->find($this->viewingRole)
: null,
]);