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.
dcblogdev · May 30, 2024 · 435afc8 · 435afc8
1 parent 9470d4e
commit 435afc8
Show file tree

Hide file tree

Showing 10 changed files with 107 additions and 68 deletions.
diff --git a/app/Livewire/Admin/Roles/Row.php 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -82,7 +82,7 @@
 
     Livewire::test(Users::class)
         ->set('email', '[email protected]')
-        ->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)