Merge pull request #47 from Orphail/bugfix/formats-dates-to-datetime-format

Fixes dates format for issue #46

Author: rmsramos

src/Actions/Concerns/ActionContent.php

@@ -2,6 +2,8 @@
 
 namespace Rmsramos\Activitylog\Actions\Concerns;
 
+use Carbon\Carbon;
+use Carbon\Exceptions\InvalidFormatException;
 use Closure;
 use Filament\Actions\StaticAction;
 use Filament\Infolists\Components\TextEntry;
@@ -251,10 +253,26 @@ protected function formatActivityData($activity): array
             'subject'     => $activity->subject,
             'event'       => $activity->event,
             'causer'      => $activity->causer,
-            'properties'  => json_decode($activity->properties, true),
+            'properties'  => $this->formatDateValues(json_decode($activity->properties, true)),
             'batch_uuid'  => $activity->batch_uuid,
             'update'      => $activity->updated_at,
         ];
     }
 
+    private static function formatDateValues(array|string $value): array|string
+    {
+        if (is_array($value)) {
+            foreach ($value as &$item) {
+                $item = self::formatDateValues($item);
+            }
+            return $value;
+        }
+
+        try {
+            return Carbon::parse($value)
+                ->format(config('filament-activitylog.datetime_format', 'd/m/Y H:i:s'));
+        } catch (InvalidFormatException $e) {
+            return $value;
+        }
+    }
 }

src/Resources/ActivitylogResource.php

@@ -2,6 +2,8 @@
 
 namespace Rmsramos\Activitylog\Resources;
 
+use Carbon\Exceptions\InvalidFormatException;
+use Filament\Facades\Filament;
 use Filament\Forms\Components\DatePicker;
 use Filament\Forms\Components\KeyValue;
 use Filament\Forms\Components\Placeholder;
@@ -139,13 +141,13 @@ public static function form(Form $form): Form
 
                         if ($old = $record->properties->get('old')) {
                             $schema[] = KeyValue::make('old')
-                                ->afterStateHydrated(fn (KeyValue $component) => $component->state($old))
+                                ->formatStateUsing(fn () => self::formatDateValues($old))
                                 ->label(__('activitylog::forms.fields.old.label'));
                         }
 
                         if ($attributes = $record->properties->get('attributes')) {
                             $schema[] = KeyValue::make('attributes')
-                                ->afterStateHydrated(fn (KeyValue $component) => $component->state($attributes))
+                                ->formatStateUsing(fn () => self::formatDateValues($attributes))
                                 ->label(__('activitylog::forms.fields.attributes.label'));
                         }
 
@@ -304,4 +306,21 @@ public static function canAccess(): bool
             return ActivitylogPlugin::get()->isAuthorized();
         }
     }
+
+    private static function formatDateValues(array|string $value): array|string
+    {
+        if (is_array($value)) {
+            foreach ($value as &$item) {
+                $item = self::formatDateValues($item);
+            }
+            return $value;
+        }
+
+        try {
+            return Carbon::parse($value)
+                ->format(config('filament-activitylog.datetime_format', 'd/m/Y H:i:s'));
+        } catch (InvalidFormatException $e) {
+            return $value;
+        }
+    }
 }