fix: log deleted event

fzldn · Sep 20, 2024 · 10a24ab · 10a24ab
1 parent e160237
commit 10a24ab
Showing 1 changed file with 39 additions and 47 deletions.
diff --git a/resources/views/filament/tables/columns/activity-properties.blade.php b/resources/views/filament/tables/columns/activity-properties.blade.php
@@ -1,6 +1,7 @@
 @php
+    $hasNewValues = (bool) data_get($getState(), 'attributes');
     $hasOldValues = (bool) data_get($getState(), 'old');
-    $showValue = fn($value) => $value === null ? str('<span class="text-gray-500">null</span>')->toHtmlString() : $value;
+    $showValue = fn($value) => $value === null ? str('null')->wrapHtmlTag('span', ['class' => 'text-gray-500'])->toHtmlString() : $value;
 @endphp
 
 <div class="w-full rounded-lg bg-white shadow-sm ring-1 ring-gray-950/5 dark:bg-white/5 dark:ring-white/10 hidden md:block">
@@ -11,46 +12,44 @@ class="w-full table-auto divide-y divide-gray-200 dark:divide-white/5"
             <tr>
                 <th
                     scope="col"
-                    class="px-3 py-2 text-start text-sm font-medium text-gray-700 dark:text-gray-200"
+                    class="w-1/5 px-3 py-2 text-start text-sm font-medium text-gray-700 dark:text-gray-200"
                 >
-                    Attribute
+                    {{ __('Attribute') }}
                 </th>
 
-                <th
-                    scope="col"
-                    class="px-3 py-2 text-start text-sm font-medium text-gray-700 dark:text-gray-200"
-                >
-                    New Value
-                </th>
-
-                @if ($hasOldValues)
+                @foreach (collect($getState() ?? [])->sort() as $type => $value)
                     <th
                         scope="col"
-                        class="px-3 py-2 text-start text-sm font-medium text-gray-700 dark:text-gray-200"
+                        class="w-2/5 px-3 py-2 text-start text-sm font-medium text-gray-700 dark:text-gray-200"
                     >
-                        Old Value
+                        {{ match ($type) {
+                            'attributes' => __('New Value'),
+                            'old' => __('Old Value'),
+                        } }}
                     </th>
-                @endif
+                @endforeach
             </tr>
         </thead>
 
         <tbody
             class="divide-y divide-gray-200 font-mono text-xs dark:divide-white/5 md:text-sm sm:leading-6"
         >
-            @forelse (data_get($getState(), 'attributes', []) as $key => $value)
+            @forelse (data_get($getState(), 'attributes', data_get($getState(), 'old', [])) as $key => $value)
                 <tr
                     class="divide-x divide-gray-200 dark:divide-white/5 rtl:divide-x-reverse"
                 >
-                    <td class="w-1/5 px-3 py-1.5">
+                    <td class="px-3 py-1.5">
                         {{ $key }}
                     </td>
 
-                    <td class="w-2/5 px-3 py-1.5">
-                        {{ $showValue($value) }}
-                    </td>
+                    @if ($hasNewValues)
+                        <td class="px-3 py-1.5">
+                            {{ $showValue(data_get($getState(), "attributes.{$key}")) }}
+                        </td>
+                    @endif
 
                     @if ($hasOldValues)
-                        <td class="w-2/5 px-3 py-1.5">
+                        <td class="px-3 py-1.5">
                             {{ $showValue(data_get($getState(), "old.{$key}")) }}
                         </td>
                     @endif
@@ -69,34 +68,27 @@ class="px-3 py-2 text-center font-sans text-sm text-gray-400 dark:text-gray-500"
     </table>
 </div>
 
-<div class="w-full text-sm block md:hidden">
-    <div class="mb-3"><strong>New Value</strong></div>
-    <div class="bg-white border-t border-t-gray-950/5 dark:bg-white/5 dark:ring-white/10 p-4 flex flex-col gap-y-3 -mx-[calc(1rem-1px)] {{ $hasOldValues ? 'mb-4' : 'rounded-b-lg -mb-[calc(1rem-1px)]' }}">
-        @forelse (data_get($getState(), 'attributes', []) as $key => $value)
-            <div class="flex flex-col gap-y-2 text-xs">
-                <strong>{{ $key }}</strong>
-                <span>{{ $showValue($value) }}</span>
-            </div>
-        @empty
-            <div>
-                {{ $getPlaceholder() }}
-            </div>
-        @endforelse
-    </div>
-
-    @if ($hasOldValues)
-        <div class="mb-3"><strong>Old Value</strong></div>
-        <div class="rounded-b-lg bg-white border-t border-t-gray-950/5 dark:bg-white/5 dark:ring-white/10 p-4 flex flex-col gap-y-3 -mx-[calc(1rem-1px)] -mb-[calc(1rem-1px)]">
-            @forelse (data_get($getState(), 'old', []) as $key => $value)
-            <div class="flex flex-col gap-y-2 text-xs">
-                <strong>{{ $key }}</strong>
-                <span>{{ $showValue($value) }}</span>
+<div class="w-full text-sm md:hidden flex flex-col gap-y-4 -mb-4">
+    @foreach (collect($getState() ?? [])->sort() as $type => $value)
+        <div>
+            <div class="mb-3">
+                <strong>{{ match ($type) {
+                    'attributes' => __('New Value'),
+                    'old' => __('Old Value'),
+                } }}</strong>
             </div>
-            @empty
-            <div>
-                {{ $getPlaceholder() }}
+            <div class="bg-white border-t border-t-gray-950/5 dark:bg-white/5 dark:ring-white/10 p-4 flex flex-col gap-y-3 -mx-[calc(1rem-1px)]">
+                @forelse (data_get($getState(), $type, []) as $key => $value)
+                    <div class="flex flex-col gap-y-2 text-xs">
+                        <strong>{{ $key }}</strong>
+                        <span>{{ $showValue($value) }}</span>
+                    </div>
+                @empty
+                    <div>
+                        {{ $getPlaceholder() }}
+                    </div>
+                @endforelse
             </div>
-            @endforelse
         </div>
-    @endif
+    @endforeach
 </div>