From 95d3ebdc2dd8e026afcd0107d58011bbf847e73b Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 13 Jun 2024 10:18:35 +0200
Subject: [PATCH] fix: in services should edit compose file for volumes and
 envs

---
 .../project/service/configuration.blade.php         |  3 ++-
 .../shared/environment-variable/all.blade.php       |  8 +++++---
 .../livewire/project/shared/storages/show.blade.php | 13 ++++++++++---
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/resources/views/livewire/project/service/configuration.blade.php b/resources/views/livewire/project/service/configuration.blade.php
index d1ff54a5c..272de2f4f 100644
--- a/resources/views/livewire/project/service/configuration.blade.php
+++ b/resources/views/livewire/project/service/configuration.blade.php
@@ -172,7 +172,8 @@ class="w-4 h-4 dark:text-warning text-coollabs"
                     <h2>Storages</h2>
                 </div>
                 <div class="pb-4">Persistent storage to preserve data between deployments.</div>
-                <span class="dark:text-warning">Please modify storage layout in your Docker Compose file.</span>
+                <div class="pb-4 dark:text-warning text-coollabs">If you would like to add a volume, you must add it to
+                    your compose file (General tab).</div>
                 @foreach ($applications as $application)
                     <livewire:project.service.storage wire:key="application-{{ $application->id }}"
                         :resource="$application" />
diff --git a/resources/views/livewire/project/shared/environment-variable/all.blade.php b/resources/views/livewire/project/shared/environment-variable/all.blade.php
index d2693b983..42a2b48a7 100644
--- a/resources/views/livewire/project/shared/environment-variable/all.blade.php
+++ b/resources/views/livewire/project/shared/environment-variable/all.blade.php
@@ -6,19 +6,21 @@
                 <x-modal-input buttonTitle="+ Add" title="New Environment Variable">
                     <livewire:project.shared.environment-variable.add />
                 </x-modal-input>
+                <x-forms.button
+                    wire:click='switch'>{{ $view === 'normal' ? 'Developer view' : 'Normal view' }}</x-forms.button>
             @endif
-            <x-forms.button
-                wire:click='switch'>{{ $view === 'normal' ? 'Developer view' : 'Normal view' }}</x-forms.button>
         </div>
         <div>Environment variables (secrets) for this resource.</div>
         @if ($this->resourceClass === 'App\Models\Application' && data_get($this->resource, 'build_pack') !== 'dockercompose')
             <div class="w-64 pt-2">
                 <x-forms.checkbox id="resource.settings.is_env_sorting_enabled" label="Sort alphabetically"
-                    helper="Turn this off if one environment is dependent on an other. It will be sorted by creation order." instantSave></x-forms.checkbox>
+                    helper="Turn this off if one environment is dependent on an other. It will be sorted by creation order."
+                    instantSave></x-forms.checkbox>
             </div>
         @endif
         @if ($resource->type() === 'service' || $resource?->build_pack === 'dockercompose')
             <div class="pt-4 dark:text-warning text-coollabs">Hardcoded variables are not shown here.</div>
+            <div class="pb-4 dark:text-warning text-coollabs">If you would like to add a variable, you must add it to your compose file (General tab).</div>
         @endif
     </div>
     @if ($view === 'normal')
diff --git a/resources/views/livewire/project/shared/storages/show.blade.php b/resources/views/livewire/project/shared/storages/show.blade.php
index 935d0a43b..6b429a535 100644
--- a/resources/views/livewire/project/shared/storages/show.blade.php
+++ b/resources/views/livewire/project/shared/storages/show.blade.php
@@ -2,8 +2,15 @@
     <form wire:submit='submit' class="flex flex-col gap-2 xl:items-end xl:flex-row">
         @if ($isReadOnly)
             @if ($isFirst)
-                <x-forms.input id="storage.name" label="Volume Name" required
-                    helper="Warning: Changing the volume name after the initial start could cause problems. Only use it when you know what are you doing." />
+                @if (
+                    $storage->resource_type === 'App\Models\ServiceApplication' ||
+                        $storage->resource_type === 'App\Models\ServiceDatabase')
+                    <x-forms.input id="storage.name" label="Volume Name" required readonly
+                        helper="Warning: Changing the volume name after the initial start could cause problems. Only use it when you know what are you doing." />
+                @else
+                    <x-forms.input id="storage.name" label="Volume Name" required
+                        helper="Warning: Changing the volume name after the initial start could cause problems. Only use it when you know what are you doing." />
+                @endif
                 @if ($isService || $startedAt)
                     <x-forms.input id="storage.host_path" readonly helper="Directory on the host system."
                         label="Source Path"
@@ -19,7 +26,7 @@
                 </x-forms.button>
             @else
                 <x-forms.input id="storage.name" required readonly />
-                <x-forms.input id="storage.host_path"  readonly />
+                <x-forms.input id="storage.host_path" readonly />
                 <x-forms.input id="storage.mount_path" required readonly />
             @endif
         @else