From b8a37d897e69ed55ef0365d9323bd610b6ea7d98 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 29 Aug 2024 12:03:23 +0200
Subject: [PATCH] fix: Fix directory and file mount headings in
 file-storage.blade.php

---
 app/Livewire/Project/Application/General.php                  | 2 +-
 bootstrap/helpers/shared.php                                  | 4 ++++
 .../views/livewire/project/service/file-storage.blade.php     | 4 ++--
 resources/views/livewire/project/service/storage.blade.php    | 2 --
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.php
index 3aceb449b..5bfb56067 100644
--- a/app/Livewire/Project/Application/General.php
+++ b/app/Livewire/Project/Application/General.php
@@ -196,7 +196,7 @@ class General extends Component
 
             // Must reload the application to get the latest database changes
             // Why? Not sure, but it works.
-            $this->application->refresh();
+            // $this->application->refresh();
 
             ['parsedServices' => $this->parsedServices, 'initialDockerComposeLocation' => $this->initialDockerComposeLocation] = $this->application->loadComposeFile($isInit);
             if (is_null($this->parsedServices)) {
diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index ef7f238e6..aff9e0ab7 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -3526,6 +3526,9 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
             'networks' => $networks_temp,
             'labels' => $serviceLabels,
         ]);
+        if ($ports->count() > 0) {
+            $payload['ports'] = $ports;
+        }
         if ($volumesParsed->count() > 0) {
             $payload['volumes'] = $volumesParsed;
         }
@@ -3544,6 +3547,7 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
 
         $parsedServices->put($serviceName, $payload);
     }
+    ray($parsedServices);
     $topLevel->put('services', $parsedServices);
     $customOrder = ['services', 'volumes', 'networks', 'configs', 'secrets'];
 
diff --git a/resources/views/livewire/project/service/file-storage.blade.php b/resources/views/livewire/project/service/file-storage.blade.php
index 3fa0574d6..539e37885 100644
--- a/resources/views/livewire/project/service/file-storage.blade.php
+++ b/resources/views/livewire/project/service/file-storage.blade.php
@@ -4,9 +4,9 @@
             <h4>{{ data_get($resource, 'name', 'unknown') }}</h4>
         @endif --}}
         @if ($fileStorage->is_directory)
-            <h4 class="dark:text-white">Directory Mount</h4>
+            <h4 class="dark:text-white pt-4 border-t dark:border-coolgray-200">Directory Mount</h4>
         @else
-            <h4 class="dark:text-white">File Mount</h4>
+            <h4 class="dark:text-white pt-4 border-t dark:border-coolgray-200">File Mount</h4>
         @endif
 
         <x-forms.input label="Source Path" :value="$fileStorage->fs_path" readonly />
diff --git a/resources/views/livewire/project/service/storage.blade.php b/resources/views/livewire/project/service/storage.blade.php
index df29362b7..13a3f642d 100644
--- a/resources/views/livewire/project/service/storage.blade.php
+++ b/resources/views/livewire/project/service/storage.blade.php
@@ -35,8 +35,6 @@
             <livewire:project.shared.storages.all :resource="$resource" />
         @endif
         @if ($fileStorage->count() > 0)
-
-            <h3 class="mt-4 pt-2  border-t dark:border-coolgray-200">Mounts</h3>
             <div class="flex flex-col gap-2">
                 @foreach ($fileStorage->sort() as $fileStorage)
                     <livewire:project.service.file-storage :fileStorage="$fileStorage"