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

refactor: move all env sorting to one place

Browse source
This commit is contained in:
peaklabs-dev 2026-01-06 16:19:38 +01:00
parent 3af456cd35
commit 8ba30d75ea
No known key found for this signature in database
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/Livewire/Project/Shared/EnvironmentVariable/All.php
View file

@ -63,20 +63,30 @@ public function instantSave()
public function getEnvironmentVariablesProperty()
{
if ($this->is_env_sorting_enabled === false) {
return $this->resource->environment_variables()->orderBy('order')->get();
$query = $this->resource->environment_variables()
->orderByRaw("CASE WHEN is_required = true AND (value IS NULL OR value = '') THEN 0 ELSE 1 END");
if ($this->is_env_sorting_enabled) {
$query->orderBy('key');
} else {
$query->orderBy('order');
}
return $this->resource->environment_variables;
return $query->get();
}
public function getEnvironmentVariablesPreviewProperty()
{
if ($this->is_env_sorting_enabled === false) {
return $this->resource->environment_variables_preview()->orderBy('order')->get();
$query = $this->resource->environment_variables_preview()
->orderByRaw("CASE WHEN is_required = true AND (value IS NULL OR value = '') THEN 0 ELSE 1 END");
if ($this->is_env_sorting_enabled) {
$query->orderBy('key');
} else {
$query->orderBy('order');
}
return $this->resource->environment_variables_preview;
return $query->get();
}
public function getDevView()