From ee20c3339e523f256f085a724663f0de67c9d323 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 25 Sep 2023 17:14:19 +0200
Subject: [PATCH] fix: show real storage name on services

---
 app/Http/Livewire/Project/Shared/Storages/Show.php    |  6 ++++++
 app/Models/LocalPersistentVolume.php                  | 11 +++++++----
 .../views/livewire/project/service/show.blade.php     |  2 +-
 .../livewire/project/shared/storages/show.blade.php   |  2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/app/Http/Livewire/Project/Shared/Storages/Show.php b/app/Http/Livewire/Project/Shared/Storages/Show.php
index 84593aef3..46dd84aff 100644
--- a/app/Http/Livewire/Project/Shared/Storages/Show.php
+++ b/app/Http/Livewire/Project/Shared/Storages/Show.php
@@ -11,6 +11,7 @@ class Show extends Component
     public LocalPersistentVolume $storage;
     public bool $isReadOnly = false;
     public ?string $modalId = null;
+    public ?string $realName = null;
 
     protected $rules = [
         'storage.name' => 'required|string',
@@ -25,6 +26,11 @@ class Show extends Component
 
     public function mount()
     {
+        if ($this->storage->resource_type === 'App\Models\ServiceApplication' || $this->storage->resource_type === 'App\Models\ServiceDatabase') {
+            $this->realName = "{$this->storage->service->service->uuid}_{$this->storage->name}";
+        } else {
+            $this->realName = $this->storage->name;
+        }
         $this->modalId = new Cuid2(7);
     }
 
diff --git a/app/Models/LocalPersistentVolume.php b/app/Models/LocalPersistentVolume.php
index 20ea51c63..2a29f8abb 100644
--- a/app/Models/LocalPersistentVolume.php
+++ b/app/Models/LocalPersistentVolume.php
@@ -12,16 +12,19 @@ class LocalPersistentVolume extends Model
 
     public function application()
     {
-        return $this->morphTo();
+        return $this->morphTo('resource');
     }
     public function service()
     {
-        return $this->morphTo();
+        return $this->morphTo('resource');
+    }
+    public function database()
+    {
+        return $this->morphTo('resource');
     }
-
     public function standalone_postgresql()
     {
-        return $this->morphTo();
+        return $this->morphTo('resource');
     }
 
     protected function name(): Attribute
diff --git a/resources/views/livewire/project/service/show.blade.php b/resources/views/livewire/project/service/show.blade.php
index e63225c05..eba246615 100644
--- a/resources/views/livewire/project/service/show.blade.php
+++ b/resources/views/livewire/project/service/show.blade.php
@@ -9,7 +9,7 @@
             <a :class="activeTab === 'general' && 'text-white'"
                 @click.prevent="activeTab = 'general'; window.location.hash = 'general'" href="#">General</a>
             <a :class="activeTab === 'storages' && 'text-white'"
-                @click.prevent="activeTab = 'storages'; window.location.hash = 'storages'" href="#">Persistent Storages
+                @click.prevent="activeTab = 'storages'; window.location.hash = 'storages'" href="#">Storages
             </a>
         </div>
         <div class="w-full pl-8">
diff --git a/resources/views/livewire/project/shared/storages/show.blade.php b/resources/views/livewire/project/shared/storages/show.blade.php
index 5ee4efd33..3d60c27ae 100644
--- a/resources/views/livewire/project/shared/storages/show.blade.php
+++ b/resources/views/livewire/project/shared/storages/show.blade.php
@@ -12,7 +12,7 @@
     @endif
     <form wire:submit.prevent='submit' class="flex flex-col gap-2 pt-4 xl:items-end xl:flex-row">
         @if ($isReadOnly)
-            <x-forms.input id="storage.name" label="Name" required readonly />
+            <x-forms.input id="realName" label="Volume Name" required readonly />
             <x-forms.input id="storage.host_path" label="Source Path" readonly />
             <x-forms.input id="storage.mount_path" label="Destination Path" required readonly />
         @else