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

---
 app/View/Components/Status/Index.php            |  3 +--
 config/sentry.php                               |  2 +-
 config/version.php                              |  2 +-
 .../views/components/status/index.blade.php     | 17 ++++++++---------
 .../views/livewire/server/delete.blade.php      |  1 +
 .../views/livewire/server/resources.blade.php   |  2 +-
 versions.json                                   |  2 +-
 7 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/View/Components/Status/Index.php b/app/View/Components/Status/Index.php
index 0ee009257..56f4c598b 100644
--- a/app/View/Components/Status/Index.php
+++ b/app/View/Components/Status/Index.php
@@ -11,12 +11,11 @@ class Index extends Component
     /**
      * Create a new component instance.
      */
-    public $status = "exited:unhealthy";
+
     public function __construct(
         public $resource = null,
         public bool $showRefreshButton = true,
     ) {
-        $this->status = $resource->status;
     }
 
     /**
diff --git a/config/sentry.php b/config/sentry.php
index f537dc4d2..a183d2d97 100644
--- a/config/sentry.php
+++ b/config/sentry.php
@@ -7,7 +7,7 @@
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.222',
+    'release' => '4.0.0-beta.223',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 
diff --git a/config/version.php b/config/version.php
index 7fca7b055..6ad89f693 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.222';
+return '4.0.0-beta.223';
diff --git a/resources/views/components/status/index.blade.php b/resources/views/components/status/index.blade.php
index 71596b8bd..dda8edac9 100644
--- a/resources/views/components/status/index.blade.php
+++ b/resources/views/components/status/index.blade.php
@@ -1,14 +1,13 @@
-@if (str($status)->startsWith('running'))
-    <x-status.running :status="$status" />
-@elseif(str($status)->startsWith('restarting') ||
-        str($status)->startsWith('starting') ||
-        str($status)->startsWith('degraded'))
-    <x-status.restarting :status="$status" />
+@if (str($resource->status)->startsWith('running'))
+    <x-status.running :status="$resource->status" />
+@elseif(str($resource->status)->startsWith('restarting') ||
+        str($resource->status)->startsWith('starting') ||
+        str($resource->status)->startsWith('degraded'))
+    <x-status.restarting :status="$resource->status" />
 @else
-    <x-status.stopped :status="$status" />
+    <x-status.stopped :status="$resource->status" />
 @endif
-
-@if (!str($status)->contains('exited') && $showRefreshButton)
+@if (!str($resource->status)->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/delete.blade.php b/resources/views/livewire/server/delete.blade.php
index 7ab9e9bf3..050fb576e 100644
--- a/resources/views/livewire/server/delete.blade.php
+++ b/resources/views/livewire/server/delete.blade.php
@@ -10,6 +10,7 @@
             <x-new-modal disabled isErrorButton buttonTitle="Delete">
                 This server will be deleted. It is not reversible. <br>Please think again.
             </x-new-modal>
+            <div>You need to delete all resources before deleting this server.</div>
         @else
             <x-new-modal isErrorButton buttonTitle="Delete">
                 This server will be deleted. It is not reversible. <br>Please think again.
diff --git a/resources/views/livewire/server/resources.blade.php b/resources/views/livewire/server/resources.blade.php
index 113ce4e63..2f43960f1 100644
--- a/resources/views/livewire/server/resources.blade.php
+++ b/resources/views/livewire/server/resources.blade.php
@@ -53,7 +53,7 @@
                                                         @if ($resource->type() === 'service')
                                                             <x-status.services :service="$resource" :showRefreshButton="false" />
                                                         @else
-                                                            <x-status.index :status="$resource->status" :showRefreshButton="false" />
+                                                            <x-status.index :resource="$resource" :showRefreshButton="false" />
                                                         @endif
                                                     </td>
                                                 </tr>
diff --git a/versions.json b/versions.json
index 214e24c5c..09b7bdb87 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.222"
+            "version": "4.0.0-beta.223"
         }
     }
 }