diff --git a/resources/views/livewire/monitors/card.blade.php b/resources/views/livewire/monitors/card.blade.php index 75efe22..1756628 100644 --- a/resources/views/livewire/monitors/card.blade.php +++ b/resources/views/livewire/monitors/card.blade.php @@ -56,6 +56,7 @@ public function placeholder()
+ {{ strtoupper($monitor->type == 'USER' ? $monitor->login_name : $monitor->organization_name) }} / {{ strtoupper($monitor->title) }} diff --git a/resources/views/livewire/monitors/dashboard/index.blade.php b/resources/views/livewire/monitors/dashboard/index.blade.php index 4177f7f..4542dff 100644 --- a/resources/views/livewire/monitors/dashboard/index.blade.php +++ b/resources/views/livewire/monitors/dashboard/index.blade.php @@ -5,6 +5,7 @@ new class extends Component { public Monitor $monitor; + public function mount(Monitor $monitor) { $this->monitor = $monitor; diff --git a/resources/views/livewire/monitors/dashboard/monitor-dashboard.blade.php b/resources/views/livewire/monitors/dashboard/monitor-dashboard.blade.php index a37533b..98931a4 100644 --- a/resources/views/livewire/monitors/dashboard/monitor-dashboard.blade.php +++ b/resources/views/livewire/monitors/dashboard/monitor-dashboard.blade.php @@ -19,6 +19,8 @@ public Monitor $monitor; public $dataFetched = false; + public $tasks = []; + public function mount(Monitor $monitor) { @@ -47,15 +49,14 @@ protected function calculate_statistics(): void $allMilestonesEmpty = true; foreach ($this->monitor->repositories as $repository) { - foreach ($repository->milestones as $milestone) { - if (!$milestone->tasks()->get()->isEmpty()) { - $allMilestonesEmpty = false; - break 2; - } - } + $repositoryTasks = $repository->milestones->flatMap(function ($milestone) { + return $milestone->tasks; + }); + + $this->tasks = array_merge($this->tasks, $repositoryTasks->all()); } - if ($allMilestonesEmpty) { + if (empty($this->tasks)) { $this->reload_issues(); } diff --git a/resources/views/livewire/monitors/index.blade.php b/resources/views/livewire/monitors/index.blade.php index 3718712..3126861 100644 --- a/resources/views/livewire/monitors/index.blade.php +++ b/resources/views/livewire/monitors/index.blade.php @@ -35,6 +35,8 @@ public function updatedSearch()
+ + diff --git a/resources/views/livewire/monitors/show.blade.php b/resources/views/livewire/monitors/show.blade.php index 7f0e56b..aa870a8 100644 --- a/resources/views/livewire/monitors/show.blade.php +++ b/resources/views/livewire/monitors/show.blade.php @@ -15,6 +15,9 @@ public function mount(Monitor $monitor)