-
- @foreach (array_keys($value[0]) as $key)
-
- {{ $key }}
-
- @endforeach
-
+ @php
+ $fields = $field->table->getFields();
+ $isHtmlAllowed = $field->isHtmlAllowed();
+ @endphp
+
+
+
+
+
+ @foreach ($fields as $field)
+
+ {{ $field->getLabel() }}
+
+ @endforeach
+
+
- @foreach ($value as $item)
- $loop->even])>
- @foreach ($item as $_value)
-
- {{ $_value }}
-
- @endforeach
-
- @endforeach
-
+ @foreach ($value as $item)
+ $loop->even])>
+ @foreach ($fields as $field)
+
+ @php
+ $rawValue = $item[$field->name] ?? data_get($item, $field->name);
+ $dispayValue = $field->display($rawValue);
+ @endphp
+
+ @if ($isHtmlAllowed)
+ {!! $dispayValue !!}
+ @else
+ {{ $dispayValue }}
+ @endif
+
+ @endforeach
+
+ @endforeach
+
+
@endif
diff --git a/resources/views/list/tables/default.blade.php b/resources/views/list/tables/default.blade.php
index 577a3b0..c51f466 100644
--- a/resources/views/list/tables/default.blade.php
+++ b/resources/views/list/tables/default.blade.php
@@ -1,12 +1,21 @@
-
+
-
+
@lang('filament-activity-log::activities.table.field')
-
+
@lang('filament-activity-log::activities.table.old')
-
+
@lang('filament-activity-log::activities.table.new')
@@ -22,10 +31,7 @@
@endphp
$loop->even])>
-
+
{{ $field->getLabel() }}
@@ -41,17 +47,11 @@ class="px-4 py-2 align-top break-all !whitespace-normal"
]) }}
@else
-
+
{{ $field->display($oldValue) }}
-
+
{{ $field->display($newValue) }}
@endif
diff --git a/resources/views/list/tables/simple.blade.php b/resources/views/list/tables/simple.blade.php
index c08f8e5..c052232 100644
--- a/resources/views/list/tables/simple.blade.php
+++ b/resources/views/list/tables/simple.blade.php
@@ -1,9 +1,15 @@
-
+
-
+
@lang('filament-activity-log::activities.table.field')
-
+
@lang('filament-activity-log::activities.table.value')
@@ -17,17 +23,11 @@
@endphp
$loop->even])>
-
+
{{ $field->getLabel() }}
-
+
{{ $field->display($value) }}
diff --git a/src/Loggers/Logger.php b/src/Loggers/Logger.php
index 117731f..5c8ba45 100644
--- a/src/Loggers/Logger.php
+++ b/src/Loggers/Logger.php
@@ -39,9 +39,10 @@ public function __construct(Model $newModel = null, Model $oldModel = null)
*/
public function through(Closure $callback): static
{
- $callback(clone $this->oldModel);
+ $callback(clone $this->newModel);
- $this->newModel = $this->oldModel->fresh();
+ $this->oldModel = clone $this->newModel;
+ $this->newModel->refresh();
return $this;
}
diff --git a/src/ResourceLogger/Concerns/Types/KeyValue.php b/src/ResourceLogger/Concerns/Types/KeyValue.php
index 618a161..42f5669 100644
--- a/src/ResourceLogger/Concerns/Types/KeyValue.php
+++ b/src/ResourceLogger/Concerns/Types/KeyValue.php
@@ -2,17 +2,33 @@
namespace Noxo\FilamentActivityLog\ResourceLogger\Concerns\Types;
+use Noxo\FilamentActivityLog\ResourceLogger\Types\KeyValueField;
+
trait KeyValue
{
+ public ?KeyValueField $keyValue = null;
public bool $keyValueDifferenceOnly = true;
- public function keyValue(bool $differenceOnly = true): static
- {
+ public function keyValue(
+ array $fields = [],
+ bool $differenceOnly = true,
+ ): static {
$this->type('key-value');
$this->view('key-value');
+ $this->formatStateUsing('array');
$this->keyValueDifferenceOnly = $differenceOnly;
- $this->formatStateUsing('array');
+ if (! empty($fields)) {
+ $this->keyValue = KeyValueField::make($fields);
+
+ $this->resolveStateUsing(function ($record) {
+ $fields = collect($this->keyValue->getFields());
+
+ return $fields->mapWithKeys(fn ($field) => [
+ $field->name => $field->getStorableValue($record),
+ ])->toArray();
+ });
+ }
return $this;
}
@@ -23,14 +39,33 @@ public function resolveKeyValueDifference(mixed $array1, mixed $array2): array
return [$array1, $array2];
}
- foreach ($array1 as $key1 => $row1) {
- foreach ($array2 as $key2 => $row2) {
- if ($row1 === $row2) {
- unset($array1[$key1], $array2[$key2]);
+ $diff1 = $this->arrayRecursiveDiff($array1, $array2);
+ $diff2 = $this->arrayRecursiveDiff($array2, $array1);
+
+ return [$diff1, $diff2];
+ }
+
+ private function arrayRecursiveDiff(array $aArray1, array $aArray2): array
+ {
+ $aReturn = [];
+
+ foreach ($aArray1 as $mKey => $mValue) {
+ if (array_key_exists($mKey, $aArray2)) {
+ if (is_array($mValue)) {
+ $aRecursiveDiff = $this->arrayRecursiveDiff($mValue, $aArray2[$mKey]);
+ if (count($aRecursiveDiff)) {
+ $aReturn[$mKey] = $aRecursiveDiff;
+ }
+ } else {
+ if ($mValue != $aArray2[$mKey]) {
+ $aReturn[$mKey] = $mValue;
+ }
}
+ } else {
+ $aReturn[$mKey] = $mValue;
}
}
- return [$array1, $array2];
+ return $aReturn;
}
}
diff --git a/src/ResourceLogger/Concerns/Types/Table.php b/src/ResourceLogger/Concerns/Types/Table.php
index 2b5a34a..e638328 100644
--- a/src/ResourceLogger/Concerns/Types/Table.php
+++ b/src/ResourceLogger/Concerns/Types/Table.php
@@ -2,17 +2,41 @@
namespace Noxo\FilamentActivityLog\ResourceLogger\Concerns\Types;
+use Closure;
+use Noxo\FilamentActivityLog\ResourceLogger\Types\TableField;
+
trait Table
{
+ public ?TableField $table;
+
public bool $tableDifferenceOnly = true;
- public function table(bool $differenceOnly = true): static
- {
+ public function table(
+ array $fields,
+ Closure $resolveRecords = null,
+ bool $differenceOnly = true,
+ ): static {
$this->type('table');
$this->view('table');
+ $this->table = TableField::make($fields);
$this->tableDifferenceOnly = $differenceOnly;
$this->formatStateUsing('array');
+ $this->resolveStateUsing(function ($record) use ($resolveRecords) {
+ $records = collect(
+ is_null($resolveRecords)
+ ? data_get($record, $this->name)
+ : $resolveRecords($record)
+ );
+
+ $fields = collect($this->table->getFields());
+
+ return $records->map(function ($record) use ($fields) {
+ return $fields->mapWithKeys(fn ($field) => [
+ $field->name => $field->getStorableValue($record),
+ ])->toArray();
+ })->toArray();
+ });
return $this;
}
diff --git a/src/ResourceLogger/Field.php b/src/ResourceLogger/Field.php
index 12becdd..3c56bf3 100644
--- a/src/ResourceLogger/Field.php
+++ b/src/ResourceLogger/Field.php
@@ -3,6 +3,8 @@
namespace Noxo\FilamentActivityLog\ResourceLogger;
use DragonCode\Support\Concerns\Makeable;
+use Filament\Forms\Components\Concerns\CanAllowHtml;
+use Filament\Support\Concerns\EvaluatesClosures;
class Field
{
@@ -25,6 +27,8 @@ class Field
use Concerns\Types\Relation;
use Concerns\Types\Table;
use Makeable;
+ use CanAllowHtml;
+ use EvaluatesClosures;
public function __construct(string $name, string $type = null)
{
diff --git a/src/ResourceLogger/Types/KeyValueField.php b/src/ResourceLogger/Types/KeyValueField.php
new file mode 100644
index 0000000..f55a4e7
--- /dev/null
+++ b/src/ResourceLogger/Types/KeyValueField.php
@@ -0,0 +1,17 @@
+fields($fields);
+ }
+}
diff --git a/src/ResourceLogger/Types/TableField.php b/src/ResourceLogger/Types/TableField.php
new file mode 100644
index 0000000..25b4c09
--- /dev/null
+++ b/src/ResourceLogger/Types/TableField.php
@@ -0,0 +1,17 @@
+fields($fields);
+ }
+}