From 8575712931d052831edbecf43c54388f87c303bc Mon Sep 17 00:00:00 2001 From: Harry Bayliss Date: Thu, 22 May 2025 18:06:08 +0100 Subject: [PATCH] step name --- app/Http/Controllers/ServerController.php | 2 +- app/Jobs/Services/DeployService.php | 1 + .../2025_03_31_141005_create_steps_table.php | 1 + resources/js/pages/servers/Show.vue | 31 ++++++++++++++++--- 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php index 6552af7..8af2792 100644 --- a/app/Http/Controllers/ServerController.php +++ b/app/Http/Controllers/ServerController.php @@ -143,7 +143,7 @@ class ServerController extends Controller $server = $organisation->servers()->findOrFail($request->route('server')); return inertia('servers/Show', [ - 'server' => $server->load('services.slices'), + 'server' => $server->load('services.slices', 'serviceDeployments.steps', 'serviceDeployments.target'), ]); } } diff --git a/app/Jobs/Services/DeployService.php b/app/Jobs/Services/DeployService.php index c27a8a0..751a79e 100644 --- a/app/Jobs/Services/DeployService.php +++ b/app/Jobs/Services/DeployService.php @@ -33,6 +33,7 @@ class DeployService implements ShouldQueue $deploymentPlan = $driver->getDeploymentPlan($this->deployment->hash); foreach ($deploymentPlan->steps as $index => $plannedStep) { $step = $this->deployment->steps()->create([ + 'name' => $plannedStep->name, 'order' => $index + 1, 'status' => DeploymentStatus::PENDING, 'script' => $plannedStep->getSafeScript(), diff --git a/database/migrations/2025_03_31_141005_create_steps_table.php b/database/migrations/2025_03_31_141005_create_steps_table.php index ea24386..2e35ac5 100644 --- a/database/migrations/2025_03_31_141005_create_steps_table.php +++ b/database/migrations/2025_03_31_141005_create_steps_table.php @@ -12,6 +12,7 @@ return new class extends Migration Schema::create('steps', function (Blueprint $table) { $table->id(); $table->foreignIdFor(Deployment::class); + $table->string('name'); $table->integer('order'); $table->string('status'); $table->longText('script'); diff --git a/resources/js/pages/servers/Show.vue b/resources/js/pages/servers/Show.vue index af6e3bd..669b186 100644 --- a/resources/js/pages/servers/Show.vue +++ b/resources/js/pages/servers/Show.vue @@ -1,7 +1,7 @@