Merge pull request #39 from rafaucau/fix/soft-deleted-models

fix: Support soft-deleted subjects in `ActivityLogLivewire`

Author: AsmitNepali

src/Filament/Livewire/ActivityLogLivewire.php

@@ -6,6 +6,7 @@
 
 use Carbon\CarbonImmutable;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletingScope;
 use Illuminate\View\View;
 use Livewire\Attributes\Url;
 use Livewire\Component;
@@ -94,7 +95,12 @@ private function resolveSubject(): Model
         /** @var class-string<Model> $class */
         $class = $this->subjectClass;
 
-        return $class::query()->findOrFail($this->subjectKey);
+        return $class::query()
+            ->when(
+                config('activitylog.include_soft_deleted_subjects'),
+                fn ($query) => $query->withoutGlobalScope(SoftDeletingScope::class)
+            )
+            ->findOrFail($this->subjectKey);
     }
 
     private function builderFor(Model $subject): TimelineBuilder

tests/Feature/SoftDeletedSubjectResolutionTest.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+use Relaticle\ActivityLog\Filament\Livewire\ActivityLogLivewire;
+use Relaticle\ActivityLog\Tests\Fixtures\Models\Person;
+
+it('renders when the subject has been soft deleted', function (): void {
+    config()->set('activitylog.include_soft_deleted_subjects', true);
+
+    $person = Person::factory()->create(['name' => 'Soft Deleted Person']);
+    $person->delete();
+
+    expect($person->trashed())->toBeTrue();
+
+    $component = new ActivityLogLivewire;
+    $component->subjectClass = $person::class;
+    $component->subjectKey = $person->getKey();
+
+    $view = $component->render();
+
+    expect($view->name())->toBe('activity-log::timeline');
+});

tests/Fixtures/Models/Person.php

@@ -7,6 +7,7 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\SoftDeletes;
 use Relaticle\ActivityLog\Concerns\InteractsWithTimeline;
 use Relaticle\ActivityLog\Contracts\HasTimeline;
 use Relaticle\ActivityLog\Tests\Fixtures\database\factories\PersonFactory;
@@ -22,6 +23,7 @@ final class Person extends Model implements HasTimeline
 
     use InteractsWithTimeline;
     use LogsActivity;
+    use SoftDeletes;
 
     protected $fillable = ['name'];
 

tests/Fixtures/database/migrations/0001_01_01_000000_create_fixture_tables.php

@@ -14,6 +14,7 @@ public function up(): void
             $table->id();
             $table->string('name');
             $table->timestamps();
+            $table->softDeletes();
         });
 
         Schema::create('emails', function (Blueprint $table): void {