Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

refactor: move all env sorting to one place

peaklabs-dev8ba30d75ead1
diff --git a/app/Livewire/Project/Shared/EnvironmentVariable/All.php b/app/Livewire/Project/Shared/EnvironmentVariable/All.php
index 07938d9d08..55e388b78a 100644
--- a/app/Livewire/Project/Shared/EnvironmentVariable/All.php
+++ b/app/Livewire/Project/Shared/EnvironmentVariable/All.php
@@ -63,20 +63,30 @@ class All extends Component
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()