From 135eb7a11ee4241cace115a9de63dc846204ffe9 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 12 Apr 2023 10:14:57 +0200
Subject: [PATCH] fix: show activity on load

---
 app/Http/Controllers/ProjectController.php   | 7 +++----
 resources/views/project/deployment.blade.php | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
index 50612aaa4..7a0594e69 100644
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@@ -2,10 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Application;
-use App\Models\Environment;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
+use Spatie\Activitylog\Models\Activity;
 
 class ProjectController extends Controller
 {
@@ -64,8 +61,10 @@ class ProjectController extends Controller
         if (!$application) {
             return redirect()->route('home');
         }
+        $activity = Activity::where('properties->deployment_uuid', '=', $deployment_uuid)->first();
 
         return view('project.deployment', [
+            'activity' => $activity,
             'deployment_uuid' => $deployment_uuid,
         ]);
     }
diff --git a/resources/views/project/deployment.blade.php b/resources/views/project/deployment.blade.php
index 750b7d9e9..2f79fdafa 100644
--- a/resources/views/project/deployment.blade.php
+++ b/resources/views/project/deployment.blade.php
@@ -1,4 +1,4 @@
 <x-layout>
     <h1>Deployment</h1>
-    <livewire:poll-activity :activity="null" :deployment_uuid="$deployment_uuid" />
+    <livewire:poll-activity :activity="$activity" :deployment_uuid="$deployment_uuid" />
 </x-layout>