From 2227858f584c9b8c532a242f45c8491611df004d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 16 Aug 2024 12:23:31 +0200
Subject: [PATCH] refactor: Load environment variables based on resource type
 in sortEnvironmentVariables()

---
 app/Livewire/Project/Shared/EnvironmentVariable/All.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/Livewire/Project/Shared/EnvironmentVariable/All.php b/app/Livewire/Project/Shared/EnvironmentVariable/All.php
index 5aba5bd09..4c79eb3a2 100644
--- a/app/Livewire/Project/Shared/EnvironmentVariable/All.php
+++ b/app/Livewire/Project/Shared/EnvironmentVariable/All.php
@@ -52,11 +52,18 @@ class All extends Component
 
     public function sortEnvironmentVariables()
     {
-        $this->resource->load(['environment_variables', 'environment_variables_preview']);
+        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 ($sortBy === 'key') {
                 return $variables->sortBy(function ($item) {
                     return strtolower($item->key);