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.
PHP coolifydatabasesdeploymentdockerdocker-composeinertiajslaravelmariadbmysqlnextjsnodejsphppostgresredisself-hostedself-hostingserverstatic-sitesveltesvelte5
fix(env): keep dev view env saves independent of search
Andras Bacsaid525c12457e5
diff --git a/app/Livewire/Project/Shared/EnvironmentVariable/All.php b/app/Livewire/Project/Shared/EnvironmentVariable/All.phpindex 1ddf024a7f..65f0bd4378 100644--- a/app/Livewire/Project/Shared/EnvironmentVariable/All.php+++ b/app/Livewire/Project/Shared/EnvironmentVariable/All.php@@ -7,6 +7,8 @@ use App\Models\EnvironmentVariable;use App\Support\ValidationPatterns;use App\Traits\EnvironmentVariableProtection;use Illuminate\Foundation\Auth\Access\AuthorizesRequests;+use Illuminate\Support\Collection;+use Illuminate\Support\Str;use Livewire\Component;class All extends Component@@ -75,29 +77,24 @@ class All extends Componentpublic function getEnvironmentVariablesProperty(){- $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 {- $query->orderBy('order');- }-- return $query->get();+ return $this->getEnvironmentVariables(false);}public function getEnvironmentVariablesPreviewProperty(){- $query = $this->resource->environment_variables_preview()- ->orderByRaw("CASE WHEN is_required = true AND (value IS NULL OR value = '') THEN 0 ELSE 1 END");+ return $this->getEnvironmentVariables(true);+ }++ private function getEnvironmentVariables(bool $isPreview, bool $withSearch = true): Collection+ {+ $query = $isPreview+ ? $this->resource->environment_variables_preview()+ : $this->resource->environment_variables();- if ($this->search !== '') {- $query->where('key', 'like', "%{$this->search}%");+ $query->orderByRaw("CASE WHEN is_required = true AND (value IS NULL OR value = '') THEN 0 ELSE 1 END");++ if ($withSearch && $this->searchTerm() !== '') {+ $query->whereRaw('LOWER(key) LIKE ?', ['%'.Str::lower($this->searchTerm()).'%']);}if ($this->is_env_sorting_enabled) {@@ -109,6 +106,11 @@ class All extends Componentreturn $query->get();}+ private function searchTerm(): string+ {+ return trim($this->search);+ }+public function getHardcodedEnvironmentVariablesProperty(){return $this->getHardcodedVariables(false);@@ -156,9 +158,9 @@ class All extends Componentreturn ! in_array($var['key'], $managedKeys);});- if ($this->search !== '') {+ if ($this->searchTerm() !== '') {$hardcodedVars = $hardcodedVars->filter(function ($var) {- return str($var['key'])->contains($this->search, true);+ return str($var['key'])->contains($this->searchTerm(), true);});}@@ -173,9 +175,9 @@ class All extends Componentpublic function getDevView(){- $this->variables = $this->formatEnvironmentVariables($this->environmentVariables);+ $this->variables = $this->formatEnvironmentVariables($this->getEnvironmentVariables(false, false));if ($this->showPreview) {- $this->variablesPreview = $this->formatEnvironmentVariables($this->environmentVariablesPreview);+ $this->variablesPreview = $this->formatEnvironmentVariables($this->getEnvironmentVariables(true, false));}}diff --git a/resources/views/livewire/project/shared/environment-variable/all.blade.php b/resources/views/livewire/project/shared/environment-variable/all.blade.phpindex 5e308d9806..77ac92ffee 100644--- a/resources/views/livewire/project/shared/environment-variable/all.blade.php+++ b/resources/views/livewire/project/shared/environment-variable/all.blade.php@@ -50,17 +50,17 @@</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" />+ <input type="search" placeholder="Search" aria-label="Search environment variables"+ 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"+ <svg wire:loading.remove wire:target="search" aria-hidden="true"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"+ <svg wire:loading wire:target="search" aria-hidden="true"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"@@ -131,4 +131,4 @@@endcan</form>@endif-</div>\ No newline at end of file+</div>diff --git a/tests/Feature/EnvironmentVariableSearchTest.php b/tests/Feature/EnvironmentVariableSearchTest.phpnew file mode 100644index 0000000000..5f49776c94--- /dev/null+++ b/tests/Feature/EnvironmentVariableSearchTest.php@@ -0,0 +1,163 @@+<?php++use App\Livewire\Project\Shared\EnvironmentVariable\All;+use App\Models\Application;+use App\Models\Environment;+use App\Models\EnvironmentVariable;+use App\Models\InstanceSettings;+use App\Models\Project;+use App\Models\Service;+use App\Models\Team;+use App\Models\User;+use Illuminate\Foundation\Testing\RefreshDatabase;+use Livewire\Livewire;++uses(RefreshDatabase::class);++beforeEach(function () {+ InstanceSettings::forceCreate(['id' => 0]);++ $this->user = User::factory()->create();+ $this->team = Team::factory()->create();+ $this->team->members()->attach($this->user, ['role' => 'owner']);+ $this->project = Project::factory()->create([+ 'team_id' => $this->team->id,+ ]);+ $this->environment = Environment::factory()->create([+ 'project_id' => $this->project->id,+ ]);++ $this->actingAs($this->user);+});++it('filters production environment variables by key case-insensitively', function () {+ $application = Application::factory()->create([+ 'environment_id' => $this->environment->id,+ ]);++ EnvironmentVariable::create([+ 'key' => 'API_KEY',+ 'value' => 'secret',+ 'resourceable_type' => Application::class,+ 'resourceable_id' => $application->id,+ ]);++ EnvironmentVariable::create([+ 'key' => 'DATABASE_URL',+ 'value' => 'postgres://example',+ 'resourceable_type' => Application::class,+ 'resourceable_id' => $application->id,+ ]);++ $component = Livewire::test(All::class, ['resource' => $application])+ ->set('search', 'api');++ expect($component->instance()->environmentVariables->pluck('key')->all())+ ->toBe(['API_KEY']);+});++it('filters preview environment variables by key case-insensitively', function () {+ $application = Application::factory()->create([+ 'environment_id' => $this->environment->id,+ ]);++ EnvironmentVariable::create([+ 'key' => 'PREVIEW_TOKEN',+ 'value' => 'preview-secret',+ 'is_preview' => true,+ 'resourceable_type' => Application::class,+ 'resourceable_id' => $application->id,+ ]);++ EnvironmentVariable::create([+ 'key' => 'OTHER_PREVIEW_VALUE',+ 'value' => 'preview-other',+ 'is_preview' => true,+ 'resourceable_type' => Application::class,+ 'resourceable_id' => $application->id,+ ]);++ $component = Livewire::test(All::class, ['resource' => $application])+ ->set('search', 'token');++ expect($component->instance()->environmentVariablesPreview->pluck('key')->all())+ ->toBe(['PREVIEW_TOKEN']);+});++it('filters hardcoded Docker Compose environment variables by key case-insensitively', function () {+ $service = Service::factory()->create([+ 'environment_id' => $this->environment->id,+ 'docker_compose_raw' => <<<'YAML'+services:+ app:+ image: nginx+ environment:+ API_TOKEN: hardcoded-secret+ DATABASE_URL: postgres://example+YAML,+ ]);++ $component = Livewire::test(All::class, ['resource' => $service])+ ->set('search', 'api');++ expect($component->instance()->hardcodedEnvironmentVariables->pluck('key')->all())+ ->toBe(['API_TOKEN']);+});++it('keeps developer view unfiltered after searching', function () {+ $application = Application::factory()->create([+ 'environment_id' => $this->environment->id,+ ]);++ EnvironmentVariable::create([+ 'key' => 'API_KEY',+ 'value' => 'secret',+ 'resourceable_type' => Application::class,+ 'resourceable_id' => $application->id,+ ]);++ EnvironmentVariable::create([+ 'key' => 'DATABASE_URL',+ 'value' => 'postgres://example',+ 'resourceable_type' => Application::class,+ 'resourceable_id' => $application->id,+ ]);++ $component = Livewire::test(All::class, ['resource' => $application])+ ->set('search', 'api')+ ->call('switch')+ ->assertSet('view', 'dev');++ expect($component->get('variables'))+ ->toContain('API_KEY=secret')+ ->toContain('DATABASE_URL=postgres://example');+});++it('does not delete non-matching variables when saving developer view after searching', function () {+ $application = Application::factory()->create([+ 'environment_id' => $this->environment->id,+ ]);++ EnvironmentVariable::create([+ 'key' => 'API_KEY',+ 'value' => 'secret',+ 'resourceable_type' => Application::class,+ 'resourceable_id' => $application->id,+ ]);++ EnvironmentVariable::create([+ 'key' => 'DATABASE_URL',+ 'value' => 'postgres://example',+ 'resourceable_type' => Application::class,+ 'resourceable_id' => $application->id,+ ]);++ Livewire::test(All::class, ['resource' => $application])+ ->set('search', 'api')+ ->call('switch')+ ->call('submit');++ expect($application->environment_variables()->pluck('key')->all())+ ->toContain('API_KEY')+ ->toContain('DATABASE_URL');+});