Merge pull request #37 from alexjustesen/simplified-resource-table

Simplified resource table
alexjustesen · Jan 11, 2023 · 6d75f41 · 6d75f41
2 parents 90c6557 + 0377b0d
commit 6d75f41
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 59 deletions.
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -20,7 +20,7 @@ jobs:
           coverage: none
 
       - name: Install composer dependencies
-        uses: ramsey/composer-install@v1
+        uses: ramsey/composer-install@v2
 
       - name: Run PHPStan
         run: ./vendor/bin/phpstan --error-format=github
diff --git a/composer.json b/composer.json
@@ -51,6 +51,10 @@
         "test-coverage": "vendor/bin/pest coverage"
     },
     "config": {
+        "allow-plugins": {
+            "pestphp/pest-plugin": true,
+            "phpstan/extension-installer": true
+        },
         "sort-packages": true
     },
     "extra": {

diff --git a/resources/lang/de/activity.php b/resources/lang/de/activity.php
@@ -8,9 +8,11 @@
     'description'  => 'Beschreibung',
     'attributes'   => 'Neue Werte',
     'old'          => 'Alte Werte',
-    'subject'      => "Subjekt",
-    'logged_at'    => "Änderungszeit",
-    'has_subject'  => "besitzt Subjekt",
+    'subject'      => 'Subjekt',
+    'logged_at'    => 'Änderungszeit',
+    'log'          => 'Log',
+    'plural_log'   => 'Logs',
+    'has_subject'  => 'besitzt Subjekt',
     'label'        => 'Aktivität',
     'plural_label' => 'Aktivitäten',
 ];
diff --git a/resources/lang/en/activity.php b/resources/lang/en/activity.php
@@ -8,9 +8,11 @@
     'description'  => 'Description',
     'attributes'   => 'Attributes',
     'old'          => 'Old',
-    'subject'      => "Subject",
-    'logged_at'    => "Logged at",
-    'has_subject'  => "Has Subject",
+    'subject'      => 'Subject',
+    'logged_at'    => 'Logged at',
+    'log'          => 'Log',
+    'plural_log'   => 'Logs',
+    'has_subject'  => 'Has Subject',
     'label'        => 'Activity',
-    'plural_label' => 'Activity'
+    'plural_label' => 'Activity',
 ];
diff --git a/resources/lang/es/activity.php b/resources/lang/es/activity.php
@@ -10,6 +10,8 @@
     'old'          => 'Valor(es) anterior(es)',
     'subject'      => 'Asunto',
     'logged_at'    => 'Registrado el',
+    'log'          => 'Log',
+    'plural_log'   => 'Logs',
     'has_subject'  => 'Tiene objeto sometido',
     'label'        => 'Actividad',
     'plural_label' => 'Registros de actividad'

diff --git a/src/RelationManagers/ActivitiesRelationManager.php b/src/RelationManagers/ActivitiesRelationManager.php
@@ -3,11 +3,9 @@
 namespace AlexJustesen\FilamentSpatieLaravelActivitylog\RelationManagers;
 
 use AlexJustesen\FilamentSpatieLaravelActivitylog\Resources\ActivityResource;
-use Filament\Facades\Filament;
 use Filament\Resources\Form;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Resources\Table;
-use Filament\Tables;
 use Illuminate\Database\Eloquent\Model;
 
 class ActivitiesRelationManager extends RelationManager

diff --git a/src/Resources/ActivityResource.php b/src/Resources/ActivityResource.php
@@ -2,18 +2,14 @@
 
 namespace AlexJustesen\FilamentSpatieLaravelActivitylog\Resources;
 
-use AlexJustesen\FilamentSpatieLaravelActivitylog\Contracts\IsActivitySubject;
-use AlexJustesen\FilamentSpatieLaravelActivitylog\RelationManagers\ActivitiesRelationManager;
-use AlexJustesen\FilamentSpatieLaravelActivitylog\ResourceFinder;
 use AlexJustesen\FilamentSpatieLaravelActivitylog\Resources\ActivityResource\Pages;
+use Carbon\Carbon;
 use Filament\Forms;
 use Filament\Resources\Form;
 use Filament\Resources\Resource;
 use Filament\Resources\Table;
 use Filament\Tables;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\HtmlString;
-use Livewire\Component;
 use Spatie\Activitylog\Models\Activity;
 
 class ActivityResource extends Resource
@@ -40,39 +36,39 @@ public static function form(Form $form): Form
                     ->label(__('filament-spatie-activitylog::activity.causer_type'))
                     ->columnSpan([
                         'default' => 2,
-                        'sm' => 1
+                        'sm' => 1,
                     ]),
                 Forms\Components\TextInput::make('causer_id')
                     ->label(__('filament-spatie-activitylog::activity.causer_id'))
                     ->columnSpan([
                         'default' => 2,
-                        'sm' => 1
+                        'sm' => 1,
                     ]),
                 Forms\Components\TextInput::make('subject_type')
                     ->label(__('filament-spatie-activitylog::activity.subject_type'))
                     ->columnSpan([
                         'default' => 2,
-                        'sm' => 1
+                        'sm' => 1,
                     ]),
                 Forms\Components\TextInput::make('subject_id')
                     ->label(__('filament-spatie-activitylog::activity.subject_id'))
                     ->columnSpan([
                         'default' => 2,
-                        'sm' => 1
+                        'sm' => 1,
                     ]),
                 Forms\Components\TextInput::make('description')
                     ->label(__('filament-spatie-activitylog::activity.description'))->columnSpan(2),
                 Forms\Components\KeyValue::make('properties.attributes')
                     ->label(__('filament-spatie-activitylog::activity.attributes'))
                     ->columnSpan([
                         'default' => 2,
-                        'sm' => 1
+                        'sm' => 1,
                     ]),
                 Forms\Components\KeyValue::make('properties.old')
                     ->label(__('filament-spatie-activitylog::activity.old'))
                     ->columnSpan([
                         'default' => 2,
-                        'sm' => 1
+                        'sm' => 1,
                     ]),
             ]);
     }
@@ -84,55 +80,60 @@ public static function table(Table $table): Table
                 Tables\Columns\TextColumn::make('id')
                     ->label('ID')
                     ->sortable(),
+                Tables\Columns\TextColumn::make('subject_type')
+                    ->label(__('filament-spatie-activitylog::activity.subject'))
+                    ->searchable(),
                 Tables\Columns\TextColumn::make('description')
                     ->label(__('filament-spatie-activitylog::activity.description'))
                     ->searchable(),
-                Tables\Columns\TextColumn::make('subject.name')
-                    ->label(__('filament-spatie-activitylog::activity.subject'))
-                    ->hidden(function (Component $livewire) {
-                        return method_exists($livewire, 'hideSubjectColumn')
-                            ? call_user_func([$livewire, 'hideSubjectColumn'])
-                            : $livewire instanceof ActivitiesRelationManager;
-                    })
-                    ->getStateUsing(function (Activity $record) {
-                        if (! $record->subject || ! $record->subject instanceof IsActivitySubject) {
-                            return new HtmlString('&mdash;');
-                        }
-
-                        /** @var \AlexJustesen\FilamentSpatieLaravelActivitylog\Contracts\IsActivitySubject */
-                        $subject = $record->subject;
-
-                        return $subject->getActivitySubjectDescription($record);
+                Tables\Columns\TextColumn::make('log_name')
+                    ->label(__('filament-spatie-activitylog::activity.log')),
+                Tables\Columns\TextColumn::make('created_at')
+                    ->label(__('filament-spatie-activitylog::activity.logged_at'))
+                    ->dateTime(),
+            ])
+            ->filters([
+                Tables\Filters\SelectFilter::make('event')
+                    ->multiple()
+                    ->options([
+                        'created' => 'Created',
+                        'updated' => 'Updated',
+                        'deleted' => 'Deleted',
+                    ]),
+                Tables\Filters\Filter::make('created_at')
+                    ->form([
+                        Forms\Components\DatePicker::make('logged_from')
+                            ->label('Logged from'),
+                        Forms\Components\DatePicker::make('logged_until')
+                            ->label('Logged until'),
+                    ])
+                    ->query(function (Builder $query, array $data): Builder {
+                        return $query
+                            ->when(
+                                $data['logged_from'],
+                                fn (Builder $query, $date): Builder => $query->whereDate('created_at', '>=', $date),
+                            )
+                            ->when(
+                                $data['logged_until'],
+                                fn (Builder $query, $date): Builder => $query->whereDate('created_at', '<=', $date),
+                            );
                     })
-                    ->url(function (Activity $record) {
-                        if (! $record->subject || ! $record->subject instanceof IsActivitySubject) {
-                            return;
-                        }
+                    ->indicateUsing(function (array $data): array {
+                        $indicators = [];
 
-                        /** @var class-string<\Filament\Resources\Resource> */
-                        $resource = ResourceFinder::find($record->subject::class);
-
-                        if (! $resource) {
-                            return;
+                        if ($data['from'] ?? null) {
+                            $indicators['from'] = 'Created from ' . Carbon::parse($data['from'])->toFormattedDateString();
                         }
 
-                        if (! $resource::hasPage('edit')) {
-                            return;
+                        if ($data['until'] ?? null) {
+                            $indicators['until'] = 'Created until ' . Carbon::parse($data['until'])->toFormattedDateString();
                         }
 
-                        return $resource::getUrl('edit', ['record' => $record->subject]) ?? null;
-                    }, shouldOpenInNewTab: true),
-                Tables\Columns\TextColumn::make('created_at')
-                    ->label(__('filament-spatie-activitylog::activity.logged_at'))
-                    ->dateTime()
-                    ->sortable(),
-            ])
-            ->filters([
-                Tables\Filters\Filter::make('has_subject') ->label(__('filament-spatie-activitylog::activity.has_subject'))
-                    ->query(fn (Builder $query) => $query->has('subject')),
+                        return $indicators;
+                    }),
             ])
             ->bulkActions([])
-            ->defaultSort('created_at', 'DESC');
+            ->defaultSort('id', 'DESC');
     }
 
     protected static function getNavigationGroup(): ?string

diff --git a/src/Resources/ActivityResource/Pages/ListActivities.php b/src/Resources/ActivityResource/Pages/ListActivities.php
@@ -8,6 +8,7 @@
 class ListActivities extends ListRecords
 {
     protected static string $resource = ActivityResource::class;
+
     protected function getTableRecordsPerPageSelectOptions(): array
     {
         return config('filament-spatie-laravel-activitylog.paginate') ?? parent::getTableRecordsPerPageSelectOptions();