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

fix: slash in env names

Browse Source 
ui: placement of env switcher
This commit is contained in:
Andras Bacsai 2024-06-23 17:47:58 +02:00
parent a3255f3ab0
commit 76ba365325
5 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Console/Commands/Init.php
View File

@ -5,6 +5,7 @@
use App\Enums\ApplicationDeploymentStatus; use App\Enums\ApplicationDeploymentStatus;
use App\Jobs\CleanupHelperContainersJob; use App\Jobs\CleanupHelperContainersJob;
use App\Models\ApplicationDeploymentQueue; use App\Models\ApplicationDeploymentQueue;
use App\Models\Environment;
use App\Models\InstanceSettings; use App\Models\InstanceSettings;
use App\Models\ScheduledDatabaseBackup; use App\Models\ScheduledDatabaseBackup;
use App\Models\Server; use App\Models\Server;
@ -24,6 +25,8 @@ public function handle()
get_public_ips(); get_public_ips();
$full_cleanup = $this->option('full-cleanup'); $full_cleanup = $this->option('full-cleanup');
$cleanup_deployments = $this->option('cleanup-deployments'); $cleanup_deployments = $this->option('cleanup-deployments');
$this->replace_slash_in_environment_name();
if ($cleanup_deployments) { if ($cleanup_deployments) {
echo "Running cleanup deployments.\n"; echo "Running cleanup deployments.\n";
$this->cleanup_in_progress_application_deployments(); $this->cleanup_in_progress_application_deployments();
@ -150,4 +153,15 @@ private function cleanup_in_progress_application_deployments()
echo "Error: {$e->getMessage()}\n"; echo "Error: {$e->getMessage()}\n";
} }
} }
private function replace_slash_in_environment_name()
{
$environments = Environment::all();
foreach ($environments as $environment) {
if (str_contains($environment->name, '/')) {
$environment->name = str_replace('/', '-', $environment->name);
$environment->save();
}
}
}
} }

2
app/Models/Environment.php
View File

@ -109,7 +109,7 @@ public function services()
protected function name(): Attribute protected function name(): Attribute
{ {
return Attribute::make( return Attribute::make(
set: fn (string $value) => strtolower($value), set: fn (string $value) => str($value)->lower()->trim()->replace('/', '-')->toString(),
); );
} }
} }

6
resources/views/livewire/project/environment-edit.blade.php
View File

@ -27,12 +27,6 @@
<div class="flex items-center"> <div class="flex items-center">
<a class="text-xs truncate lg:text-sm" <a class="text-xs truncate lg:text-sm"
href="{{ route('project.resource.index', ['environment_name' => data_get($parameters, 'environment_name'), 'project_uuid' => data_get($parameters, 'project_uuid')]) }}">{{ data_get($parameters, 'environment_name') }}</a> href="{{ route('project.resource.index', ['environment_name' => data_get($parameters, 'environment_name'), 'project_uuid' => data_get($parameters, 'project_uuid')]) }}">{{ data_get($parameters, 'environment_name') }}</a>
<svg aria-hidden="true" class="w-4 h-4 mx-1 font-bold dark:text-warning" fill="currentColor"
viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd"
d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
clip-rule="evenodd"></path>
</svg>
</div> </div>
</li> </li>
<li> <li>

16
resources/views/livewire/project/resource/environment-select.blade.php
View File

@ -1,8 +1,8 @@
<x-forms.select label="Switch Environment" wire:model.live="selectedEnvironment"> <x-forms.select wire:model.live="selectedEnvironment">
<option value="edit">Create/Edit Environments</option> <option value="edit">Create/Edit Environments</option>
<option disabled>-----</option> <option disabled>-----</option>
@foreach ($environments as $environment) @foreach ($environments as $environment)
<option value="{{ $environment->name }}">{{ $environment->name }} <option value="{{ $environment->name }}">{{ $environment->name }}
</option> </option>
@endforeach @endforeach
</x-forms.select> </x-forms.select>

11
resources/views/livewire/project/resource/index.blade.php
View File

@ -21,7 +21,7 @@ class="button">+
@endif @endif
<livewire:project.delete-environment :disabled="!$environment->isEmpty()" :environment_id="$environment->id" /> <livewire:project.delete-environment :disabled="!$environment->isEmpty()" :environment_id="$environment->id" />
</div> </div>
<nav class="flex pt-2 pb-10"> <nav class="flex pt-2 pb-6">
<ol class="flex items-center"> <ol class="flex items-center">
<li class="inline-flex items-center"> <li class="inline-flex items-center">
<a class="text-xs truncate lg:text-sm" <a class="text-xs truncate lg:text-sm"
@ -37,16 +37,15 @@ class="button">+
clip-rule="evenodd"></path> clip-rule="evenodd"></path>
</svg> </svg>
<a class="text-xs truncate lg:text-sm" <livewire:project.resource.environment-select :environments="$project->environments" />
href="{{ route('project.resource.index', ['environment_name' => request()->route('environment_name'), 'project_uuid' => request()->route('project_uuid')]) }}">{{ request()->route('environment_name') }}</a>
</div> </div>
</li> </li>
<li>
</li>
</ol> </ol>
</nav> </nav>
</div> </div>
<div class="pb-4">
<livewire:project.resource.environment-select :environments="$project->environments" />
</div>
@if ($environment->isEmpty()) @if ($environment->isEmpty())
<a href="{{ route('project.resource.create', ['project_uuid' => request()->route('project_uuid'), 'environment_name' => request()->route('environment_name')]) }} " <a href="{{ route('project.resource.create', ['project_uuid' => request()->route('project_uuid'), 'environment_name' => request()->route('environment_name')]) }} "
class="items-center justify-center box">+ Add New Resource</a> class="items-center justify-center box">+ Add New Resource</a>