dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix manual safe button and few simplifications

Browse Source
This commit is contained in:
ayntk-ai
2024-08-12 14:06:00 +02:00
parent c5aba34a6f
commit 93444ea872
2 changed files with 126 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

217
app/Livewire/Project/Shared/EnvironmentVariable/All.php
View File

@@ -9,17 +9,11 @@ use Visus\Cuid2\Cuid2;
class All extends Component class All extends Component
{ {
public $resource; public $resource;
public string $resourceClass; public string $resourceClass;
public bool $showPreview = false; public bool $showPreview = false;
public ?string $modalId = null; public ?string $modalId = null;
public ?string $variables = null; public ?string $variables = null;
public ?string $variablesPreview = null; public ?string $variablesPreview = null;
public string $view = 'normal'; public string $view = 'normal';
protected $listeners = [ protected $listeners = [
@@ -35,25 +29,20 @@ class All extends Component
{ {
$this->resourceClass = get_class($this->resource); $this->resourceClass = get_class($this->resource);
$resourceWithPreviews = ['App\Models\Application']; $resourceWithPreviews = ['App\Models\Application'];
$simpleDockerfile = ! is_null(data_get($this->resource, 'dockerfile')); $simpleDockerfile = !is_null(data_get($this->resource, 'dockerfile'));
if (str($this->resourceClass)->contains($resourceWithPreviews) && ! $simpleDockerfile) { if (str($this->resourceClass)->contains($resourceWithPreviews) && !$simpleDockerfile) {
$this->showPreview = true; $this->showPreview = true;
} }
$this->modalId = new Cuid2; $this->modalId = new Cuid2;
$this->sortMe(); $this->sortMe();
$this->getDevView();
} }
public function sortMe() public function sortMe()
{ {
if ($this->resourceClass === 'App\Models\Application' && data_get($this->resource, 'build_pack') !== 'dockercompose') { if ($this->resourceClass === 'App\Models\Application' && data_get($this->resource, 'build_pack') !== 'dockercompose') {
if ($this->resource->settings->is_env_sorting_enabled) { $sortBy = $this->resource->settings->is_env_sorting_enabled ? 'key' : 'id';
$this->resource->environment_variables = $this->resource->environment_variables->sortBy('key'); $this->resource->environment_variables = $this->resource->environment_variables->sortBy($sortBy);
$this->resource->environment_variables_preview = $this->resource->environment_variables_preview->sortBy('key'); $this->resource->environment_variables_preview = $this->resource->environment_variables_preview->sortBy($sortBy);
} else {
$this->resource->environment_variables = $this->resource->environment_variables->sortBy('id');
$this->resource->environment_variables_preview = $this->resource->environment_variables_preview->sortBy('id');
}
} }
$this->getDevView(); $this->getDevView();
} }
@@ -69,117 +58,147 @@ class All extends Component
public function getDevView() public function getDevView()
{ {
$this->variables = $this->resource->environment_variables->map(function ($item) { $this->variables = $this->formatEnvironmentVariables($this->resource->environment_variables);
if ($this->showPreview) {
$this->variablesPreview = $this->formatEnvironmentVariables($this->resource->environment_variables_preview);
}
}
private function formatEnvironmentVariables($variables)
{
return $variables->map(function ($item) {
if ($item->is_shown_once) { if ($item->is_shown_once) {
return "$item->key=(locked secret)"; return "$item->key=(locked secret)";
} }
if ($item->is_multiline) { if ($item->is_multiline) {
return "$item->key=(multiline, edit in normal view)"; return "$item->key=(multiline, edit in normal view)";
} }
return "$item->key=$item->value"; return "$item->key=$item->value";
})->join(' })->join("\n");
');
if ($this->showPreview) {
$this->variablesPreview = $this->resource->environment_variables_preview->map(function ($item) {
if ($item->is_shown_once) {
return "$item->key=(locked secret)";
}
if ($item->is_multiline) {
return "$item->key=(multiline, edit in normal view)";
}
return "$item->key=$item->value";
})->join('
');
}
} }
public function switch() public function switch()
{ {
if ($this->view === 'normal') { $this->view = $this->view === 'normal' ? 'dev' : 'normal';
$this->view = 'dev';
} else {
$this->view = 'normal';
}
$this->sortMe(); $this->sortMe();
} }
public function submit() public function submit($data = null)
{ {
try { try {
$isPreview = $this->showPreview; if ($data === null) {
$variables = $isPreview ? parseEnvFormatToArray($this->variablesPreview) : parseEnvFormatToArray($this->variables); // Handle saving in developer view
$variables = parseEnvFormatToArray($this->variables);
$this->deleteRemovedVariables(false, $variables);
$this->updateOrCreateVariables(false, $variables);
if ($isPreview) { if ($this->showPreview) {
$this->resource->environment_variables_preview()->whereNotIn('key', array_keys($variables))->delete(); $previewVariables = parseEnvFormatToArray($this->variablesPreview);
} else { $this->deleteRemovedVariables(true, $previewVariables);
$this->resource->environment_variables()->whereNotIn('key', array_keys($variables))->delete(); $this->updateOrCreateVariables(true, $previewVariables);
}
foreach ($variables as $key => $value) {
$found = $isPreview
? $this->resource->environment_variables_preview()->where('key', $key)->first()
: $this->resource->environment_variables()->where('key', $key)->first();
if ($found) {
if (!$found->is_shown_once && !$found->is_multiline) {
$found->value = $value;
$found->save();
}
} else {
$environment = new EnvironmentVariable;
$environment->key = $key;
$environment->value = $value;
$environment->is_build_time = false;
$environment->is_multiline = false;
$environment->is_preview = $isPreview;
$this->setEnvironmentResourceId($environment);
$environment->save();
} }
$this->dispatch('success', 'Environment variables updated.');
} else {
// Handle the case when adding a single variable
$found = $this->resource->environment_variables()->where('key', $data['key'])->first();
if ($found) {
$this->dispatch('error', 'Environment variable already exists.');
return;
}
$environment = new EnvironmentVariable;
$environment->key = $data['key'];
$environment->value = $data['value'];
$environment->is_build_time = $data['is_build_time'] ?? false;
$environment->is_multiline = $data['is_multiline'] ?? false;
$environment->is_literal = $data['is_literal'] ?? false;
$environment->is_preview = $data['is_preview'] ?? false;
$resourceType = $this->resource->type();
$resourceIdField = $this->getResourceIdField($resourceType);
if ($resourceIdField) {
$environment->$resourceIdField = $this->resource->id;
}
$environment->save();
} }
$this->refreshEnvs(); $this->refreshEnvs();
$this->dispatch('success', 'Environment variables saved successfully.'); $this->sortMe();
} catch (\Throwable $e) { } catch (\Throwable $e) {
return handleError($e, $this); return handleError($e, $this);
} }
} }
private function getResourceIdField($resourceType)
{
$resourceTypes = [
'application' => 'application_id',
'standalone-postgresql' => 'standalone_postgresql_id',
'standalone-redis' => 'standalone_redis_id',
'standalone-mongodb' => 'standalone_mongodb_id',
'standalone-mysql' => 'standalone_mysql_id',
'standalone-mariadb' => 'standalone_mariadb_id',
'standalone-keydb' => 'standalone_keydb_id',
'standalone-dragonfly' => 'standalone_dragonfly_id',
'standalone-clickhouse' => 'standalone_clickhouse_id',
'service' => 'service_id',
];
return $resourceTypes[$resourceType] ?? null;
}
private function deleteRemovedVariables($isPreview, $variables)
{
$method = $isPreview ? 'environment_variables_preview' : 'environment_variables';
$this->resource->$method()->whereNotIn('key', array_keys($variables))->delete();
}
private function updateOrCreateVariables($isPreview, $variables)
{
foreach ($variables as $key => $value) {
$method = $isPreview ? 'environment_variables_preview' : 'environment_variables';
$found = $this->resource->$method()->where('key', $key)->first();
if ($found) {
if (!$found->is_shown_once && !$found->is_multiline) {
$found->value = $value;
$found->save();
}
} else {
$environment = new EnvironmentVariable;
$environment->key = $key;
$environment->value = $value;
$environment->is_build_time = false;
$environment->is_multiline = false;
$environment->is_preview = $isPreview;
$this->setEnvironmentResourceId($environment);
$environment->save();
}
}
}
private function setEnvironmentResourceId($environment) private function setEnvironmentResourceId($environment)
{ {
switch ($this->resource->type()) { $resourceTypes = [
case 'application': 'application' => 'application_id',
$environment->application_id = $this->resource->id; 'standalone-postgresql' => 'standalone_postgresql_id',
break; 'standalone-redis' => 'standalone_redis_id',
case 'standalone-postgresql': 'standalone-mongodb' => 'standalone_mongodb_id',
$environment->standalone_postgresql_id = $this->resource->id; 'standalone-mysql' => 'standalone_mysql_id',
break; 'standalone-mariadb' => 'standalone_mariadb_id',
case 'standalone-redis': 'standalone-keydb' => 'standalone_keydb_id',
$environment->standalone_redis_id = $this->resource->id; 'standalone-dragonfly' => 'standalone_dragonfly_id',
break; 'standalone-clickhouse' => 'standalone_clickhouse_id',
case 'standalone-mongodb': 'service' => 'service_id',
$environment->standalone_mongodb_id = $this->resource->id; ];
break;
case 'standalone-mysql': $resourceType = $this->resource->type();
$environment->standalone_mysql_id = $this->resource->id; if (isset($resourceTypes[$resourceType])) {
break; $environment->{$resourceTypes[$resourceType]} = $this->resource->id;
case 'standalone-mariadb':
$environment->standalone_mariadb_id = $this->resource->id;
break;
case 'standalone-keydb':
$environment->standalone_keydb_id = $this->resource->id;
break;
case 'standalone-dragonfly':
$environment->standalone_dragonfly_id = $this->resource->id;
break;
case 'standalone-clickhouse':
$environment->standalone_clickhouse_id = $this->resource->id;
break;
case 'service':
$environment->service_id = $this->resource->id;
break;
} }
} }

14
resources/views/livewire/project/shared/environment-variable/all.blade.php
View File

@@ -2,9 +2,11 @@
<div> <div>
<div class="flex items-center gap-2"> <div class="flex items-center gap-2">
<h2>Environment Variables</h2> <h2>Environment Variables</h2>
<x-modal-input buttonTitle="+ Add" title="New Environment Variable"> <div class="flex flex-col items-center">
<livewire:project.shared.environment-variable.add /> <x-modal-input buttonTitle="+ Add" title="New Environment Variable">
</x-modal-input> <livewire:project.shared.environment-variable.add />
</x-modal-input>
</div>
<x-forms.button <x-forms.button
wire:click='switch'>{{ $view === 'normal' ? 'Developer view' : 'Normal view' }}</x-forms.button> wire:click='switch'>{{ $view === 'normal' ? 'Developer view' : 'Normal view' }}</x-forms.button>
</div> </div>
@@ -49,14 +51,14 @@
@endif @endif
@else @else
<form wire:submit.prevent='submit' class="flex flex-col gap-2"> <form wire:submit.prevent='submit' class="flex flex-col gap-2">
<x-forms.textarea rows="10" class="whitespace-pre-wrap" id="variables"></x-forms.textarea> <x-forms.textarea rows="10" class="whitespace-pre-wrap" id="variables" wire:model="variables" label="Production Environment Variables"></x-forms.textarea>
@if ($showPreview) @if ($showPreview)
<x-forms.textarea rows="10" class="whitespace-pre-wrap" label="Preview Environment Variables" <x-forms.textarea rows="10" class="whitespace-pre-wrap" label="Preview Environment Variables"
id="variablesPreview"></x-forms.textarea> id="variablesPreview" wire:model="variablesPreview"></x-forms.textarea>
@endif @endif
<x-forms.button type="submit" class="btn btn-primary">Save Environment Variables</x-forms.button> <x-forms.button type="submit" class="btn btn-primary">Save All Environment Variables</x-forms.button>
</form> </form>
@endif @endif
</div> </div>