refactor(environment): streamline environment variable handling by replacing sorting methods with direct property access and enhancing query ordering for improved performance

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

@@ -40,7 +40,7 @@ class All extends Component
         if (str($this->resourceClass)->contains($resourceWithPreviews) && ! $simpleDockerfile) {
             $this->showPreview = true;
         }
-        $this->sortEnvironmentVariables();
+        $this->getDevView();
     }
 
     public function instantSave()
@@ -50,33 +50,36 @@ class All extends Component
 
             $this->resource->settings->is_env_sorting_enabled = $this->is_env_sorting_enabled;
             $this->resource->settings->save();
-            $this->sortEnvironmentVariables();
+            $this->getDevView();
             $this->dispatch('success', 'Environment variable settings updated.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
     }
 
-    public function sortEnvironmentVariables()
+    public function getEnvironmentVariablesProperty()
     {
         if ($this->is_env_sorting_enabled === false) {
-            if ($this->resource->environment_variables) {
+            return $this->resource->environment_variables()->orderBy('order')->get();
-                $this->resource->environment_variables = $this->resource->environment_variables->sortBy('order')->values();
         }
 
-            if ($this->resource->environment_variables_preview) {
+        return $this->resource->environment_variables;
-                $this->resource->environment_variables_preview = $this->resource->environment_variables_preview->sortBy('order')->values();
-            }
     }
 
-        $this->getDevView();
+    public function getEnvironmentVariablesPreviewProperty()
+    {
+        if ($this->is_env_sorting_enabled === false) {
+            return $this->resource->environment_variables_preview()->orderBy('order')->get();
+        }
+
+        return $this->resource->environment_variables_preview;
     }
 
     public function getDevView()
     {
-        $this->variables = $this->formatEnvironmentVariables($this->resource->environment_variables);
+        $this->variables = $this->formatEnvironmentVariables($this->environmentVariables);
         if ($this->showPreview) {
-            $this->variablesPreview = $this->formatEnvironmentVariables($this->resource->environment_variables_preview);
+            $this->variablesPreview = $this->formatEnvironmentVariables($this->environmentVariablesPreview);
         }
     }
 
@@ -97,7 +100,7 @@ class All extends Component
     public function switch()
     {
         $this->view = $this->view === 'normal' ? 'dev' : 'normal';
-        $this->sortEnvironmentVariables();
+        $this->getDevView();
     }
 
     public function submit($data = null)
@@ -111,7 +114,7 @@ class All extends Component
             }
 
             $this->updateOrder();
-            $this->sortEnvironmentVariables();
+            $this->getDevView();
         } catch (\Throwable $e) {
             return handleError($e, $this);
         } finally {
@@ -292,7 +295,6 @@ class All extends Component
     public function refreshEnvs()
     {
         $this->resource->refresh();
-        $this->sortEnvironmentVariables();
         $this->getDevView();
     }
 }

app/Models/Application.php

@@ -728,7 +728,14 @@ class Application extends BaseModel
     {
         return $this->morphMany(EnvironmentVariable::class, 'resourceable')
             ->where('is_preview', false)
-            ->orderBy('key', 'asc');
+            ->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()
@@ -749,7 +756,14 @@ class Application extends BaseModel
     {
         return $this->morphMany(EnvironmentVariable::class, 'resourceable')
             ->where('is_preview', true)
-            ->orderByRaw("LOWER(key) LIKE LOWER('SERVICE%') DESC, LOWER(key) ASC");
+            ->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_preview()

app/Models/Service.php

@@ -1229,14 +1229,14 @@ class Service extends BaseModel
     public function environment_variables()
     {
         return $this->morphMany(EnvironmentVariable::class, 'resourceable')
-            ->orderBy('key', 'asc');
+            ->orderByRaw("
-    }
+                CASE 
-
+                    WHEN LOWER(key) LIKE 'service_%' THEN 1
-    public function environment_variables_preview()
+                    WHEN is_required = true AND (value IS NULL OR value = '') THEN 2
-    {
+                    ELSE 3
-        return $this->morphMany(EnvironmentVariable::class, 'resourceable')
+                END,
-            ->where('is_preview', true)
+                LOWER(key) ASC
-            ->orderByRaw("LOWER(key) LIKE LOWER('SERVICE%') DESC, LOWER(key) ASC");
+            ");
     }
 
     public function workdir()

app/Models/StandaloneClickhouse.php

@@ -266,7 +266,14 @@ class StandaloneClickhouse extends BaseModel
     public function environment_variables()
     {
         return $this->morphMany(EnvironmentVariable::class, 'resourceable')
-            ->orderBy('key', 'asc');
+            ->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

@@ -341,6 +341,13 @@ class StandaloneDragonfly extends BaseModel
     public function environment_variables()
     {
         return $this->morphMany(EnvironmentVariable::class, 'resourceable')
-            ->orderBy('key', 'asc');
+            ->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

@@ -341,6 +341,13 @@ class StandaloneKeydb extends BaseModel
     public function environment_variables()
     {
         return $this->morphMany(EnvironmentVariable::class, 'resourceable')
-            ->orderBy('key', 'asc');
+            ->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

@@ -262,7 +262,14 @@ class StandaloneMariadb extends BaseModel
     public function environment_variables()
     {
         return $this->morphMany(EnvironmentVariable::class, 'resourceable')
-            ->orderBy('key', 'asc');
+            ->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

@@ -363,6 +363,13 @@ class StandaloneMongodb extends BaseModel
     public function environment_variables()
     {
         return $this->morphMany(EnvironmentVariable::class, 'resourceable')
-            ->orderBy('key', 'asc');
+            ->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

@@ -345,6 +345,13 @@ class StandaloneMysql extends BaseModel
     public function environment_variables()
     {
         return $this->morphMany(EnvironmentVariable::class, 'resourceable')
-            ->orderBy('key', 'asc');
+            ->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

@@ -296,7 +296,14 @@ class StandalonePostgresql extends BaseModel
     public function environment_variables()
     {
         return $this->morphMany(EnvironmentVariable::class, 'resourceable')
-            ->orderBy('key', 'asc');
+            ->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

@@ -388,6 +388,13 @@ class StandaloneRedis extends BaseModel
     public function environment_variables()
     {
         return $this->morphMany(EnvironmentVariable::class, 'resourceable')
-            ->orderBy('key', 'asc');
+            ->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
+            ");
     }
 }

resources/views/livewire/project/shared/environment-variable/all.blade.php

@@ -45,14 +45,7 @@
             <h3>Production Environment Variables</h3>
             <div>Environment (secrets) variables for Production.</div>
         </div>
-        @php
+        @forelse ($this->environmentVariables as $env)
-            $requiredEmptyVars = $resource->environment_variables->filter(function ($env) {
-                return $env->is_required && empty($env->value);
-            });
-
-            $otherVars = $resource->environment_variables->diff($requiredEmptyVars);
-        @endphp
-        @forelse ($requiredEmptyVars->merge($otherVars) as $env)
             <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
                 :env="$env" :type="$resource->type()" />
         @empty
@@ -63,7 +56,7 @@
                 <h3>Preview Deployments Environment Variables</h3>
                 <div>Environment (secrets) variables for Preview Deployments.</div>
             </div>
-            @foreach ($resource->environment_variables_preview as $env)
+            @foreach ($this->environmentVariablesPreview as $env)
                 <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
                     :env="$env" :type="$resource->type()" />
             @endforeach