From e27a3397ebc747ad97ce4c42104f57ae3fdde353 Mon Sep 17 00:00:00 2001
From: Tony Partridge <admin@xtech.im>
Date: Mon, 1 Jul 2024 10:15:26 +0100
Subject: [PATCH 1/5] Ensure we have fields for rendering restore and table.

---
 resources/views/pages/list-activities.blade.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/resources/views/pages/list-activities.blade.php b/resources/views/pages/list-activities.blade.php
index 38b54a9..dacc0e6 100644
--- a/resources/views/pages/list-activities.blade.php
+++ b/resources/views/pages/list-activities.blade.php
@@ -4,6 +4,13 @@
 <x-filament-panels::page>
     <div class="space-y-6">
         @foreach($this->getActivities() as $activityItem)
+
+            @php
+                /* @var \Spatie\Activitylog\Models\Activity $activityItem */
+                $changes = $activityItem->getChangesAttribute();
+                $changesCount = $changes->count();
+            @endphp
+        
             <div @class([
                 'p-2 space-y-2 bg-white rounded-xl shadow',
                 'dark:border-gray-600 dark:bg-gray-800',
@@ -22,7 +29,7 @@
                             </div>
                         </div>
                         <div class="flex flex-col text-xs text-gray-500 justify-end">
-                            @if ($this->canRestoreActivity())
+                            @if ($this->canRestoreActivity() && $changesCount > 0)
                                 <x-filament::button
                                     tag="button"
                                     icon="heroicon-o-arrow-path-rounded-square"
@@ -38,6 +45,8 @@ class="right"
                     </div>
                 </div>
 
+                @if($changesCount > 0))
+                                    
                 <x-filament-tables::table class="w-full overflow-hidden text-sm">
                     <x-slot:header>
                         <x-filament-tables::header-cell>
@@ -80,6 +89,7 @@ class="right"
                             </x-filament-tables::row>
                         @endforeach
                 </x-filament-tables::table>
+                @endif
             </div>
         @endforeach
 

From 74192c3a71cc34126bd89325c7acadb6dc167c3f Mon Sep 17 00:00:00 2001
From: Tony Partridge <admin@xtech.im>
Date: Mon, 1 Jul 2024 10:21:30 +0100
Subject: [PATCH 2/5] Update list-activities.blade.php

---
 resources/views/pages/list-activities.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/pages/list-activities.blade.php b/resources/views/pages/list-activities.blade.php
index dacc0e6..df3d84e 100644
--- a/resources/views/pages/list-activities.blade.php
+++ b/resources/views/pages/list-activities.blade.php
@@ -45,7 +45,7 @@ class="right"
                     </div>
                 </div>
 
-                @if($changesCount > 0))
+                @if($changesCount > 0)
                                     
                 <x-filament-tables::table class="w-full overflow-hidden text-sm">
                     <x-slot:header>

From c5332dbfe3613a62ba8393ef96ce0a4444af0887 Mon Sep 17 00:00:00 2001
From: Dennis Koch <info@pixelarbeit.de>
Date: Mon, 1 Jul 2024 11:41:08 +0200
Subject: [PATCH 3/5] code-style and remove duplicate $changes

---
 .../views/pages/list-activities.blade.php     | 83 +++++++++----------
 1 file changed, 39 insertions(+), 44 deletions(-)

diff --git a/resources/views/pages/list-activities.blade.php b/resources/views/pages/list-activities.blade.php
index df3d84e..5841773 100644
--- a/resources/views/pages/list-activities.blade.php
+++ b/resources/views/pages/list-activities.blade.php
@@ -10,7 +10,7 @@
                 $changes = $activityItem->getChangesAttribute();
                 $changesCount = $changes->count();
             @endphp
-        
+
             <div @class([
                 'p-2 space-y-2 bg-white rounded-xl shadow',
                 'dark:border-gray-600 dark:bg-gray-800',
@@ -46,49 +46,44 @@ class="right"
                 </div>
 
                 @if($changesCount > 0)
-                                    
-                <x-filament-tables::table class="w-full overflow-hidden text-sm">
-                    <x-slot:header>
-                        <x-filament-tables::header-cell>
-                            @lang('filament-activity-log::activities.table.field')
-                        </x-filament-tables::header-cell>
-                        <x-filament-tables::header-cell>
-                            @lang('filament-activity-log::activities.table.old')
-                        </x-filament-tables::header-cell>
-                        <x-filament-tables::header-cell>
-                            @lang('filament-activity-log::activities.table.new')
-                        </x-filament-tables::header-cell>
-                    </x-slot:header>
-                        @php
-                            /* @var \Spatie\Activitylog\Models\Activity $activityItem */
-                            $changes = $activityItem->getChangesAttribute();
-                        @endphp
-                        @foreach(data_get($changes, 'attributes', []) as $field => $change)
-                            @php
-                                $oldValue = data_get($changes, "old.{$field}");
-                                $newValue = data_get($changes, "attributes.{$field}");
-                            @endphp
-                            <x-filament-tables::row @class(['bg-gray-100/30' => $loop->even])>
-                                <x-filament-tables::cell width="20%" class="px-4 py-2 align-top sm:first-of-type:ps-6 sm:last-of-type:pe-6">
-                                    {{ $this->getFieldLabel($field) }}
-                                </x-filament-tables::cell>
-                                <x-filament-tables::cell width="40%" class="px-4 py-2 align-top break-all whitespace-normal">
-                                    @if(is_array($oldValue))
-                                        <pre class="text-xs text-gray-500">{{ json_encode($oldValue, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) }}</pre>
-                                    @else
-                                        {{ $oldValue }}
-                                    @endif
-                                </x-filament-tables::cell>
-                                <x-filament-tables::cell width="40%" class="px-4 py-2 align-top break-all whitespace-normal">
-                                    @if(is_array($newValue))
-                                        <pre class="text-xs text-gray-500">{{ json_encode($newValue, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) }}</pre>
-                                    @else
-                                        {{ $newValue }}
-                                    @endif
-                                </x-filament-tables::cell>
-                            </x-filament-tables::row>
-                        @endforeach
-                </x-filament-tables::table>
+                    <x-filament-tables::table class="w-full overflow-hidden text-sm">
+                        <x-slot:header>
+                            <x-filament-tables::header-cell>
+                                @lang('filament-activity-log::activities.table.field')
+                            </x-filament-tables::header-cell>
+                            <x-filament-tables::header-cell>
+                                @lang('filament-activity-log::activities.table.old')
+                            </x-filament-tables::header-cell>
+                            <x-filament-tables::header-cell>
+                                @lang('filament-activity-log::activities.table.new')
+                            </x-filament-tables::header-cell>
+                        </x-slot:header>
+                            @foreach(data_get($changes, 'attributes', []) as $field => $change)
+                                @php
+                                    $oldValue = data_get($changes, "old.{$field}");
+                                    $newValue = data_get($changes, "attributes.{$field}");
+                                @endphp
+                                <x-filament-tables::row @class(['bg-gray-100/30' => $loop->even])>
+                                    <x-filament-tables::cell width="20%" class="px-4 py-2 align-top sm:first-of-type:ps-6 sm:last-of-type:pe-6">
+                                        {{ $this->getFieldLabel($field) }}
+                                    </x-filament-tables::cell>
+                                    <x-filament-tables::cell width="40%" class="px-4 py-2 align-top break-all whitespace-normal">
+                                        @if(is_array($oldValue))
+                                            <pre class="text-xs text-gray-500">{{ json_encode($oldValue, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) }}</pre>
+                                        @else
+                                            {{ $oldValue }}
+                                        @endif
+                                    </x-filament-tables::cell>
+                                    <x-filament-tables::cell width="40%" class="px-4 py-2 align-top break-all whitespace-normal">
+                                        @if(is_array($newValue))
+                                            <pre class="text-xs text-gray-500">{{ json_encode($newValue, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) }}</pre>
+                                        @else
+                                            {{ $newValue }}
+                                        @endif
+                                    </x-filament-tables::cell>
+                                </x-filament-tables::row>
+                            @endforeach
+                    </x-filament-tables::table>
                 @endif
             </div>
         @endforeach

From 92999e0c74d2e9ae3d4e1891bd7483563d894c1b Mon Sep 17 00:00:00 2001
From: Tony Partridge <admin@xtech.im>
Date: Mon, 1 Jul 2024 11:15:26 +0200
Subject: [PATCH 4/5] refactoring

---
 resources/views/pages/list-activities.blade.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/resources/views/pages/list-activities.blade.php b/resources/views/pages/list-activities.blade.php
index 5841773..25bde74 100644
--- a/resources/views/pages/list-activities.blade.php
+++ b/resources/views/pages/list-activities.blade.php
@@ -8,7 +8,6 @@
             @php
                 /* @var \Spatie\Activitylog\Models\Activity $activityItem */
                 $changes = $activityItem->getChangesAttribute();
-                $changesCount = $changes->count();
             @endphp
 
             <div @class([
@@ -29,7 +28,7 @@
                             </div>
                         </div>
                         <div class="flex flex-col text-xs text-gray-500 justify-end">
-                            @if ($this->canRestoreActivity() && $changesCount > 0)
+                            @if ($this->canRestoreActivity() && $changes->isNotEmpty())
                                 <x-filament::button
                                     tag="button"
                                     icon="heroicon-o-arrow-path-rounded-square"
@@ -37,7 +36,7 @@
                                     color="gray"
                                     class="right"
                                     wire:click="restoreActivity({{ Js::from($activityItem->getKey()) }})"
-                                >
+ q                               >
                                     @lang('filament-activity-log::activities.table.restore')
                                 </x-filament::button>
                             @endif
@@ -45,7 +44,7 @@ class="right"
                     </div>
                 </div>
 
-                @if($changesCount > 0)
+                @if ($changes->isNotEmpty())
                     <x-filament-tables::table class="w-full overflow-hidden text-sm">
                         <x-slot:header>
                             <x-filament-tables::header-cell>
@@ -58,7 +57,7 @@ class="right"
                                 @lang('filament-activity-log::activities.table.new')
                             </x-filament-tables::header-cell>
                         </x-slot:header>
-                            @foreach(data_get($changes, 'attributes', []) as $field => $change)
+                            @foreach (data_get($changes, 'attributes', []) as $field => $change)
                                 @php
                                     $oldValue = data_get($changes, "old.{$field}");
                                     $newValue = data_get($changes, "attributes.{$field}");

From 3e6a330002c785b28deeee56f15241d125440ed1 Mon Sep 17 00:00:00 2001
From: Dennis Koch <info@pixelarbeit.de>
Date: Mon, 1 Jul 2024 12:07:04 +0200
Subject: [PATCH 5/5] remove wild char

---
 resources/views/pages/list-activities.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/pages/list-activities.blade.php b/resources/views/pages/list-activities.blade.php
index 25bde74..6d3bc91 100644
--- a/resources/views/pages/list-activities.blade.php
+++ b/resources/views/pages/list-activities.blade.php
@@ -36,7 +36,7 @@
                                     color="gray"
                                     class="right"
                                     wire:click="restoreActivity({{ Js::from($activityItem->getKey()) }})"
- q                               >
+                                >
                                     @lang('filament-activity-log::activities.table.restore')
                                 </x-filament::button>
                             @endif