✨ Add Filter for Webhook Deliveries (#967)

0x46616c6b · web-flow · commit b5d01914e077 · 2026-01-10T16:54:31.000+01:00
diff --git a/default_translations/de/messages.de.yml b/default_translations/de/messages.de.yml
@@ -543,6 +543,9 @@ settings:
       title: Zustellungen
       heading: Zustellungen
       subtitle: Kürzliche Webhook-Zustellungen
+      filter:
+        label: Status
+        all: Alle
       table:
         id: ID
         event: Ereignis
diff --git a/default_translations/en/messages.en.yml b/default_translations/en/messages.en.yml
@@ -545,6 +545,9 @@ settings:
       title: Deliveries
       heading: Deliveries
       subtitle: Recent webhook deliveries
+      filter:
+        label: Status
+        all: All
       table:
         id: ID
         event: Event
diff --git a/features/settings_webhook.feature b/features/settings_webhook.feature
@@ -84,6 +84,14 @@ Feature: Settings
     And I should see "Delivered"
     And I should see "Failed"
 
+    When I am on "/settings/webhooks/1/deliveries?status=success"
+    Then the response status code should be 200
+    And I should not see "Retry"
+
+    When I am on "/settings/webhooks/1/deliveries?status=failed"
+    Then the response status code should be 200
+    And I should see "Retry"
+
   @webhooks
   Scenario: Admin can view a delivery for a webhook
     Given the following WebhookEndpoint exists:
diff --git a/src/Controller/WebhookDeliveryController.php b/src/Controller/WebhookDeliveryController.php
@@ -26,14 +26,16 @@ public function index(
         Request $request,
     ): Response {
         $page = $request->query->getInt('page', 1);
-        $pagination = $this->manager->findPaginatedByEndpoint($endpoint, $page);
+        $status = $request->query->getString('status', '');
+        $pagination = $this->manager->findPaginatedByEndpoint($endpoint, $page, $status);
 
         return $this->render('Settings/Webhook/Delivery/index.html.twig', [
             'deliveries' => $pagination['items'],
             'endpoint' => $endpoint,
             'page' => $pagination['page'],
             'totalPages' => $pagination['totalPages'],
             'total' => $pagination['total'],
+            'status' => $status,
         ]);
     }
 
diff --git a/src/Repository/WebhookDeliveryRepository.php b/src/Repository/WebhookDeliveryRepository.php
@@ -28,4 +28,47 @@ public function countByEndpoint(WebhookEndpoint $endpoint): int
             ->getQuery()
             ->getSingleScalarResult();
     }
+
+    public function countByEndpointAndStatus(WebhookEndpoint $endpoint, string $status): int
+    {
+        $qb = $this->createQueryBuilder('d')
+            ->select('COUNT(d.id)')
+            ->where('d.endpoint = :endpoint')
+            ->setParameter('endpoint', $endpoint);
+
+        $this->applyStatusFilter($qb, $status);
+
+        return (int) $qb->getQuery()->getSingleScalarResult();
+    }
+
+    /**
+     * @return WebhookDelivery[]
+     */
+    public function findByEndpointAndStatus(
+        WebhookEndpoint $endpoint,
+        string $status,
+        int $limit,
+        int $offset,
+    ): array {
+        $qb = $this->createQueryBuilder('d')
+            ->where('d.endpoint = :endpoint')
+            ->setParameter('endpoint', $endpoint)
+            ->orderBy('d.id', 'DESC')
+            ->setMaxResults($limit)
+            ->setFirstResult($offset);
+
+        $this->applyStatusFilter($qb, $status);
+
+        return $qb->getQuery()->getResult();
+    }
+
+    private function applyStatusFilter(\Doctrine\ORM\QueryBuilder $qb, string $status): void
+    {
+        match ($status) {
+            'success' => $qb->andWhere('d.success = true'),
+            'failed' => $qb->andWhere('d.error IS NOT NULL')->andWhere('d.success = false'),
+            'pending' => $qb->andWhere('d.error IS NULL')->andWhere('d.success = false'),
+            default => null,
+        };
+    }
 }
diff --git a/src/Service/WebhookDeliveryManager.php b/src/Service/WebhookDeliveryManager.php
@@ -30,14 +30,15 @@ public function __construct(
     public function findPaginatedByEndpoint(
         WebhookEndpoint $endpoint,
         int $page = 1,
+        string $status = '',
     ): array {
         $page = max(1, $page);
         $offset = ($page - 1) * self::PAGE_SIZE;
-        $total = $this->repository->countByEndpoint($endpoint);
-        $totalPages = (int) ceil($total / self::PAGE_SIZE);
-        $items = $this->repository->findBy(
-            ['endpoint' => $endpoint],
-            ['id' => 'DESC'],
+        $total = $this->repository->countByEndpointAndStatus($endpoint, $status);
+        $totalPages = max(1, (int) ceil($total / self::PAGE_SIZE));
+        $items = $this->repository->findByEndpointAndStatus(
+            $endpoint,
+            $status,
             self::PAGE_SIZE,
             $offset,
         );
diff --git a/templates/Settings/Webhook/Delivery/index.html.twig b/templates/Settings/Webhook/Delivery/index.html.twig
@@ -16,11 +16,22 @@
                         <p class="text-sm text-gray-500 dark:text-gray-300 mt-1">{{ 'settings.webhook.deliveries.subtitle'|trans }}</p>
                     </div>
                 </div>
-                <div class="mb-4">
+                <div class="mb-4 flex flex-col sm:flex-row sm:items-center sm:justify-between gap-4">
                     <a href="{{ path('settings_webhook_endpoint_index') }}"
                        class="inline-flex items-center px-3 py-1.5 text-sm text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-lg hover:bg-gray-50 dark:hover:bg-gray-600">
                         {{ ux_icon('heroicons:arrow-left', {class: 'w-4 h-4 mr-1'}) }} {{ 'settings.webhook.actions.back'|trans }}
                     </a>
+                    <div class="flex items-center gap-2">
+                        <label for="status-filter" class="text-sm text-gray-600 dark:text-gray-400">{{ 'settings.webhook.deliveries.filter.label'|trans }}:</label>
+                        <select id="status-filter"
+                                onchange="window.location.href = this.value"
+                                class="px-3 py-1.5 text-sm text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-lg focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500">
+                            <option value="{{ path('settings_webhook_delivery_index', {id: endpoint.id}) }}"{% if status == '' %} selected{% endif %}>{{ 'settings.webhook.deliveries.filter.all'|trans }}</option>
+                            <option value="{{ path('settings_webhook_delivery_index', {id: endpoint.id, status: 'success'}) }}"{% if status == 'success' %} selected{% endif %}>{{ 'settings.webhook.deliveries.status.delivered'|trans }}</option>
+                            <option value="{{ path('settings_webhook_delivery_index', {id: endpoint.id, status: 'failed'}) }}"{% if status == 'failed' %} selected{% endif %}>{{ 'settings.webhook.deliveries.status.failed'|trans }}</option>
+                            <option value="{{ path('settings_webhook_delivery_index', {id: endpoint.id, status: 'pending'}) }}"{% if status == 'pending' %} selected{% endif %}>{{ 'settings.webhook.deliveries.status.pending'|trans }}</option>
+                        </select>
+                    </div>
                 </div>
                 <div class="overflow-hidden">
                     <div class="overflow-x-auto">
@@ -88,7 +99,7 @@
                         </div>
                         <div class="flex gap-2">
                             {% if page > 1 %}
-                                <a href="{{ path('settings_webhook_delivery_index', {id: endpoint.id, page: page - 1}) }}"
+                                <a href="{{ path('settings_webhook_delivery_index', {id: endpoint.id, page: page - 1, status: status}|filter(v => v)) }}"
                                    class="inline-flex items-center px-3 py-1.5 text-sm text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-lg hover:bg-gray-50 dark:hover:bg-gray-600">
                                     {{ ux_icon('heroicons:chevron-left', {class: 'w-4 h-4 mr-1'}) }} {{ 'settings.webhook.deliveries.pagination.newer'|trans }}
                                 </a>
@@ -97,7 +108,7 @@
                                 {{ 'settings.webhook.deliveries.pagination.page'|trans({'%page%': page, '%totalPages%': totalPages}) }}
                             </span>
                             {% if page < totalPages %}
-                                <a href="{{ path('settings_webhook_delivery_index', {id: endpoint.id, page: page + 1}) }}"
+                                <a href="{{ path('settings_webhook_delivery_index', {id: endpoint.id, page: page + 1, status: status}|filter(v => v)) }}"
                                    class="inline-flex items-center px-3 py-1.5 text-sm text-gray-700 dark:text-gray-300 bg-white dark:bg-gray-700 border border-gray-300 dark:border-gray-600 rounded-lg hover:bg-gray-50 dark:hover:bg-gray-600">
                                     {{ 'settings.webhook.deliveries.pagination.older'|trans }} {{ ux_icon('heroicons:chevron-right', {class: 'w-4 h-4 ml-1'}) }}
                                 </a>
diff --git a/tests/Service/WebhookDeliveryManagerTest.php b/tests/Service/WebhookDeliveryManagerTest.php
@@ -27,12 +27,12 @@ public function testFindPaginatedByEndpointReturnsDeliveries(): void
 
         $repo = $this->createMock(WebhookDeliveryRepository::class);
         $repo->expects($this->once())
-            ->method('countByEndpoint')
-            ->with($endpoint)
+            ->method('countByEndpointAndStatus')
+            ->with($endpoint, '')
             ->willReturn(2);
         $repo->expects($this->once())
-            ->method('findBy')
-            ->with(['endpoint' => $endpoint], ['id' => 'DESC'], 20, 0)
+            ->method('findByEndpointAndStatus')
+            ->with($endpoint, '', 20, 0)
             ->willReturn([$d2, $d1]);
 
         $em = $this->createMock(EntityManagerInterface::class);
