rosslh/coolify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix service retrieval and add error handling

Browse source
This commit is contained in:
Andras Bacsai 2023-11-13 12:59:59 +01:00
parent 7763594e6e
commit 55846c5635
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
bootstrap/helpers/shared.php
View file

@ -447,20 +447,25 @@ function getServiceTemplates()
if (isDev()) {
$services = File::get(base_path('templates/service-templates.json'));
$services = collect(json_decode($services))->sortKeys();
$version = config('version');
$services = $services->map(function ($service) use ($version) {
if (version_compare($version, data_get($service, 'minVersion', '0.0.0'), '<')) {
$service->disabled = true;
}
return $service;
});
} else {
$services = Http::get(config('constants.services.official'));
if ($services->failed()) {
throw new \Exception($services->body());
try {
$response = Http::retry(3, 50)->get(config('constants.services.official'));
if ($response->failed()) {
return collect([]);
}
$services = $response->json();
$services = collect($services)->sortKeys();
} catch (\Throwable $e) {
$services = collect([]);
}
$services = collect($services->json())->sortKeys();
}
// $version = config('version');
// $services = $services->map(function ($service) use ($version) {
// if (version_compare($version, data_get($service, 'minVersion', '0.0.0'), '<')) {
// $service->disabled = true;
// }
// return $service;
// });
return $services;
}

2
resources/views/livewire/project/new/select.blade.php
View file

@ -182,7 +182,7 @@ class="w-full text-white rounded input input-sm bg-coolgray-200 disabled:bg-cool
</button>
@endif
@empty
<div>No service found.</div>
<div>No service found. Please try to reload the list!</div>
@endforelse
@endif
</div>