From 1802d5d5da9ecdcee940e3c1c2fa4bcc74d771ee Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 16 Apr 2024 10:44:23 +0200 Subject: [PATCH] Add service_type field to Create.php and EditCompose.php --- app/Livewire/Project/Resource/Create.php | 1 + app/Livewire/Project/Service/EditCompose.php | 6 ++-- ...16_083919_add_service_type_on_creation.php | 28 +++++++++++++++++++ .../project/service/edit-compose.blade.php | 6 ++-- 4 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 database/migrations/2024_04_16_083919_add_service_type_on_creation.php diff --git a/app/Livewire/Project/Resource/Create.php b/app/Livewire/Project/Resource/Create.php index 322360534..01ee3efd8 100644 --- a/app/Livewire/Project/Resource/Create.php +++ b/app/Livewire/Project/Resource/Create.php @@ -64,6 +64,7 @@ class Create extends Component 'name' => "$oneClickServiceName-" . str()->random(10), 'docker_compose_raw' => base64_decode($oneClickService), 'environment_id' => $environment->id, + 'service_type' => $oneClickServiceName, 'server_id' => (int) $server_id, 'destination_id' => $destination->id, 'destination_type' => $destination->getMorphClass(), diff --git a/app/Livewire/Project/Service/EditCompose.php b/app/Livewire/Project/Service/EditCompose.php index 84cc45cf2..0f9c449f9 100644 --- a/app/Livewire/Project/Service/EditCompose.php +++ b/app/Livewire/Project/Service/EditCompose.php @@ -13,11 +13,13 @@ class EditCompose extends Component 'service.docker_compose_raw' => 'required', 'service.docker_compose' => 'required', ]; - public function mount() { + public function mount() + { $this->service = Service::find($this->serviceId); } - public function saveEditedCompose() { + public function saveEditedCompose() + { $this->dispatch('info', "Saving new docker compose..."); $this->dispatch('saveCompose', $this->service->docker_compose_raw); } diff --git a/database/migrations/2024_04_16_083919_add_service_type_on_creation.php b/database/migrations/2024_04_16_083919_add_service_type_on_creation.php new file mode 100644 index 000000000..ce91bddbb --- /dev/null +++ b/database/migrations/2024_04_16_083919_add_service_type_on_creation.php @@ -0,0 +1,28 @@ +string('service_type')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('services', function (Blueprint $table) { + $table->dropColumn('service_type'); + }); + } +}; diff --git a/resources/views/livewire/project/service/edit-compose.blade.php b/resources/views/livewire/project/service/edit-compose.blade.php index d3e88f3ae..83931e863 100644 --- a/resources/views/livewire/project/service/edit-compose.blade.php +++ b/resources/views/livewire/project/service/edit-compose.blade.php @@ -12,16 +12,16 @@
-
- Show Deployable Compose + Show Deployable Compose
- Show Source + Show Source Compose
+
Save