Merge pull request #75 from sald19/main

Fix lazy load on model causer when shouldBeStrict is enabled

src/Loggers/Loggers.php

@@ -2,6 +2,7 @@
 
 namespace Noxo\FilamentActivityLog\Loggers;
 
+use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Filesystem\Filesystem;
 use ReflectionClass;
 
@@ -15,7 +16,9 @@ class Loggers
     public static function getLoggerByModel(string $model, bool $force = false): ?string
     {
         foreach (self::$loggers as $logger) {
-            if ($logger::$model === $model && (! $logger::$disabled || $force)) {
+            $alias = Relation::getMorphAlias($logger::$model) ?? $logger::$model;
+
+            if ($alias === $model && (! $logger::$disabled || $force)) {
                 return $logger;
             }
         }

src/Pages/Concerns/HasListFilters.php

@@ -142,6 +142,7 @@ protected function getCauserField()
             ->allowHtml()
             ->options(function () {
                 $causers = Activity::query()
+                    ->with('causer')
                     ->groupBy('causer_id', 'causer_type')
                     ->get(['causer_id', 'causer_type'])
                     ->filter(fn ($activity) => $activity->causer instanceof Eloquent\Model)
@@ -170,7 +171,7 @@ protected function getSubjectTypeField()
             ->options(
                 array_column(
                     array_map(fn ($logger) => [
-                        'value' => $logger::$model,
+                        'value' => Eloquent\Relations\Relation::getMorphAlias($logger::$model) ?? $logger::$model,
                         'label' => $logger::getLabel(),
                     ], Loggers::$loggers),
                     'label',

src/Pages/ListActivities.php

@@ -63,7 +63,7 @@ public function getActivities()
         $activityModel = config('activitylog.activity_model') ?? Activity::class;
 
         return $this->paginateTableQuery(
-            $this->applyFilters($activityModel::latest())
+            $this->applyFilters($activityModel::with('causer')->latest())
         );
     }