Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

prepare: global env variables

Browse Source
This commit is contained in:
Andras Bacsai 2023-09-11 22:29:47 +02:00
parent 8a39a4469a
commit f79c741d95
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Livewire/Project/Shared/EnvironmentVariable/All.php
View File

@ -77,6 +77,11 @@ class All extends Component
$environment->save(); $environment->save();
} }
} }
if ($isPreview) {
$this->emit('success', 'Preview environment variables updated successfully.');
} else {
$this->emit('success', 'Environment variables updated successfully.');
}
$this->refreshEnvs(); $this->refreshEnvs();
} }
public function refreshEnvs() public function refreshEnvs()

26
app/Models/EnvironmentVariable.php
View File

@ -20,7 +20,7 @@ class EnvironmentVariable extends Model
{ {
static::created(function ($environment_variable) { static::created(function ($environment_variable) {
if ($environment_variable->application_id && !$environment_variable->is_preview) { if ($environment_variable->application_id && !$environment_variable->is_preview) {
$found = ModelsEnvironmentVariable::where('key', $environment_variable->key)->where('application_id', $environment_variable->application_id)->where('is_preview',true)->first(); $found = ModelsEnvironmentVariable::where('key', $environment_variable->key)->where('application_id', $environment_variable->application_id)->where('is_preview', true)->first();
if (!$found) { if (!$found) {
ModelsEnvironmentVariable::create([ ModelsEnvironmentVariable::create([
'key' => $environment_variable->key, 'key' => $environment_variable->key,
@ -45,26 +45,22 @@ class EnvironmentVariable extends Model
private function get_environment_variables(string $environment_variable): string|null private function get_environment_variables(string $environment_variable): string|null
{ {
// $team_id = currentTeam()->id; // $team_id = currentTeam()->id;
if (str_contains(trim($environment_variable), '{{') && str_contains(trim($environment_variable), '}}')) { $environment_variable = trim(decrypt($environment_variable));
$environment_variable = preg_replace('/\s+/', '', $environment_variable); if (Str::startsWith($environment_variable, '{{') && Str::endsWith($environment_variable, '}}') && Str::contains($environment_variable, 'global.')) {
$environment_variable = str_replace('{{', '', $environment_variable); $variable = Str::after($environment_variable, 'global.');
$environment_variable = str_replace('}}', '', $environment_variable); $variable = Str::before($variable, '}}');
if (str_starts_with($environment_variable, 'global.')) { $variable = Str::of($variable)->trim()->value;
$environment_variable = str_replace('global.', '', $environment_variable); // $environment_variable = GlobalEnvironmentVariable::where('name', $environment_variable)->where('team_id', $team_id)->first()?->value;
// $environment_variable = GlobalEnvironmentVariable::where('name', $environment_variable)->where('team_id', $team_id)->first()?->value; ray('global env variable');
return $environment_variable; return $environment_variable;
}
} }
return decrypt($environment_variable); return $environment_variable;
} }
private function set_environment_variables(string $environment_variable): string|null private function set_environment_variables(string $environment_variable): string|null
{ {
$environment_variable = trim($environment_variable); $environment_variable = trim($environment_variable);
if (!str_contains(trim($environment_variable), '{{') && !str_contains(trim($environment_variable), '}}')) { return encrypt($environment_variable);
return encrypt($environment_variable);
}
return $environment_variable;
} }
protected function key(): Attribute protected function key(): Attribute