From 99d22ae7d68b0fde62bfcc78b7693287ec744d22 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Fri, 2 Jan 2026 17:31:00 +0100
Subject: [PATCH] fix: filter available scopes based on existing variables in
 env var input

---
 .../views/components/forms/env-var-input.blade.php | 14 +++++++++++++-
 .../shared/environment-variable/show.blade.php     |  6 +++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/resources/views/components/forms/env-var-input.blade.php b/resources/views/components/forms/env-var-input.blade.php
index dde535f19..61e308a83 100644
--- a/resources/views/components/forms/env-var-input.blade.php
+++ b/resources/views/components/forms/env-var-input.blade.php
@@ -17,8 +17,15 @@
             selectedIndex: 0,
             cursorPosition: 0,
             currentScope: null,
-            availableScopes: ['team', 'project', 'environment', 'server'],
             availableVars: @js($availableVars),
+            get availableScopes() {
+                // Only include scopes that have at least one variable
+                const allScopes = ['team', 'project', 'environment', 'server'];
+                return allScopes.filter(scope => {
+                    const vars = this.availableVars[scope];
+                    return vars && vars.length > 0;
+                });
+            },
             scopeUrls: @js($scopeUrls),
 
             handleInput() {
@@ -54,6 +61,11 @@
 
                 if (content === '') {
                     this.currentScope = null;
+                    // Only show dropdown if there are available scopes with variables
+                    if (this.availableScopes.length === 0) {
+                        this.showDropdown = false;
+                        return;
+                    }
                     this.suggestions = this.availableScopes.map(scope => ({
                         type: 'scope',
                         value: scope,
diff --git a/resources/views/livewire/project/shared/environment-variable/show.blade.php b/resources/views/livewire/project/shared/environment-variable/show.blade.php
index d2195c2af..4dc46bbbb 100644
--- a/resources/views/livewire/project/shared/environment-variable/show.blade.php
+++ b/resources/views/livewire/project/shared/environment-variable/show.blade.php
@@ -109,7 +109,7 @@
                             disabled
                             type="password"
                             id="value"
-                            :availableVars="$this->availableSharedVariables"
+                            :availableVars="$isSharedVariable ? [] : $this->availableSharedVariables"
                             :projectUuid="data_get($parameters, 'project_uuid')"
                             :environmentUuid="data_get($parameters, 'environment_uuid')"
                             :serverUuid="data_get($parameters, 'server_uuid')" />
@@ -128,7 +128,7 @@
                                 :required="$is_redis_credential"
                                 type="password"
                                 id="value"
-                                :availableVars="$this->availableSharedVariables"
+                                :availableVars="$isSharedVariable ? [] : $this->availableSharedVariables"
                                 :projectUuid="data_get($parameters, 'project_uuid')"
                                 :environmentUuid="data_get($parameters, 'environment_uuid')"
                                 :serverUuid="data_get($parameters, 'server_uuid')" />
@@ -145,7 +145,7 @@
                         disabled
                         type="password"
                         id="value"
-                        :availableVars="$this->availableSharedVariables"
+                        :availableVars="$isSharedVariable ? [] : $this->availableSharedVariables"
                         :projectUuid="data_get($parameters, 'project_uuid')"
                         :environmentUuid="data_get($parameters, 'environment_uuid')"
                         :serverUuid="data_get($parameters, 'server_uuid')" />