From 069109c4b00966f40c91dfb6d80f598eb01041f2 Mon Sep 17 00:00:00 2001
From: Adrian Hopek <adrian.hopek@blumilk.pl>
Date: Mon, 7 Mar 2022 14:43:40 +0100
Subject: [PATCH] #62 - fix

---
 .../Http/Controllers/DashboardController.php  |   5 +-
 .../Http/Resources/UserResource.php           |   3 +-
 resources/js/Pages/Dashboard.vue              | 117 ++++++++++--------
 resources/js/Pages/Users/Index.vue            |   2 +-
 4 files changed, 74 insertions(+), 53 deletions(-)

diff --git a/app/Infrastructure/Http/Controllers/DashboardController.php b/app/Infrastructure/Http/Controllers/DashboardController.php
index 2dc3bed..7044662 100644
--- a/app/Infrastructure/Http/Controllers/DashboardController.php
+++ b/app/Infrastructure/Http/Controllers/DashboardController.php
@@ -36,7 +36,7 @@ class DashboardController extends Controller
             )
             ->get();
 
-        if ($user->role !== Role::Employee) {
+        if ($user->can("listAll", VacationRequest::class)) {
             $vacationRequests = VacationRequest::query()
                 ->states(VacationRequestStatesRetriever::waitingForUserActionStates($user))
                 ->latest("updated_at")
@@ -72,6 +72,9 @@ class DashboardController extends Controller
                 "pending" => $pending,
                 "other" => $other,
             ],
+            "can" => [
+                "listAllVacationRequests" => $user->can("listAll", VacationRequest::class),
+            ]
         ]);
     }
 }
diff --git a/app/Infrastructure/Http/Resources/UserResource.php b/app/Infrastructure/Http/Resources/UserResource.php
index 8d0263c..2428f7f 100644
--- a/app/Infrastructure/Http/Resources/UserResource.php
+++ b/app/Infrastructure/Http/Resources/UserResource.php
@@ -16,8 +16,7 @@ class UserResource extends JsonResource
             "id" => $this->id,
             "name" => $this->fullName,
             "email" => $this->email,
-            "displayRole" => $this->role->label(),
-            "role" => $this->role,
+            "role" => $this->role->label(),
             "position" => $this->position,
             "avatar" => $this->getAvatar(),
             "deleted" => $this->trashed(),
diff --git a/resources/js/Pages/Dashboard.vue b/resources/js/Pages/Dashboard.vue
index a42ff35..62e0745 100644
--- a/resources/js/Pages/Dashboard.vue
+++ b/resources/js/Pages/Dashboard.vue
@@ -21,7 +21,7 @@
                     {{ user.name }}
                   </p>
                   <p class="text-sm font-medium text-gray-600">
-                    {{ user.displayRole }}
+                    {{ user.role }}
                   </p>
                 </div>
               </div>
@@ -97,54 +97,7 @@
       </section>
     </div>
     <div class="grid grid-cols-1 gap-4">
-      <section v-if="user.role === 'employee'">
-        <div class="bg-white shadow-md">
-          <div class="p-4 sm:px-6">
-            <h2 class="text-lg leading-6 font-medium text-gray-900">
-              Twoje wnioski
-            </h2>
-          </div>
-          <div class="border-t border-gray-200 pb-5 px-4 sm:px-6">
-            <div class="flow-root mt-6">
-              <ul class="-my-5 divide-y divide-gray-200">
-                <li
-                  v-for="request in vacationRequests.data"
-                  :key="request.id"
-                  class="py-5"
-                >
-                  <div class="relative focus-within:ring-2 focus-within:ring-cyan-500">
-                    <h3 class="text-sm font-semibold text-blumilk-600 hover:text-blumilk-500">
-                      <InertiaLink
-                        :href="`/vacation-requests/${request.id}`"
-                        class="hover:underline focus:outline-none"
-                      >
-                        <span class="absolute inset-0" />
-                        Wniosek o {{ request.type.toLowerCase() }}
-                        [{{ request.name }}]
-                      </InertiaLink>
-                    </h3>
-                    <p class="mt-1 text-sm text-gray-600">
-                      {{ request.from }} - {{ request.to }}
-                    </p>
-                    <p class="mt-2 text-sm text-gray-600">
-                      <Status :status="request.state" />
-                    </p>
-                  </div>
-                </li>
-              </ul>
-            </div>
-            <div class="mt-6">
-              <InertiaLink
-                href="/vacation-requests/me"
-                class="w-full flex justify-center items-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
-              >
-                Zobacz wszystkie
-              </InertiaLink>
-            </div>
-          </div>
-        </div>
-      </section>
-      <section v-else>
+      <section v-if="can.listAllVacationRequests">
         <div class="bg-white shadow-md">
           <div class="p-4 sm:px-6">
             <h2 class="text-lg leading-6 font-medium text-gray-900">
@@ -191,6 +144,11 @@
                     </div>
                   </div>
                 </li>
+                <li v-if="! vacationRequests.data.length">
+                  <p class="py-2">
+                    Brak danych
+                  </p>
+                </li>
               </ul>
             </div>
             <div class="mt-6">
@@ -205,6 +163,58 @@
           </div>
         </div>
       </section>
+      <section v-else>
+        <div class="bg-white shadow-md">
+          <div class="p-4 sm:px-6">
+            <h2 class="text-lg leading-6 font-medium text-gray-900">
+              Twoje wnioski
+            </h2>
+          </div>
+          <div class="border-t border-gray-200 pb-5 px-4 sm:px-6">
+            <div class="flow-root mt-6">
+              <ul class="-my-5 divide-y divide-gray-200">
+                <li
+                  v-for="request in vacationRequests.data"
+                  :key="request.id"
+                  class="py-5"
+                >
+                  <div class="relative focus-within:ring-2 focus-within:ring-cyan-500">
+                    <h3 class="text-sm font-semibold text-blumilk-600 hover:text-blumilk-500">
+                      <InertiaLink
+                        :href="`/vacation-requests/${request.id}`"
+                        class="hover:underline focus:outline-none"
+                      >
+                        <span class="absolute inset-0" />
+                        Wniosek o {{ request.type.toLowerCase() }}
+                        [{{ request.name }}]
+                      </InertiaLink>
+                    </h3>
+                    <p class="mt-1 text-sm text-gray-600">
+                      {{ request.from }} - {{ request.to }}
+                    </p>
+                    <p class="mt-2 text-sm text-gray-600">
+                      <Status :status="request.state" />
+                    </p>
+                  </div>
+                </li>
+                <li v-if="! vacationRequests.data.length">
+                  <p class="py-2">
+                    Brak danych
+                  </p>
+                </li>
+              </ul>
+            </div>
+            <div class="mt-6">
+              <InertiaLink
+                href="/vacation-requests/me"
+                class="w-full flex justify-center items-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+              >
+                Zobacz wszystkie
+              </InertiaLink>
+            </div>
+          </div>
+        </div>
+      </section>
       <section>
         <div class="bg-white shadow-md">
           <div class="p-4 sm:px-6">
@@ -265,6 +275,11 @@
                     </p>
                   </div>
                 </li>
+                <li v-if="! holidays.data.length">
+                  <p class="py-2">
+                    Brak danych
+                  </p>
+                </li>
               </ul>
               <div>
                 <InertiaLink
@@ -304,6 +319,10 @@ export default {
       type: Object,
       default: null,
     },
+    can: {
+      type: Object,
+      default: null,
+    },
     stats: {
       type: Object,
       default: () => ({
diff --git a/resources/js/Pages/Users/Index.vue b/resources/js/Pages/Users/Index.vue
index 6ade8ed..7bb4bce 100644
--- a/resources/js/Pages/Users/Index.vue
+++ b/resources/js/Pages/Users/Index.vue
@@ -101,7 +101,7 @@
                 </div>
               </td>
               <td class="px-4 py-4 whitespace-nowrap text-sm text-gray-500">
-                {{ user.displayRole }}
+                {{ user.role }}
               </td>
               <td class="px-4 py-4 whitespace-nowrap text-sm text-gray-500">
                 {{ user.position }}