fix(env): custom environment variable sorting (#7887)

app/Livewire/Project/Shared/EnvironmentVariable/All.php

@@ -63,20 +63,30 @@ public function instantSave()
 
     public function getEnvironmentVariablesProperty()
     {
-        if ($this->is_env_sorting_enabled === false) {
+        $query = $this->resource->environment_variables()
-            return $this->resource->environment_variables()->orderBy('order')->get();
+            ->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) {
+        $query = $this->resource->environment_variables_preview()
-            return $this->resource->environment_variables_preview()->orderBy('order')->get();
+            ->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()

app/Models/Application.php

@@ -845,15 +845,7 @@ public function detectPortFromEnvironment(?bool $isPreview = false): ?int
     public function environment_variables()
     {
         return $this->morphMany(EnvironmentVariable::class, 'resourceable')
-            ->where('is_preview', false)
+            ->where('is_preview', false);
-            ->orderByRaw("
-                CASE
-                    WHEN is_required = true THEN 1
-                    WHEN LOWER(key) LIKE 'service_%' THEN 2
-                    ELSE 3
-                END,
-                LOWER(key) ASC
-            ");
     }
 
     public function runtime_environment_variables()

app/Models/Service.php

@@ -1458,15 +1458,7 @@ public function scheduled_tasks(): HasMany
 
     public function environment_variables()
     {
-        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable');
-            ->orderByRaw("
-                CASE
-                    WHEN is_required = true THEN 1
-                    WHEN LOWER(key) LIKE 'service_%' THEN 2
-                    ELSE 3
-                END,
-                LOWER(key) ASC
-            ");
     }
 
     public function workdir()

app/Models/StandaloneClickhouse.php

@@ -295,15 +295,7 @@ public function destination()
 
     public function environment_variables()
     {
-        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable');
-            ->orderByRaw("
-                CASE 
-                    WHEN LOWER(key) LIKE 'service_%' THEN 1
-                    WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
-                    ELSE 3
-                END,
-                LOWER(key) ASC
-            ");
     }
 
     public function runtime_environment_variables()

app/Models/StandaloneDragonfly.php

@@ -324,14 +324,6 @@ public function isBackupSolutionAvailable()
 
     public function environment_variables()
     {
-        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable');
-            ->orderByRaw("
-                CASE 
-                    WHEN LOWER(key) LIKE 'service_%' THEN 1
-                    WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
-                    ELSE 3
-                END,
-                LOWER(key) ASC
-            ");
     }
 }

app/Models/StandaloneKeydb.php

@@ -324,14 +324,6 @@ public function isBackupSolutionAvailable()
 
     public function environment_variables()
     {
-        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable');
-            ->orderByRaw("
-                CASE 
-                    WHEN LOWER(key) LIKE 'service_%' THEN 1
-                    WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
-                    ELSE 3
-                END,
-                LOWER(key) ASC
-            ");
     }
 }

app/Models/StandaloneMariadb.php

@@ -289,15 +289,7 @@ public function destination(): MorphTo
 
     public function environment_variables()
     {
-        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable');
-            ->orderByRaw("
-                CASE 
-                    WHEN LOWER(key) LIKE 'service_%' THEN 1
-                    WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
-                    ELSE 3
-                END,
-                LOWER(key) ASC
-            ");
     }
 
     public function runtime_environment_variables()

app/Models/StandaloneMongodb.php

@@ -349,14 +349,6 @@ public function isBackupSolutionAvailable()
 
     public function environment_variables()
     {
-        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable');
-            ->orderByRaw("
-                CASE 
-                    WHEN LOWER(key) LIKE 'service_%' THEN 1
-                    WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
-                    ELSE 3
-                END,
-                LOWER(key) ASC
-            ");
     }
 }

app/Models/StandaloneMysql.php

@@ -328,14 +328,6 @@ public function isBackupSolutionAvailable()
 
     public function environment_variables()
     {
-        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable');
-            ->orderByRaw("
-                CASE 
-                    WHEN LOWER(key) LIKE 'service_%' THEN 1
-                    WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
-                    ELSE 3
-                END,
-                LOWER(key) ASC
-            ");
     }
 }

app/Models/StandalonePostgresql.php

@@ -323,15 +323,7 @@ public function scheduledBackups()
 
     public function environment_variables()
     {
-        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable');
-            ->orderByRaw("
-                CASE 
-                    WHEN LOWER(key) LIKE 'service_%' THEN 1
-                    WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
-                    ELSE 3
-                END,
-                LOWER(key) ASC
-            ");
     }
 
     public function isBackupSolutionAvailable()

app/Models/StandaloneRedis.php

@@ -374,14 +374,6 @@ public function redisUsername(): Attribute
 
     public function environment_variables()
     {
-        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+        return $this->morphMany(EnvironmentVariable::class, 'resourceable');
-            ->orderByRaw("
-                CASE 
-                    WHEN LOWER(key) LIKE 'service_%' THEN 1
-                    WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
-                    ELSE 3
-                END,
-                LOWER(key) ASC
-            ");
     }
 }