Merge pull request #38 from rmsramos/develop

Develop

Author: rmsramos

README.md

@@ -321,13 +321,13 @@ public static function getRelations(): array
 To make viewing activity logs easier, you can use a custom action. In your UserResource in the table function, add the `ActivityLogTimelineAction`.
 
 ```php
-use Rmsramos\Activitylog\Actions\ActivityLogTimelineAction;
+use Rmsramos\Activitylog\Actions\ActivityLogTimelineTableAction;
 
 public static function table(Table $table): Table
 {
     return $table
         ->actions([
-            ActivityLogTimelineAction::make('Activities'),
+            ActivityLogTimelineTableAction::make('Activities'),
         ]);
 }
 ```
@@ -348,13 +348,13 @@ public static function table(Table $table): Table
 You can configure the icons and colors, by default the `'heroicon-m-check'` icon and the `'primary'` color are used.
 
 ```php
-use Rmsramos\Activitylog\Actions\ActivityLogTimelineAction;
+use Rmsramos\Activitylog\Actions\ActivityLogTimelineTableAction;
 
 public static function table(Table $table): Table
 {
     return $table
         ->actions([
-            ActivityLogTimelineAction::make('Activities')
+            ActivityLogTimelineTableAction::make('Activities')
                 ->timelineIcons([
                     'created' => 'heroicon-m-check-badge',
                     'updated' => 'heroicon-m-pencil-square',
@@ -370,13 +370,13 @@ public static function table(Table $table): Table
 You can limit the number of results in the query by passing a limit, by default the last 10 records are returned.
 
 ```php
-use Rmsramos\Activitylog\Actions\ActivityLogTimelineAction;
+use Rmsramos\Activitylog\Actions\ActivityLogTimelineTableAction;
 
 public static function table(Table $table): Table
 {
     return $table
         ->actions([
-            ActivityLogTimelineAction::make('Activities')
+            ActivityLogTimelineTableAction::make('Activities')
                 ->limit(30),
         ]);
 }
@@ -385,13 +385,13 @@ public static function table(Table $table): Table
 ## Full Timeline configuration
 
 ```php
-use Rmsramos\Activitylog\Actions\ActivityLogTimelineAction;
+use Rmsramos\Activitylog\Actions\ActivityLogTimelineTableAction;
 
 public static function table(Table $table): Table
 {
     return $table
         ->actions([
-            ActivityLogTimelineAction::make('Activities')
+            ActivityLogTimelineTableAction::make('Activities')
                 ->withRelations(['profile', 'address'])
                 ->timelineIcons([
                     'created' => 'heroicon-m-check-badge',

resources/lang/ar/forms.php

@@ -2,31 +2,31 @@
 
 return [
     'fields' => [
-        'log_name'     => [
+        'log_name' => [
             'label' => 'النوع',
         ],
-        'event'        => [
+        'event' => [
             'label' => 'الحدث',
         ],
         'subject_type' => [
             'label' => 'الموضوع',
         ],
-        'causer'       => [
+        'causer' => [
             'label' => 'المستخدم',
         ],
-        'description'  => [
+        'description' => [
             'label' => 'الوصف',
         ],
-        'properties'   => [
+        'properties' => [
             'label' => 'الخصائص',
         ],
-        'created_at'   => [
+        'created_at' => [
             'label' => 'تاريخ التسجيل',
         ],
-        'old'          => [
+        'old' => [
             'label' => 'القديم',
         ],
-        'attributes'   => [
+        'attributes' => [
             'label' => 'الجديد',
         ],
     ],

resources/lang/ar/tables.php

@@ -2,22 +2,22 @@
 
 return [
     'columns' => [
-        'log_name'     => [
+        'log_name' => [
             'label' => 'النوع',
         ],
-        'event'        => [
+        'event' => [
             'label' => 'الحدث',
         ],
         'subject_type' => [
             'label' => 'الموضوع',
         ],
-        'causer'       => [
+        'causer' => [
             'label' => 'المستخدم',
         ],
-        'properties'   => [
+        'properties' => [
             'label' => 'الخصائص',
         ],
-        'created_at'   => [
+        'created_at' => [
             'label' => 'تاريخ التسجيل',
         ],
     ],
@@ -27,7 +27,7 @@
             'created_from'  => 'تاريخ الإنشاء من',
             'created_until' => 'تاريخ الإنشاء حتى',
         ],
-        'event'      => [
+        'event' => [
             'label' => 'الحدث',
         ],
     ],

src/Actions/ActivityLogTimelineSimpleAction.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Rmsramos\Activitylog\Actions;
+
+use Filament\Tables\Actions\Action;
+use Rmsramos\Activitylog\Actions\Concerns\ActionContent;
+
+class ActivityLogTimelineSimpleAction extends Action
+{
+    use ActionContent;
+}

src/Actions/ActivityLogTimelineTableAction.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Rmsramos\Activitylog\Actions;
+
+use Filament\Tables\Actions\Action;
+use Rmsramos\Activitylog\Actions\Concerns\ActionContent;
+
+class ActivityLogTimelineTableAction extends Action
+{
+    use ActionContent;
+}

src/Actions/ActivityLogTimelineAction.php renamed to src/Actions/Concerns/ActionContent.php

@@ -1,12 +1,11 @@
 <?php
 
-namespace Rmsramos\Activitylog\Actions;
+namespace Rmsramos\Activitylog\Actions\Concerns;
 
 use Closure;
 use Filament\Actions\StaticAction;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Infolists\Infolist;
-use Filament\Tables\Actions\Action;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
@@ -16,7 +15,7 @@
 use Rmsramos\Activitylog\Infolists\Components\TimeLineTitleEntry;
 use Spatie\Activitylog\Models\Activity;
 
-class ActivityLogTimelineAction extends Action
+trait ActionContent
 {
     private ?array $withRelations = null;
 
@@ -63,7 +62,7 @@ protected function setUp(): void
                         foreach ($relations as $relation) {
                             $model = get_class($record->{$relation}()->getRelated());
                             $query->orWhere(function (Builder $q) use ($record, $model, $relation) {
-                                $q->where('subject_type', (new $model())->getMorphClass())
+                                $q->where('subject_type', (new $model)->getMorphClass())
                                     ->whereIn('subject_id', $record->{$relation}()->pluck('id'));
                             });
                         }
@@ -257,4 +256,5 @@ protected function formatActivityData($activity): array
             'update'      => $activity->updated_at,
         ];
     }
+
 }