Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

feat: add search functionality for environment variables

Rohit Tiwari07337d9df6d9
diff --git a/app/Livewire/Project/Shared/EnvironmentVariable/All.php b/app/Livewire/Project/Shared/EnvironmentVariable/All.php
index 53b55009e9..1ddf024a7f 100644
--- a/app/Livewire/Project/Shared/EnvironmentVariable/All.php
+++ b/app/Livewire/Project/Shared/EnvironmentVariable/All.php
@@ -25,6 +25,8 @@ class All extends Component
public string $view = 'normal';
+ public string $search = '';
+
public bool $is_env_sorting_enabled = false;
public bool $use_build_secrets = false;
@@ -35,6 +37,14 @@ class All extends Component
'environmentVariableDeleted' => 'refreshEnvs',
];
+ public function updatedSearch()
+ {
+ unset($this->environmentVariables);
+ unset($this->environmentVariablesPreview);
+ unset($this->hardcodedEnvironmentVariables);
+ unset($this->hardcodedEnvironmentVariablesPreview);
+ }
+
public function mount()
{
$this->is_env_sorting_enabled = data_get($this->resource, 'settings.is_env_sorting_enabled', false);
@@ -68,6 +78,10 @@ class All extends Component
$query = $this->resource->environment_variables()
->orderByRaw("CASE WHEN is_required = true AND (value IS NULL OR value = '') THEN 0 ELSE 1 END");
+ if ($this->search !== '') {
+ $query->where('key', 'like', "%{$this->search}%");
+ }
+
if ($this->is_env_sorting_enabled) {
$query->orderBy('key');
} else {
@@ -82,6 +96,10 @@ class All extends Component
$query = $this->resource->environment_variables_preview()
->orderByRaw("CASE WHEN is_required = true AND (value IS NULL OR value = '') THEN 0 ELSE 1 END");
+ if ($this->search !== '') {
+ $query->where('key', 'like', "%{$this->search}%");
+ }
+
if ($this->is_env_sorting_enabled) {
$query->orderBy('key');
} else {
@@ -138,6 +156,12 @@ class All extends Component
return ! in_array($var['key'], $managedKeys);
});
+ if ($this->search !== '') {
+ $hardcodedVars = $hardcodedVars->filter(function ($var) {
+ return str($var['key'])->contains($this->search, true);
+ });
+ }
+
// Apply sorting based on is_env_sorting_enabled
if ($this->is_env_sorting_enabled) {
$hardcodedVars = $hardcodedVars->sortBy('key')->values();
@@ -285,6 +309,8 @@ class All extends Component
// Clear computed property cache to force refresh
unset($this->environmentVariables);
unset($this->environmentVariablesPreview);
+ unset($this->hardcodedEnvironmentVariables);
+ unset($this->hardcodedEnvironmentVariablesPreview);
$this->dispatch('success', 'Environment variable added.');
}
@@ -416,6 +442,8 @@ class All extends Component
// Clear computed property cache to force refresh
unset($this->environmentVariables);
unset($this->environmentVariablesPreview);
+ unset($this->hardcodedEnvironmentVariables);
+ unset($this->hardcodedEnvironmentVariablesPreview);
$this->getDevView();
}
}
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 2ae3ad1667..5e308d9806 100644
--- a/resources/views/livewire/project/shared/environment-variable/all.blade.php
+++ b/resources/views/livewire/project/shared/environment-variable/all.blade.php
@@ -43,9 +43,35 @@
@endif
</div>
@if ($view === 'normal')
- <div>
- <h3>Production Environment Variables</h3>
- <div>Environment (secrets) variables for Production.</div>
+ <div class="flex flex-col md:flex-row gap-2 justify-between md:items-center">
+ <div>
+ <h3>Production Environment Variables</h3>
+ <div class="subtitle">Environment (secrets) variables for Production.</div>
+ </div>
+ <div class="w-full md:w-96">
+ <div class="relative">
+ <input type="search" placeholder="Search" wire:model.live.debounce.300ms="search"
+ class="w-full input pl-10" />
+ <div class="absolute inset-y-0 left-0 flex items-center pl-3 pointer-events-none">
+ <div class="relative w-4 h-4">
+ <svg wire:loading.remove wire:target="search"
+ class="absolute inset-0 w-4 h-4 dark:text-neutral-400" fill="none"
+ stroke="currentColor" viewBox="0 0 24 24">
+ <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+ d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
+ </svg>
+ <svg wire:loading wire:target="search"
+ class="absolute inset-0 w-4 h-4 text-coollabs dark:text-warning animate-spin"
+ fill="none" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor"
+ stroke-width="4" />
+ <path class="opacity-75" fill="currentColor"
+ d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z" />
+ </svg>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
@forelse ($this->environmentVariables as $env)
<livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}" :env="$env"
@@ -56,8 +82,7 @@
@if (($resource->type() === 'service' || $resource?->build_pack === 'dockercompose') && $this->hardcodedEnvironmentVariables->isNotEmpty())
@foreach ($this->hardcodedEnvironmentVariables as $index => $env)
<livewire:project.shared.environment-variable.show-hardcoded
- wire:key="hardcoded-prod-{{ $env['key'] }}-{{ $env['service_name'] ?? 'default' }}-{{ $index }}"
- :env="$env" />
+ wire:key="hardcoded-prod-{{ $env['key'] }}-{{ $env['service_name'] ?? 'default' }}-{{ $index }}" :env="$env" />
@endforeach
@endif
@if ($resource->type() === 'application' && $resource->environment_variables_preview->count() > 0 && $showPreview)
@@ -88,8 +113,9 @@
label="Production Environment Variables"></x-forms.textarea>
@if ($showPreview)
- <x-forms.textarea rows="10" class="whitespace-pre-wrap font-sans" label="Preview Deployments Environment Variables"
- id="variablesPreview" wire:model="variablesPreview"></x-forms.textarea>
+ <x-forms.textarea rows="10" class="whitespace-pre-wrap font-sans"
+ 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>
@@ -98,10 +124,11 @@
label="Production Environment Variables" disabled></x-forms.textarea>
@if ($showPreview)
- <x-forms.textarea rows="10" class="whitespace-pre-wrap font-sans" label="Preview Deployments Environment Variables"
- id="variablesPreview" wire:model="variablesPreview" disabled></x-forms.textarea>
+ <x-forms.textarea rows="10" class="whitespace-pre-wrap font-sans"
+ label="Preview Deployments Environment Variables" id="variablesPreview" wire:model="variablesPreview"
+ disabled></x-forms.textarea>
@endif
@endcan
</form>
@endif
-</div>
+</div>
\ No newline at end of file