feat: quick fix collect tasks in temp array

propromo-software · Oct 2, 2024 · abdf121 · abdf121
1 parent 74647ba
commit abdf121
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/resources/views/livewire/monitors/card.blade.php b/resources/views/livewire/monitors/card.blade.php
@@ -56,6 +56,7 @@ public function placeholder()
 
 <div class="w-full p-5 items-center rounded-xl">
     <div class="flex items-center justify-between mb-5">
+
         <a  class="text-secondary-grey text-lg font-sourceSansPro font-bold rounded-md border-2 border-other-grey px-6 py-3" href="/monitors/{{ $monitor->id }}" title="Show Monitor">
             {{ strtoupper($monitor->type == 'USER' ? $monitor->login_name : $monitor->organization_name) }} / {{ strtoupper($monitor->title) }}
         </a>

diff --git 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
@@ -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
@@ -35,6 +35,8 @@ public function updatedSearch()
 
 <div class="mt-4 mx-8">
 
+
+
     <sl-input wire:ignore wire:model.live="search" class="w-max" placeholder="Search for a monitor...">
         <sl-icon name="search" slot="prefix"></sl-icon>
     </sl-input>

diff --git 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)
 
 <div>
     <div class="mx-8 mt-6">
+        <a href="/monitors" title="Show Monitor" class="flex items-center mb-2">
+            <sl-icon class="cursor-pointer text-primary-blue text-4xl rounded-md border-2 p-2 border-other-grey" name="arrow-left-short" wire:ignore></sl-icon>
+        </a>
         <div class="border-other-grey border-2 rounded-2xl">
             <livewire:monitors.card lazy="true" :monitor="$monitor"/>
         </div>