dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: Fix directory and file mount headings in file-storage.blade.php

Browse Source
This commit is contained in:
Andras Bacsai
2024-08-29 12:03:23 +02:00
parent d27b1766e6
commit b8a37d897e
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Livewire/Project/Application/General.php
View File

@@ -196,7 +196,7 @@ class General extends Component
// Must reload the application to get the latest database changes // Must reload the application to get the latest database changes
// Why? Not sure, but it works. // Why? Not sure, but it works.
$this->application->refresh(); // $this->application->refresh();
['parsedServices' => $this->parsedServices, 'initialDockerComposeLocation' => $this->initialDockerComposeLocation] = $this->application->loadComposeFile($isInit); ['parsedServices' => $this->parsedServices, 'initialDockerComposeLocation' => $this->initialDockerComposeLocation] = $this->application->loadComposeFile($isInit);
if (is_null($this->parsedServices)) { if (is_null($this->parsedServices)) {

4
bootstrap/helpers/shared.php
View File

@@ -3526,6 +3526,9 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
'networks' => $networks_temp, 'networks' => $networks_temp,
'labels' => $serviceLabels, 'labels' => $serviceLabels,
]); ]);
if ($ports->count() > 0) {
$payload['ports'] = $ports;
}
if ($volumesParsed->count() > 0) { if ($volumesParsed->count() > 0) {
$payload['volumes'] = $volumesParsed; $payload['volumes'] = $volumesParsed;
} }
@@ -3544,6 +3547,7 @@ function newParser(Application|Service $resource, int $pull_request_id = 0, ?int
$parsedServices->put($serviceName, $payload); $parsedServices->put($serviceName, $payload);
} }
ray($parsedServices);
$topLevel->put('services', $parsedServices); $topLevel->put('services', $parsedServices);
$customOrder = ['services', 'volumes', 'networks', 'configs', 'secrets']; $customOrder = ['services', 'volumes', 'networks', 'configs', 'secrets'];

4
resources/views/livewire/project/service/file-storage.blade.php
View File

@@ -4,9 +4,9 @@
<h4>{{ data_get($resource, 'name', 'unknown') }}</h4> <h4>{{ data_get($resource, 'name', 'unknown') }}</h4>
@endif --}} @endif --}}
@if ($fileStorage->is_directory) @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 @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 @endif
<x-forms.input label="Source Path" :value="$fileStorage->fs_path" readonly /> <x-forms.input label="Source Path" :value="$fileStorage->fs_path" readonly />

2
resources/views/livewire/project/service/storage.blade.php
View File

@@ -35,8 +35,6 @@
<livewire:project.shared.storages.all :resource="$resource" /> <livewire:project.shared.storages.all :resource="$resource" />
@endif @endif
@if ($fileStorage->count() > 0) @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"> <div class="flex flex-col gap-2">
@foreach ($fileStorage->sort() as $fileStorage) @foreach ($fileStorage->sort() as $fileStorage)
<livewire:project.service.file-storage :fileStorage="$fileStorage" <livewire:project.service.file-storage :fileStorage="$fileStorage"