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

fix: deployment_uuid -> type_uuid

Browse Source
This commit is contained in:
Andras Bacsai 2023-05-03 08:51:03 +02:00
parent 83392dd8dc
commit f6c7343b70
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/ApplicationController.php
View File

@ -56,7 +56,7 @@ class ApplicationController extends Controller
if (!$application) {
return redirect()->route('dashboard');
}
$activity = Activity::where('properties->deployment_uuid', '=', $deployment_uuid)->first();
$activity = Activity::where('properties->type_uuid', '=', $deployment_uuid)->first();
return view('project.application.deployment', [
'application' => $application,

2
app/Http/Livewire/Project/Application/GetDeployments.php
View File

@ -12,7 +12,7 @@ class GetDeployments extends Component
public string $status;
public function polling()
{
$activity = Activity::where('properties->deployment_uuid', '=', $this->deployment_uuid)->first();
$activity = Activity::where('properties->type_uuid', '=', $this->deployment_uuid)->first();
$this->created_at = $activity->created_at;
$this->status = data_get($activity, 'properties.status');
}

5
app/Models/Application.php
View File

@ -94,13 +94,12 @@ class Application extends BaseModel
return $this->morphMany(LocalPersistentVolume::class, 'resource');
}
public function deployments()
{
return Activity::where('subject_id', $this->id)->where('properties->deployment_uuid', '!=', null)->orderBy('created_at', 'desc')->get();
return Activity::where('subject_id', $this->id)->where('properties->type', '=', 'deployment')->orderBy('created_at', 'desc')->get();
}
public function get_deployment(string $deployment_uuid)
{
return Activity::where('subject_id', $this->id)->where('properties->deployment_uuid', '=', $deployment_uuid)->first();
return Activity::where('subject_id', $this->id)->where('properties->type_uuid', '=', $deployment_uuid)->first();
}
}

2
resources/views/project/application/deployments.blade.php
View File

@ -3,7 +3,7 @@
<x-applications.navbar :applicationId="$application->id" />
<div class="pt-2">
@forelse ($deployments as $deployment)
<livewire:project.application.get-deployments :deployment_uuid="data_get($deployment->properties, 'deployment_uuid')" :created_at="data_get($deployment, 'created_at')" :status="data_get($deployment->properties, 'status')" />
<livewire:project.application.get-deployments :deployment_uuid="data_get($deployment->properties, 'type_uuid')" :created_at="data_get($deployment, 'created_at')" :status="data_get($deployment->properties, 'status')" />
@empty
<p>No deployments found.</p>
@endforelse