Merge pull request #21 from thyseus/patch-1

Proper display of Model Attributes diff

Author: Z3d0X

resources/lang/de/filament-logger.php

@@ -0,0 +1,25 @@
+<?php
+
+return [
+	/*
+	|--------------------------------------------------------------------------
+	| Navigation & Resource
+	|--------------------------------------------------------------------------
+	*/
+
+	'nav.group' => 'Settings',
+	'nav.log.label' => 'Activity Log',
+	'nav.log.icon' => 'heroicon-o-clipboard-list',
+	'resource.label.log' => 'Aktivitätslog',
+	'resource.label.logs' => 'Aktivitätslog',
+	'resource.label.user' => 'Nutzer',
+	'resource.label.subject' => 'Thema',
+	'resource.label.subject_type' => 'Thematyp',
+	'resource.label.description' => 'Beschreibung',
+	'resource.label.type' => 'Typ',
+	'resource.label.event' => 'Event',
+	'resource.label.logged_at' => 'Protokolliert am',
+	'resource.label.properties' => 'Eigenschaften',
+	'resource.label.old' => 'Alt',
+	'resource.label.new' => 'Neu',
+];

resources/lang/en/filament-logger.php

@@ -20,6 +20,7 @@
     'resource.label.type' => 'Type',
     'resource.label.event' => 'Event',
     'resource.label.logged_at' => 'Logged At',
-    'resource.label.properties' => 'Properties',    
-
+    'resource.label.properties' => 'Properties',
+    'resource.label.old' => 'Old',
+    'resource.label.new' => 'New',
 ];

src/Resources/ActivityResource.php

@@ -85,10 +85,20 @@ public static function form(Form $form): Form
                     ])
                 ]),
                 Card::make([
-                    KeyValue::make('properties')
-                        ->label(__('filament-logger::filament-logger.resource.label.properties')),
-                ])
-                ->visible(fn ($record) => $record->properties?->count() > 0)
+   					KeyValue::make('properties')
+						->visible(fn ($livewire) => !isset($livewire->data['properties']['attributes']))
+						->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')),
+
+					KeyValue::make('properties.attributes')
+						->visible(fn ($livewire) => isset($livewire->data['properties']['attributes']))
+						->label(__('filament-logger::filament-logger.resource.label.new')),
+
+                ])->columns(2)->visible(fn ($record) => $record->properties?->count() > 0)
             ])
             ->columns(['sm' => 4, 'lg' => null]);
     }
@@ -140,7 +150,44 @@ public static function table(Table $table): Table
                 SelectFilter::make('subject_type')
                     ->label(__('filament-logger::filament-logger.resource.label.subject_type'))
                     ->options(static::getSubjectTypeList()),
+                				Filter::make('properties->old')
+					->label('Old Value')
+					->indicateUsing(function (array $data): ?string {
+						if (!$data['old']) {
+							return null;
+						}
+
+						return 'Old Attribute or Value: ' . $data['old'];
+					})
+					->form([
+						TextInput::make('old')->hint('Can be key or value'),
+					])
+					->query(function (Builder $query, array $data): Builder {
+						if (!$data['old']) {
+							return $query;
+						}
+
+						return $query->where('properties->old', 'like', "%{$data['old']}%");
+					}),
+				Filter::make('properties->attributes')
+					->label('New Value')
+					->indicateUsing(function (array $data): ?string {
+						if (!$data['new']) {
+							return null;
+						}
+
+						return 'New Attribute or Value: ' . $data['new'];
+					})
+					->form([
+						TextInput::make('new')->hint('Can be key or value'),
+					])
+					->query(function (Builder $query, array $data): Builder {
+						if (!$data['new']) {
+							return $query;
+						}
 
+						return $query->where('properties->attributes', 'like', "%{$data['new']}%");
+					}),
                 Filter::make('created_at')
                     ->form([
                         DatePicker::make('logged_at')