dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'patricio-wip-11' into patricio-wip-11-merger

Browse Source 
# Conflicts:
#	app/Http/Livewire/DeployApplication.php
#	app/Jobs/ContainerStatusJob.php
#	bootstrap/helpers.php
This commit is contained in:
Joao Patricio
2023-05-03 06:29:05 +01:00
parent f723b504a1 e7763f3b73
commit 85af1b4ffb
16 changed files with 75 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/ProjectController.php
View File

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

5
app/Http/Livewire/Project/Application/PollDeployment.php
View File

@@ -2,6 +2,7 @@
namespace App\Http\Livewire\Project\Application;
use App\Enums\ActivityTypes;
use Livewire\Component;
use Spatie\Activitylog\Models\Activity;
@@ -14,7 +15,9 @@ class PollDeployment extends Component
public function polling()
{
if ( is_null($this->activity) && isset($this->deployment_uuid)) {
$this->activity = Activity::where('properties->deployment_uuid', '=', $this->deployment_uuid)
$this->activity = Activity::query()
->where('properties->type', '=', ActivityTypes::DEPLOYMENT->value)
->where('properties->type_uuid', '=', $this->deployment_uuid)
->first();
} else {
$this->activity?->refresh();