Merge pull request #106 from kbond/available-message-type

feat!: refactor message type filter

src/History/Filters.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /*
  * This file is part of the zenstruck/messenger-monitor-bundle package.
  *
@@ -14,19 +12,22 @@
 namespace Zenstruck\Messenger\Monitor\History;
 
 use Zenstruck\Collection;
+use Zenstruck\Messenger\Monitor\Type;
 
 final class Filters
 {
-    /** @var Collection<int, string> */
+    /** @var Collection<int,Type> */
     private Collection $availableMessageTypes;
 
     public function __construct(private readonly Storage $storage, private readonly Specification $specification)
     {
     }
 
-    /** @return Collection<int, string> */
+    /** @return Collection<int,Type> */
     public function availableMessageTypes(): Collection
     {
-        return $this->availableMessageTypes ??= $this->storage->availableMessageTypes($this->specification)->eager();
+        return $this->availableMessageTypes ??= $this->storage->availableMessageTypes($this->specification)->eager()->map(
+            static fn(string $type) => new Type($type)
+        );
     }
 }

src/History/Model/ProcessedMessage.php

@@ -85,7 +85,7 @@ final public function attempt(): int
     }
 
     /**
-     * @return Type<object>
+     * @return Type
      */
     final public function type(): Type
     {

src/History/Model/Result.php

@@ -40,7 +40,7 @@ public function isFailure(): bool
     }
 
     /**
-     * @return Type<object>|null
+     * @return Type|null
      */
     public function handler(): ?Type
     {

src/History/Storage.php

@@ -41,7 +41,7 @@ public function averageHandlingTime(Specification $specification): ?float;
     public function count(Specification $specification): int;
 
     /**
-     * @return Collection<int,string>
+     * @return Collection<int,class-string>
      */
     public function availableMessageTypes(Specification $specification): Collection;
 }

src/History/Storage/ORMStorage.php

@@ -85,7 +85,7 @@ public function availableMessageTypes(Specification $specification): Collection
             ->orderBy('m.type', 'ASC')
         ;
 
-        return (new EntityResult($qb))->asString();
+        return (new EntityResult($qb))->asString(); // @phpstan-ignore-line
     }
 
     public function averageWaitTime(Specification $specification): ?float

src/Schedule/MessageInfo.php

@@ -47,7 +47,7 @@ public function redispatchTransports(): array
     }
 
     /**
-     * @return Type<object>
+     * @return Type
      */
     public function type(): Type
     {

src/Transport/QueuedMessage.php

@@ -37,7 +37,7 @@ public function id(): mixed
     }
 
     /**
-     * @return Type<object>
+     * @return Type
      */
     public function message(): Type
     {

src/Type.php

@@ -14,7 +14,7 @@
 /**
  * @author Kevin Bond <[email protected]>
  *
- * @template T of object
+ * @template T of object = object
  */
 final class Type implements \Stringable
 {

templates/history.html.twig

@@ -76,7 +76,7 @@
 
             <div class="btn-group me-2" role="group">
                 {% set current_type = app.request.query.get('type', 'All') %}
-                <button type="button" class="btn {{ current_type != 'All' ? 'btn-outline-primary' : 'btn-light' }} dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+                <button type="button" class="btn {{ current_type != 'All' ? 'btn-outline-primary' : 'btn-light' }} dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false" {% if current_type == 'All' and not filters.availableMessageTypes|length %}disabled{% endif %}>
                     <small class="text-body-secondary">Message type:</small> {{ current_type }}
                 </button>
                 <ul class="dropdown-menu">
@@ -85,9 +85,9 @@
                     {% endif %}
 
                     {% for type in filters.availableMessageTypes %}
-                        {% if type != current_type %}
-                            <li><a class="dropdown-item" href="{{ path(app.current_route, app.request.query.all|merge({type: type})) }}">
-                                    {{ type | split('\\') | last }} <br>
+                        {% if type.class != current_type %}
+                            <li><a class="dropdown-item" href="{{ path(app.current_route, app.request.query.all|merge({type: type.class})) }}">
+                                    {{ type.shortName }} <br>
                                     <small class="text-secondary">{{ type }}</small>
                                 </a>
                             </li>