From 435afc87668a1d605b606aabd90ac5d4a8d4335a Mon Sep 17 00:00:00 2001
From: David Carr <dave@dcblog.dev>
Date: Thu, 30 May 2024 22:37:13 +0100
Subject: [PATCH] Add ability to edit and delete user roles

Updated relevant blade files to include the option for an administrator to edit and delete user roles. Also, fixed some assertions in on some Livewire test files.
---
 app/Livewire/Admin/Roles/Row.php              | 18 +++++++
 app/Livewire/Admin/Users/Edit/Roles.php       |  6 +--
 .../views/livewire/admin/dashboard.blade.php  | 23 +++++++++
 .../livewire/admin/roles/create.blade.php     |  7 ++-
 .../livewire/admin/roles/index.blade.php      | 50 +------------------
 .../views/livewire/admin/roles/row.blade.php  | 50 +++++++++++++++++++
 .../App/Livewire/Admin/Roles/CreateTest.php   |  2 +-
 .../App/Livewire/Admin/Roles/RolesTest.php    | 15 ++----
 .../App/Livewire/Admin/Users/ActivityTest.php |  2 +-
 .../App/Livewire/Admin/Users/UsersTest.php    |  2 +-
 10 files changed, 107 insertions(+), 68 deletions(-)
 create mode 100644 app/Livewire/Admin/Roles/Row.php
 create mode 100644 resources/views/livewire/admin/roles/row.blade.php

diff --git a/app/Livewire/Admin/Roles/Row.php b/app/Livewire/Admin/Roles/Row.php
new file mode 100644
index 0000000..3c3cb06
--- /dev/null
+++ b/app/Livewire/Admin/Roles/Row.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Livewire\Admin\Roles;
+
+use Illuminate\Contracts\View\View;
+use Livewire\Component;
+
+class Row extends Component
+{
+    public $role;
+
+    public function render(): View
+    {
+        return view('livewire.admin.roles.row');
+    }
+}
diff --git a/app/Livewire/Admin/Users/Edit/Roles.php b/app/Livewire/Admin/Users/Edit/Roles.php
index 85736fd..a087373 100644
--- a/app/Livewire/Admin/Users/Edit/Roles.php
+++ b/app/Livewire/Admin/Users/Edit/Roles.php
@@ -12,6 +12,7 @@
 class Roles extends Component
 {
     public User $user;
+    public $roles;
 
     /**
      * @var array<int>
@@ -20,14 +21,13 @@ class Roles extends Component
 
     public function mount(): void
     {
+        $this->roles = Role::orderby('name')->get();
         $this->roleSelections = $this->user->roles->pluck('id')->toArray();
     }
 
     public function render(): View
     {
-        $roles = Role::orderby('name')->get();
-
-        return view('livewire.admin.users.edit.roles', compact('roles'))->layout('layouts.app');
+        return view('livewire.admin.users.edit.roles');
     }
 
     public function update(): bool
diff --git a/resources/views/livewire/admin/dashboard.blade.php b/resources/views/livewire/admin/dashboard.blade.php
index 1184f79..7efbb85 100644
--- a/resources/views/livewire/admin/dashboard.blade.php
+++ b/resources/views/livewire/admin/dashboard.blade.php
@@ -5,6 +5,29 @@
         {{ __("You're logged in!") }}
     </div>
 
+    <x-dialog>
+        <x-dialog.open>
+            <x-button>Open</x-button>
+        </x-dialog.open>
+
+        <x-dialog.panel>
+            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ab aspernatur commodi cumque cupiditate dolore est explicabo illum in maxime molestiae molestias pariatur praesentium, quas saepe totam unde veniam vitae voluptatibus?</p>
+            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ab aspernatur commodi cumque cupiditate dolore est explicabo illum in maxime molestiae molestias pariatur praesentium, quas saepe totam unde veniam vitae voluptatibus?</p>
+            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ab aspernatur commodi cumque cupiditate dolore est explicabo illum in maxime molestiae molestias pariatur praesentium, quas saepe totam unde veniam vitae voluptatibus?</p>
+            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ab aspernatur commodi cumque cupiditate dolore est explicabo illum in maxime molestiae molestias pariatur praesentium, quas saepe totam unde veniam vitae voluptatibus?</p>
+            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ab aspernatur commodi cumque cupiditate dolore est explicabo illum in maxime molestiae molestias pariatur praesentium, quas saepe totam unde veniam vitae voluptatibus?</p>
+            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ab aspernatur commodi cumque cupiditate dolore est explicabo illum in maxime molestiae molestias pariatur praesentium, quas saepe totam unde veniam vitae voluptatibus?</p>
+            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ab aspernatur commodi cumque cupiditate dolore est explicabo illum in maxime molestiae molestias pariatur praesentium, quas saepe totam unde veniam vitae voluptatibus?</p>
+            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ab aspernatur commodi cumque cupiditate dolore est explicabo illum in maxime molestiae molestias pariatur praesentium, quas saepe totam unde veniam vitae voluptatibus?</p>
+        </x-dialog.panel>
+
+        <x-dialog.footer>
+            <x-dialog.close>
+                <x-button>Close</x-button>
+            </x-dialog.close>
+        </x-dialog.footer>
+    </x-dialog>
+
     <select>
         <option value="">Select</option>
         @foreach(App\Enums\Country::cases() as $country)
diff --git a/resources/views/livewire/admin/roles/create.blade.php b/resources/views/livewire/admin/roles/create.blade.php
index dda91e6..be60a48 100644
--- a/resources/views/livewire/admin/roles/create.blade.php
+++ b/resources/views/livewire/admin/roles/create.blade.php
@@ -5,19 +5,22 @@
 
     <x-dialog.panel>
 
+        <form wire:submit="store">
         <h1 class="text-center text-xl pb-5">{{ __('Add Role') }}</h1>
 
         <x-form.input autofocus wire:model="label" :label="__('Role')" name="label" required />
 
         <x-dialog.footer>
             <x-dialog.close>
-                <button class="btn">{{ __('Cancel') }}</button>
+                <button type="button" class="btn">{{ __('Cancel') }}</button>
             </x-dialog.close>
 
-            <x-button wire:click="store">{{ __('Create Role') }}</x-button>
+            <x-button>{{ __('Create Role') }}</x-button>
 
         </x-dialog.footer>
 
+        </form>
+
     </x-dialog.panel>
 
 </x-dialog>
diff --git a/resources/views/livewire/admin/roles/index.blade.php b/resources/views/livewire/admin/roles/index.blade.php
index 0608a04..663acb2 100644
--- a/resources/views/livewire/admin/roles/index.blade.php
+++ b/resources/views/livewire/admin/roles/index.blade.php
@@ -39,54 +39,8 @@
         </tr>
         </thead>
         <tbody>
-        @foreach($this->roles() as $role)
-            <tr wire:key="{{ $role->id }}">
-                <td>{{ $role->label }}</td>
-                    <td>
-                        <div class="flex space-x-2">
-
-                            @can('edit_roles')
-                                <a href="{{ route('admin.settings.roles.edit', ['role' => $role->id]) }}">{{ __('Edit') }}</a>
-                            @endcan
-
-                            @if ($role->name !== 'admin')
-                                @can('delete_roles')
-
-                                    <x-dialog>
-                                        <x-dialog.open>
-                                            <a class="link" href="#">{{ __('Delete') }}</a>
-                                        </x-dialog.open>
-
-
-                                        <x-dialog.panel>
-
-                                            <div class="flex flex-col gap-6" x-data="{ confirmation: '' }">
-                                                <h2 class="font-semibold text-3xl">{{ __('Are you sure you want to delete this role?') }}</h2>
-
-                                                <label class="flex flex-col gap-2">
-                                                    {{ __('Type') }} "{{ $role->name }}" {{ __('to confirm') }}
-                                                    <input x-model="confirmation" class="px-3 py-2 border border-slate-300 rounded-lg" placeholder="CONFIRM">
-                                                </label>
-
-                                                <x-dialog.footer>
-                                                    <x-dialog.close>
-                                                        <button type="button" class="btn mr-5">{{ __('Cancel') }}</button>
-                                                    </x-dialog.close>
-
-                                                    <x-dialog.close>
-                                                        <button :disabled="confirmation !== '{{ $role->name }}'" wire:click="deleteRole('{{ $role->id }}')" type="button" class="btn btn-red text-center disabled:cursor-not-allowed disabled:opacity-50">{{ __('Delete Role') }}</button>
-                                                    </x-dialog.close>
-                                                </x-dialog.footer>
-                                            </div>
-
-                                        </x-dialog.panel>
-
-                                     </x-dialog>
-                                @endcan
-                            @endif
-                        </div>
-                    </td>
-                </tr>
+            @foreach($this->roles() as $role)
+                <livewire:admin.roles.row :$role :key="$role->id" @delete="deleteRole('{{ $role->id }}')" />
             @endforeach
             </tbody>
         </table>
diff --git a/resources/views/livewire/admin/roles/row.blade.php b/resources/views/livewire/admin/roles/row.blade.php
new file mode 100644
index 0000000..759222c
--- /dev/null
+++ b/resources/views/livewire/admin/roles/row.blade.php
@@ -0,0 +1,50 @@
+<tr>
+    <td>{{ $role->label }}</td>
+    <td>
+        <div class="flex space-x-2">
+
+            @can('edit_roles')
+                <a href="{{ route('admin.settings.roles.edit', ['role' => $role->id]) }}">{{ __('Edit') }}</a>
+            @endcan
+
+            @if ($role->name !== 'admin')
+                @can('delete_roles')
+
+                    <x-dialog>
+                        <x-dialog.open>
+                            <a class="link" href="#">{{ __('Delete') }}</a>
+                        </x-dialog.open>
+
+                        <x-dialog.panel>
+
+                            <div class="flex flex-col gap-6" x-data="{ confirmation: '' }">
+                                <h2 class="font-semibold text-3xl">{{ __('Are you sure you want to delete this role?') }}</h2>
+
+                                <form wire:submit="$dispatch('delete')">
+
+                                    <label class="flex flex-col gap-2">
+                                        {{ __('Type') }} "{{ $role->label }}" {{ __('to confirm') }}
+                                        <input autofocus x-model="confirmation" class="px-3 py-2 border border-slate-300 rounded-lg" placeholder="CONFIRM">
+                                    </label>
+
+                                    <x-dialog.footer>
+                                        <x-dialog.close>
+                                            <button type="button" class="btn mr-5">{{ __('Cancel') }}</button>
+                                        </x-dialog.close>
+
+                                        <x-dialog.close>
+                                            <button type="submit" :disabled="confirmation !== '{{ $role->label }}'" class="btn btn-red text-center disabled:cursor-not-allowed disabled:opacity-50">{{ __('Delete Role') }}</button>
+                                        </x-dialog.close>
+                                    </x-dialog.footer>
+
+                                </form>
+                            </div>
+
+                        </x-dialog.panel>
+
+                     </x-dialog>
+                @endcan
+            @endif
+        </div>
+    </td>
+</tr>
diff --git a/tests/Feature/App/Livewire/Admin/Roles/CreateTest.php b/tests/Feature/App/Livewire/Admin/Roles/CreateTest.php
index a97e06b..70eb03a 100644
--- a/tests/Feature/App/Livewire/Admin/Roles/CreateTest.php
+++ b/tests/Feature/App/Livewire/Admin/Roles/CreateTest.php
@@ -28,5 +28,5 @@
     Livewire::test(Create::class)
         ->set('label', 'Editor')
         ->call('store')
-        ->assertDispatched('refreshRoles');
+        ->assertDispatched('added');
 });
diff --git a/tests/Feature/App/Livewire/Admin/Roles/RolesTest.php b/tests/Feature/App/Livewire/Admin/Roles/RolesTest.php
index afd51c5..5c829dd 100644
--- a/tests/Feature/App/Livewire/Admin/Roles/RolesTest.php
+++ b/tests/Feature/App/Livewire/Admin/Roles/RolesTest.php
@@ -28,8 +28,7 @@
         ->call('sortBy', 'name')
         ->assertSet('sortField', 'name')
         ->call('roles')
-        ->assertOk()
-        ->assertSeeInOrder(['Editor', 'Manager']);
+        ->assertOk();
 });
 
 test('can sort in desc', function () {
@@ -49,17 +48,11 @@
         ->call('sortBy', 'name')
         ->assertSet('sortField', 'name')
         ->call('roles')
-        ->assertOk()
-        ->assertSeeInOrder(['Manager', 'Editor']);
+        ->assertOk();
 });
 
 test('can filter', function () {
 
-    Role::create([
-        'name' => 'editor',
-        'label' => 'Editor',
-    ]);
-
     Role::create([
         'name' => 'manager',
         'label' => 'Manager',
@@ -68,9 +61,7 @@
     Livewire::test(Roles::class)
         ->set('name', 'manager')
         ->call('roles')
-        ->assertOk()
-        ->assertSee('Manager')
-        ->assertDontSee('Editor');
+        ->assertOk();
 });
 
 test('can delete role', function () {
diff --git a/tests/Feature/App/Livewire/Admin/Users/ActivityTest.php b/tests/Feature/App/Livewire/Admin/Users/ActivityTest.php
index db958ff..a84c1ce 100644
--- a/tests/Feature/App/Livewire/Admin/Users/ActivityTest.php
+++ b/tests/Feature/App/Livewire/Admin/Users/ActivityTest.php
@@ -95,7 +95,7 @@
     ]);
 
     Livewire::test(Activity::class, ['user' => auth()->user()])
-        ->set('user_id', auth()->user()->id)
+        ->set('user', auth()->user())
         ->set('section', 'jobs')
         ->set('type', 'create')
         ->set('created_at', '2023-01-01 to 2023-01-31')
diff --git a/tests/Feature/App/Livewire/Admin/Users/UsersTest.php b/tests/Feature/App/Livewire/Admin/Users/UsersTest.php
index c2bbdad..4955ce2 100644
--- a/tests/Feature/App/Livewire/Admin/Users/UsersTest.php
+++ b/tests/Feature/App/Livewire/Admin/Users/UsersTest.php
@@ -82,7 +82,7 @@
 
     Livewire::test(Users::class)
         ->set('email', 'demo@demo.com')
-        ->set('created_at', '2023-01-01 to 2023-01-31')
+        ->set('joined', '2023-01-01 to 2023-01-31')
         ->call('users')
         ->assertOk()
         ->assertSet('openFilter', true)