fix: service env orders, application env orders

Author: andrasbacsai

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

@@ -53,29 +53,15 @@ public function instantSave()
 
     public function sortEnvironmentVariables()
     {
-        if ($this->resource->type() === 'application') {
-            $this->resource->load(['environment_variables', 'environment_variables_preview']);
-        } else {
-            $this->resource->load(['environment_variables']);
-        }
-
-        $sortBy = data_get($this->resource, 'settings.is_env_sorting_enabled') ? 'key' : 'order';
-
-        $sortFunction = function ($variables) use ($sortBy) {
-            if (! $variables) {
-                return $variables;
+        if (! data_get($this->resource, 'settings.is_env_sorting_enabled')) {
+            if ($this->resource->environment_variables) {
+                $this->resource->environment_variables = $this->resource->environment_variables->sortBy('order')->values();
             }
-            if ($sortBy === 'key') {
-                return $variables->sortBy(function ($item) {
-                    return strtolower($item->key);
-                }, SORT_NATURAL | SORT_FLAG_CASE)->values();
-            } else {
-                return $variables->sortBy('order')->values();
-            }
-        };
 
-        $this->resource->environment_variables = $sortFunction($this->resource->environment_variables);
-        $this->resource->environment_variables_preview = $sortFunction($this->resource->environment_variables_preview);
+            if ($this->resource->environment_variables_preview) {
+                $this->resource->environment_variables_preview = $this->resource->environment_variables_preview->sortBy('order')->values();
+            }
+        }
 
         $this->getDevView();
     }
@@ -121,6 +107,8 @@ public function submit($data = null)
             $this->sortEnvironmentVariables();
         } catch (\Throwable $e) {
             return handleError($e, $this);
+        } finally {
+            $this->refreshEnvs();
         }
     }
 

app/Models/Service.php

@@ -1076,12 +1076,12 @@ public function scheduled_tasks(): HasMany
     public function environment_variables(): HasMany
     {
 
-        return $this->hasMany(EnvironmentVariable::class)->orderByRaw("key LIKE 'SERVICE%' DESC, value ASC");
+        return $this->hasMany(EnvironmentVariable::class)->orderByRaw("LOWER(key) LIKE LOWER('SERVICE%') DESC, LOWER(key) ASC");
     }
 
     public function environment_variables_preview(): HasMany
     {
-        return $this->hasMany(EnvironmentVariable::class)->where('is_preview', true)->orderBy('key', 'asc');
+        return $this->hasMany(EnvironmentVariable::class)->where('is_preview', true)->orderByRaw("LOWER(key) LIKE LOWER('SERVICE%') DESC, LOWER(key) ASC");
     }
 
     public function workdir()

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

@@ -56,13 +56,13 @@
     @else
         <form wire:submit.prevent='submit' class="flex flex-col gap-2">
             <x-forms.textarea rows="10" class="whitespace-pre-wrap" id="variables" wire:model="variables" label="Production Environment Variables"></x-forms.textarea>
-            
+
             @if ($showPreview)
                 <x-forms.textarea rows="10" class="whitespace-pre-wrap" label="Preview Deployments Environment Variables"
                     id="variablesPreview" wire:model="variablesPreview"></x-forms.textarea>
             @endif
-            
+
             <x-forms.button type="submit" class="btn btn-primary">Save All Environment Variables</x-forms.button>
         </form>
     @endif
-</div>
+</div>