fix: splits monitor widget types to complete and active

src/Download/Framework/Repository/DownloadRepository.php

@@ -25,7 +25,7 @@ class DownloadRepository extends ServiceEntityRepository
         $this->paginator = $paginator;
     }
 
-    public function getCompletePaginated(UserInterface $user, int $pageNumber = 1, int $perPage = 10)
+    public function getCompletePaginated(UserInterface $user, int $pageNumber = 1, int $perPage = 10): Paginator
     {
         $query = $this->createQueryBuilder('d')
             ->andWhere('d.status IN (:statuses)')
@@ -38,7 +38,7 @@ class DownloadRepository extends ServiceEntityRepository
         return $this->paginator->paginate($query, $pageNumber, $perPage);
     }
 
-    public function getActivePaginated(UserInterface $user, int $pageNumber = 1, int $perPage = 5)
+    public function getActivePaginated(UserInterface $user, int $pageNumber = 1, int $perPage = 5): Paginator
     {
         $query = $this->createQueryBuilder('d')
             ->andWhere('d.status IN (:statuses)')

src/Monitor/Framework/Controller/WebController.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Monitor\Framework\Controller;
+
+use App\Download\Action\Input\DeleteDownloadInput;
+use App\Monitor\Action\Handler\AddMonitorHandler;
+use App\Monitor\Action\Handler\DeleteMonitorHandler;
+use App\Monitor\Action\Input\AddMonitorInput;
+use App\Monitor\Action\Input\DeleteMonitorInput;
+use App\Monitor\Framework\Repository\MonitorRepository;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\Mercure\HubInterface;
+use Symfony\Component\Mercure\Update;
+use Symfony\Component\Routing\Attribute\Route;
+use Twig\Environment;
+
+class WebController extends AbstractController
+{
+    public function __construct(
+        #[Autowire(service: 'twig')]
+        private readonly Environment $renderer,
+    ) {}
+
+    #[Route('/monitors', name: 'app_monitors', methods: ['GET'])]
+    public function addMonitor()
+    {
+        return $this->render('monitor/index.html.twig');
+    }
+}

src/Monitor/Framework/Repository/MonitorRepository.php

@@ -21,7 +21,7 @@ class MonitorRepository extends ServiceEntityRepository
         $this->paginator = $paginator;
     }
 
-    public function getUserMonitorsPaginated(UserInterface $user, int $page, int $perPage)
+    public function getUserMonitorsPaginated(UserInterface $user, int $page, int $perPage): Paginator
     {
         $query = $this->createQueryBuilder('m')
             ->andWhere('m.status IN (:statuses)')

src/Twig/Components/DownloadList.php

@@ -16,15 +16,11 @@ final class DownloadList extends AbstractController
 {
     use DefaultActionTrait;
 
+    use PaginateTrait;
+
     #[LiveProp(writable: true)]
     public string $type;
 
-    #[LiveProp(writable: true)]
-    public int $pageNumber = 1;
-
-    #[LiveProp(writable: true)]
-    public int $perPage = 5;
-
     #[LiveProp(writable: true)]
     public bool $isWidget = true;
 
@@ -42,10 +38,4 @@ final class DownloadList extends AbstractController
 
         return [];
     }
-
-    #[LiveAction]
-    public function paginate(#[LiveArg] int $page)
-    {
-        $this->pageNumber = $page;
-    }
 }

src/Twig/Components/MonitorList.php

@@ -4,13 +4,22 @@ namespace App\Twig\Components;
 
 use App\Monitor\Framework\Repository\MonitorRepository;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
 use Symfony\UX\LiveComponent\Attribute\LiveAction;
-use Symfony\UX\LiveComponent\Attribute\LiveArg;
-use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
+use Symfony\UX\LiveComponent\Attribute\LiveProp;
+use Symfony\UX\LiveComponent\DefaultActionTrait;
 
-#[AsTwigComponent]
+#[AsLiveComponent]
 final class MonitorList extends AbstractController
 {
+    use DefaultActionTrait;
+
+    use PaginateTrait;
+
+    #[LiveProp(writable: true)]
+    public string $type;
+
+    #[LiveProp(writable: true)]
     public bool $isWidget = true;
 
     public function __construct(
@@ -18,8 +27,34 @@ final class MonitorList extends AbstractController
     ) {}
 
     #[LiveAction]
-    public function getUserMonitors(#[LiveArg] int $page = 1, #[LiveArg] int $perPage = 5)
+    public function getMonitors()
     {
-        return $this->monitorRepository->getUserMonitorsPaginated($this->getUser(), $page, $perPage);
+        if ($this->type === "active") {
+            return $this->getActiveUserMonitors();
+        } elseif ($this->type === "complete") {
+            return $this->getCompleteUserMonitors();
+        }
+
+        return [];
+    }
+
+    #[LiveAction]
+    public function getActiveUserMonitors()
+    {
+        return $this->asPaginator($this->monitorRepository->createQueryBuilder('m')
+            ->andWhere('m.status IN (:statuses)')
+            ->setParameter('statuses', ['New', 'In Progress'])
+            ->getQuery()
+        );
+    }
+
+    #[LiveAction]
+    public function getCompleteUserMonitors()
+    {
+        return $this->asPaginator($this->monitorRepository->createQueryBuilder('m')
+            ->andWhere('m.status = :status')
+            ->setParameter('status', 'Complete')
+            ->getQuery()
+        );
     }
 }

src/Twig/Components/PaginateTrait.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Twig\Components;
+
+use App\Util\Paginator;
+use Doctrine\ORM\Query;
+use Symfony\UX\LiveComponent\Attribute\LiveAction;
+use Symfony\UX\LiveComponent\Attribute\LiveArg;
+use Symfony\UX\LiveComponent\Attribute\LiveProp;
+
+trait PaginateTrait
+{
+    #[LiveProp(writable: true)]
+    public int $pageNumber = 1;
+
+    #[LiveProp(writable: true)]
+    public int $perPage = 5;
+
+    #[LiveAction]
+    public function paginate(#[LiveArg] int $page)
+    {
+        $this->pageNumber = $page;
+    }
+
+    private function asPaginator(Query $query): Paginator
+    {
+        return (new Paginator())
+            ->paginate($query, $this->pageNumber, $this->perPage);
+    }
+}

templates/components/MonitorList.html.twig

@@ -26,8 +26,8 @@
         </tr>
         </thead>
         <tbody id="monitors" class="divide-y divide-gray-50">
-        {% if this.userMonitors.items|length > 0 %}
-            {% for monitor in this.userMonitors.items %}
+        {% if this.monitors.items|length > 0 %}
+            {% for monitor in this.monitors.items %}
                 <tr  id="monitor_{{ monitor.id }}">
                     <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-stone-800 min-w-[50ch] max-w-[50ch] truncate">
                         {{ monitor.title }}
@@ -61,10 +61,10 @@
                     </td>
                 </tr>
             {% endfor %}
-            {% if this.userMonitors.items|length > 5 %}
+            {% if this.isWidget and this.monitors.items|length > 5 %}
                 <tr  id="monitor_view_all">
                     <td colspan="100%" class="py-2 whitespace-nowrap bg-orange-500 uppercase text-sm font-medium text-center text-white min-w-[50ch] max-w-[50ch] truncate">
-                        <a href="#">View All Monitors</a>
+                        <a href="{{ path('app_monitors') }}">View All Monitors</a>
                     </td>
                 </tr>
             {% endif %}
@@ -79,8 +79,8 @@
     </table>
 
     {% if this.isWidget == false %}
-        {% if this.userMonitors.items|length > 0 %}
-            {% set paginator = this.userMonitors %}
+        {% if this.monitors.items|length > 0 %}
+            {% set paginator = this.monitors %}
             {% include 'partial/paginator.html.twig' %}
         {% endif %}
     {% endif %}

templates/components/NavBar.html.twig

@@ -20,6 +20,15 @@
                 </a>
             </li>
 
+            <li>
+                <a href="{{ path('app_monitors') }}"
+                   class="block rounded-lg
+                         bg-orange-500 hover:bg-opacity-80 bg-clip-padding backdrop-filter backdrop-blur-md bg-opacity-60
+                         px-4 py-2 text-sm font-medium text-gray-50">
+                    Monitors
+                </a>
+            </li>
+
             <li>
                 <a href="{{ path('app_user_preferences') }}"
                    class="block rounded-lg px-4 py-2 text-sm font-medium text-gray-50 hover:bg-gray-100 hover:text-stone-700">

templates/index/index.html.twig

@@ -16,7 +16,7 @@
         </div>
         <div class="flex flex-row gap-4">
             <twig:Card title="Monitors" class="w-full">
-                <twig:MonitorList />
+                <twig:MonitorList :type="'active'" :isWidget="true" />
             </twig:Card>
         </div>
         <div class="flex flex-col gap-4">

templates/monitor/index.html.twig

@@ -0,0 +1,18 @@
+{% extends 'base.html.twig' %}
+
+{% block title %}Monitors — Torsearch{% endblock %}
+{% block h2 %}Monitors{% endblock %}
+
+{% block body %}
+    <div class="p-4">
+        <twig:Card title="Active Monitors">
+            <twig:MonitorList :type="'active'" :isWidget="false" :perPage="10"></twig:MonitorList>
+        </twig:Card>
+    </div>
+
+    <div class="p-4">
+        <twig:Card title="Complete Monitors">
+            <twig:MonitorList :type="'complete'" :isWidget="false" :perPage="10"></twig:MonitorList>
+        </twig:Card>
+    </div>
+{% endblock %}