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

fix: force load services from cdn on reload list

Browse Source
This commit is contained in:
Andras Bacsai
2024-05-27 10:27:18 +02:00
parent 8bca988520
commit a6a0cb928a
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Livewire/Project/New/Select.php
View File

@@ -91,7 +91,7 @@ class Select extends Component
});
} else {
$this->search = null;
$this->allServices = get_service_templates();
$this->allServices = get_service_templates($force);
$this->services = $this->allServices->filter(function ($service, $key) {
return str_contains(strtolower($key), strtolower($this->search));
});

35
bootstrap/helpers/shared.php
View File

@@ -465,25 +465,24 @@ function sslip(Server $server)
return "http://{$server->ip}.sslip.io";
}
function get_service_templates()
function get_service_templates(bool $force = false): Collection
{
// if (isDev()) {
// $services = File::get(base_path('templates/service-templates.json'));
// $services = collect(json_decode($services))->sortKeys();
// } else {
// 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 = File::get(base_path('templates/service-templates.json'));
return collect(json_decode($services))->sortKeys();
if ($force) {
try {
$response = Http::retry(3, 50)->get(config('constants.services.official'));
if ($response->failed()) {
return collect([]);
}
$services = $response->json();
return collect($services);
} catch (\Throwable $e) {
$services = File::get(base_path('templates/service-templates.json'));
return collect(json_decode($services))->sortKeys();
}
} else {
$services = File::get(base_path('templates/service-templates.json'));
return collect(json_decode($services))->sortKeys();
}
}
function getResourceByUuid(string $uuid, ?int $teamId = null)