rosslh/coolify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: filter available scopes based on existing variables in env var input

Browse source
This commit is contained in:
Andras Bacsai 2026-01-02 17:31:00 +01:00
parent e3df380a04
commit 99d22ae7d6
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
resources/views/components/forms/env-var-input.blade.php
View file

@ -17,8 +17,15 @@
selectedIndex: 0, selectedIndex: 0,
cursorPosition: 0, cursorPosition: 0,
currentScope: null, currentScope: null,
availableScopes: ['team', 'project', 'environment', 'server'],
availableVars: @js($availableVars), 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), scopeUrls: @js($scopeUrls),
handleInput() { handleInput() {
@ -54,6 +61,11 @@
if (content === '') { if (content === '') {
this.currentScope = null; 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 => ({ this.suggestions = this.availableScopes.map(scope => ({
type: 'scope', type: 'scope',
value: scope, value: scope,

6
resources/views/livewire/project/shared/environment-variable/show.blade.php
View file

@ -109,7 +109,7 @@
disabled disabled
type="password" type="password"
id="value" id="value"
:availableVars="$this->availableSharedVariables" :availableVars="$isSharedVariable ? [] : $this->availableSharedVariables"
:projectUuid="data_get($parameters, 'project_uuid')" :projectUuid="data_get($parameters, 'project_uuid')"
:environmentUuid="data_get($parameters, 'environment_uuid')" :environmentUuid="data_get($parameters, 'environment_uuid')"
:serverUuid="data_get($parameters, 'server_uuid')" /> :serverUuid="data_get($parameters, 'server_uuid')" />
@ -128,7 +128,7 @@
:required="$is_redis_credential" :required="$is_redis_credential"
type="password" type="password"
id="value" id="value"
:availableVars="$this->availableSharedVariables" :availableVars="$isSharedVariable ? [] : $this->availableSharedVariables"
:projectUuid="data_get($parameters, 'project_uuid')" :projectUuid="data_get($parameters, 'project_uuid')"
:environmentUuid="data_get($parameters, 'environment_uuid')" :environmentUuid="data_get($parameters, 'environment_uuid')"
:serverUuid="data_get($parameters, 'server_uuid')" /> :serverUuid="data_get($parameters, 'server_uuid')" />
@ -145,7 +145,7 @@
disabled disabled
type="password" type="password"
id="value" id="value"
:availableVars="$this->availableSharedVariables" :availableVars="$isSharedVariable ? [] : $this->availableSharedVariables"
:projectUuid="data_get($parameters, 'project_uuid')" :projectUuid="data_get($parameters, 'project_uuid')"
:environmentUuid="data_get($parameters, 'environment_uuid')" :environmentUuid="data_get($parameters, 'environment_uuid')"
:serverUuid="data_get($parameters, 'server_uuid')" /> :serverUuid="data_get($parameters, 'server_uuid')" />