From a2e889587e70f8228dcf4fdaf6671d7d6d3d3af5 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 8 Apr 2024 11:16:42 +0200
Subject: [PATCH] Refactor environment variable sorting by key

---
 resources/views/livewire/project/edit.blade.php               | 2 +-
 resources/views/livewire/project/environment-edit.blade.php   | 2 +-
 .../project/shared/environment-variable/all.blade.php         | 4 ++--
 .../views/livewire/team-shared-variables-index.blade.php      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/views/livewire/project/edit.blade.php b/resources/views/livewire/project/edit.blade.php
index 56806d287..c8fd27f9c 100644
--- a/resources/views/livewire/project/edit.blade.php
+++ b/resources/views/livewire/project/edit.blade.php
@@ -27,7 +27,7 @@
             helper="More info <a class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/environment-variables#shared-variables' target='_blank'>here</a>."></x-helper>
     </div>
     <div class="flex flex-col gap-2">
-        @forelse ($project->environment_variables->sort()->sortBy('real_value') as $env)
+        @forelse ($project->environment_variables->sort()->sortBy('key') as $env)
             <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
                 :env="$env" type="project" />
         @empty
diff --git a/resources/views/livewire/project/environment-edit.blade.php b/resources/views/livewire/project/environment-edit.blade.php
index 5418c5036..02fbb1c69 100644
--- a/resources/views/livewire/project/environment-edit.blade.php
+++ b/resources/views/livewire/project/environment-edit.blade.php
@@ -52,7 +52,7 @@
             helper="More info <a class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/environment-variables#shared-variables' target='_blank'>here</a>."></x-helper>
     </div>
     <div class="flex flex-col gap-2">
-        @forelse ($environment->environment_variables->sort()->sortBy('real_value') as $env)
+        @forelse ($environment->environment_variables->sort()->sortBy('key') as $env)
             <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
                 :env="$env" type="environment" />
         @empty
diff --git a/resources/views/livewire/project/shared/environment-variable/all.blade.php b/resources/views/livewire/project/shared/environment-variable/all.blade.php
index 951f53e61..d698b6350 100644
--- a/resources/views/livewire/project/shared/environment-variable/all.blade.php
+++ b/resources/views/livewire/project/shared/environment-variable/all.blade.php
@@ -16,7 +16,7 @@
         @endif
     </div>
     @if ($view === 'normal')
-        @forelse ($resource->environment_variables->sort()->sortBy('real_value') as $env)
+        @forelse ($resource->environment_variables->sort()->sortBy('key') as $env)
             <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
                 :env="$env" :type="$resource->type()" />
         @empty
@@ -27,7 +27,7 @@
                 <h3>Preview Deployments</h3>
                 <div>Environment (secrets) variables for Preview Deployments.</div>
             </div>
-            @foreach ($resource->environment_variables_preview->sort()->sortBy('real_value') as $env)
+            @foreach ($resource->environment_variables_preview->sort()->sortBy('key') as $env)
                 <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
                     :env="$env" :type="$resource->type()" />
             @endforeach
diff --git a/resources/views/livewire/team-shared-variables-index.blade.php b/resources/views/livewire/team-shared-variables-index.blade.php
index 640913f1f..9f8a709f0 100644
--- a/resources/views/livewire/team-shared-variables-index.blade.php
+++ b/resources/views/livewire/team-shared-variables-index.blade.php
@@ -12,7 +12,7 @@
     </div>
 
     <div class="flex flex-col gap-2">
-        @forelse ($team->environment_variables->sort()->sortBy('real_value') as $env)
+        @forelse ($team->environment_variables->sort()->sortBy('key') as $env)
             <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
                 :env="$env" type="team" />
         @empty