Update ActivityResource.php (#33)

Z3d0X · Dec 22, 2022 · 20df88b · 20df88b
1 parent f854f14
commit 20df88b
Showing 1 changed file with 25 additions and 12 deletions.
diff --git a/src/Resources/ActivityResource.php b/src/Resources/ActivityResource.php
@@ -84,21 +84,34 @@ public static function form(Form $form): Form
                             }),
                     ])
                 ]),
-                Card::make([
-   					KeyValue::make('properties')
-						->visible(fn ($livewire) => !isset($livewire->data['properties']['attributes']))
-						->label(__('filament-logger::filament-logger.resource.label.properties'))
-                        ->columnSpan('full'),
+                Card::make()
+                    ->columns()
+                    ->visible(fn ($record) => $record->properties?->count() > 0)
+                    ->schema(function (?Activity $record) {
+                        $properties = $record->properties->except(['attributes', 'old']);
+
+                        $schema = [];
+
+                        if ($properties->count()) {
+                            $schema[] = KeyValue::make('properties')
+                                ->label(__('filament-logger::filament-logger.resource.label.properties'))
+                                ->columnSpan('full');
+                        }
 
-					KeyValue::make('properties.old')
-						->visible(fn ($livewire) => isset($livewire->data['properties']['old']))
-						->label(__('filament-logger::filament-logger.resource.label.old')),
+                        if ($old = $record->properties->get('old')) {
+                            $schema[] = KeyValue::make('old')
+                                ->afterStateHydrated(fn (KeyValue $component) => $component->state($old))
+                                ->label(__('filament-logger::filament-logger.resource.label.old'));
+                        }
 
-					KeyValue::make('properties.attributes')
-						->visible(fn ($livewire) => isset($livewire->data['properties']['attributes']))
-						->label(__('filament-logger::filament-logger.resource.label.new')),
+                        if ($attributes = $record->properties->get('attributes')) {
+                            $schema[] = KeyValue::make('attributes')
+                                ->afterStateHydrated(fn (KeyValue $component) => $component->state($attributes))
+                                ->label(__('filament-logger::filament-logger.resource.label.new'));
+                        }
 
-                ])->columns(2)->visible(fn ($record) => $record->properties?->count() > 0)
+                        return $schema;
+                    }),
             ])
             ->columns(['sm' => 4, 'lg' => null]);
     }