From f8c86769a748a95e0aae987dfd052d0ead8b4e3c Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 16 Feb 2024 22:15:18 +0100
Subject: [PATCH] fix: resources

---
 app/Livewire/Server/Resources.php             | 11 +++++++++++
 app/View/Components/Status/Services.php       |  1 +
 .../components/status/services.blade.php      |  2 +-
 .../views/livewire/server/resources.blade.php | 19 ++++++++++++++-----
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/app/Livewire/Server/Resources.php b/app/Livewire/Server/Resources.php
index f9f3af37c..c3ef7f692 100644
--- a/app/Livewire/Server/Resources.php
+++ b/app/Livewire/Server/Resources.php
@@ -11,7 +11,18 @@ class Resources extends Component
     use AuthorizesRequests;
     public ?Server $server = null;
     public $parameters = [];
+    public function getListeners()
+    {
+        $teamId = auth()->user()->currentTeam()->id;
+        return [
+            "echo-private:team.{$teamId},ApplicationStatusChanged" => 'refreshStatus',
+        ];
+    }
 
+    public function refreshStatus() {
+        $this->server->refresh();
+        $this->dispatch('success', 'Resource statuses refreshed.');
+    }
     public function mount() {
         $this->parameters = get_route_parameters();
         try {
diff --git a/app/View/Components/Status/Services.php b/app/View/Components/Status/Services.php
index f81ca9703..70db62172 100644
--- a/app/View/Components/Status/Services.php
+++ b/app/View/Components/Status/Services.php
@@ -15,6 +15,7 @@ class Services extends Component
     public function __construct(
         public Service $service,
         public string $complexStatus = 'exited',
+        public bool $showRefreshButton = true
     ) {
         $this->complexStatus = $service->status();
     }
diff --git a/resources/views/components/status/services.blade.php b/resources/views/components/status/services.blade.php
index dfcec7480..ff19cade3 100644
--- a/resources/views/components/status/services.blade.php
+++ b/resources/views/components/status/services.blade.php
@@ -7,7 +7,7 @@
 @else
     <x-status.stopped :status="$complexStatus" />
 @endif
-@if (!str($complexStatus)->contains('exited'))
+@if (!str($complexStatus)->contains('exited') && $showRefreshButton)
     <button title="Refresh Status" wire:click='check_status(true)' class="mx-1 hover:fill-white fill-warning">
         <svg class="w-4 h-4" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
             <path
diff --git a/resources/views/livewire/server/resources.blade.php b/resources/views/livewire/server/resources.blade.php
index f8f3990d6..964adc4b6 100644
--- a/resources/views/livewire/server/resources.blade.php
+++ b/resources/views/livewire/server/resources.blade.php
@@ -1,7 +1,12 @@
 <div>
     <x-server.navbar :server="$server" :parameters="$parameters" />
-    <h2>Resources</h2>
-    <div class="pb-4 title">Here you can find all resources for this server.</div>
+    <div class="flex flex-col">
+        <div class="flex gap-2">
+            <h2>Resources</h2>
+            <x-forms.button wire:click="refreshStatus">Refresh</x-forms.button>
+        </div>
+        <div class="pb-4 title">Here you can find all resources for this server.</div>
+    </div>
     <div class="flex flex-col">
         <div class="flex flex-col">
             <div class="overflow-x-auto">
@@ -10,7 +15,8 @@
                         <table class="min-w-full divide-y divide-coolgray-400">
                             <thead>
                                 <tr class="text-neutral-500">
-                                    <th class="px-5 py-3 text-xs font-medium text-left uppercase">Project Name</th>
+                                    <th class="px-5 py-3 text-xs font-medium text-left uppercase">Project</th>
+                                    <th class="px-5 py-3 text-xs font-medium text-left uppercase">Environment</th>
                                     <th class="px-5 py-3 text-xs font-medium text-left uppercase">Name</th>
                                     <th class="px-5 py-3 text-xs font-medium text-left uppercase">Type</th>
                                     <th class="px-5 py-3 text-xs font-medium text-left uppercase">Status</th>
@@ -22,13 +28,16 @@
                                         <td class="px-5 py-4 text-sm whitespace-nowrap">
                                             {{ data_get($resource->project(), 'name') }}
                                         </td>
-                                        <td class="px-5 py-4 text-sm whitespace-nowrap"> <a class=""
+                                        <td class="px-5 py-4 text-sm whitespace-nowrap">
+                                            {{ data_get($resource, 'environment.name') }}
+                                        </td>
+                                        <td class="px-5 py-4 text-sm whitespace-nowrap"><a class=""
                                                 href="{{ $resource->link() }}">{{ $resource->name }} </a></td>
                                         <td class="px-5 py-4 text-sm whitespace-nowrap">
                                             {{ str($resource->type())->headline() }}</td>
                                         <td class="px-5 py-4 text-sm font-medium whitespace-nowrap">
                                             @if ($resource->type() === 'service')
-                                                <x-status.services :service="$resource" />
+                                                <x-status.services :service="$resource" :showRefreshButton="false" />
                                             @else
                                                 <x-status.index :status="$resource->status" :showRefreshButton="false" />
                                             @endif