feat(webhook): delivery list — server-side фильтр по status
Раньше при page=50 admin не мог найти редкий dlq среди
delivered'ов: client-side filter показал бы 1 совпадение из 50,
а на page=1 могли быть ещё. Делаем server-side через ?status=.
Backend:
- WebhookDeliveryRepository.findBySubscriptionIdAndStatusOrderByCreatedAtDesc
— Spring Data derived query, JPA генерирует SQL.
- GET /admin/webhooks/subscriptions/{id}/deliveries?status=dlq —
опциональный param. Invalid status → 400 OrdinisException.
Allowed: pending, retrying, delivered, dlq.
UI:
- 4 chip'а pending/retrying/delivered/dlq над таблицей deliveries
(одинаковый паттерн со scope-чипами в dictionaries).
- Click toggle + reset page=0. 'Сбросить' появляется когда фильтр
активен.
- Status в URL пока не персистится — для одной session-страницы
не критично.
This commit is contained in:
@@ -220,21 +220,33 @@ export const useWebhookSubscription = (id: string) =>
|
|||||||
enabled: Boolean(id),
|
enabled: Boolean(id),
|
||||||
})
|
})
|
||||||
|
|
||||||
export const webhookDeliveriesQuery = (id: string, page: number, size: number) =>
|
export const webhookDeliveriesQuery = (
|
||||||
|
id: string,
|
||||||
|
page: number,
|
||||||
|
size: number,
|
||||||
|
statusFilter?: string,
|
||||||
|
) =>
|
||||||
queryOptions({
|
queryOptions({
|
||||||
queryKey: ['webhooks', 'deliveries', id, page, size] as const,
|
queryKey: ['webhooks', 'deliveries', id, page, size, statusFilter ?? null] as const,
|
||||||
queryFn: async (): Promise<WebhookDeliveryPage> => {
|
queryFn: async (): Promise<WebhookDeliveryPage> => {
|
||||||
|
const params: Record<string, string | number> = { page, size }
|
||||||
|
if (statusFilter) params.status = statusFilter
|
||||||
const { data } = await apiClient.get<WebhookDeliveryPage>(
|
const { data } = await apiClient.get<WebhookDeliveryPage>(
|
||||||
`/admin/webhooks/subscriptions/${encodeURIComponent(id)}/deliveries`,
|
`/admin/webhooks/subscriptions/${encodeURIComponent(id)}/deliveries`,
|
||||||
{ params: { page, size } },
|
{ params },
|
||||||
)
|
)
|
||||||
return data
|
return data
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
export const useWebhookDeliveries = (id: string, page: number, size: number) =>
|
export const useWebhookDeliveries = (
|
||||||
|
id: string,
|
||||||
|
page: number,
|
||||||
|
size: number,
|
||||||
|
statusFilter?: string,
|
||||||
|
) =>
|
||||||
useQuery({
|
useQuery({
|
||||||
...webhookDeliveriesQuery(id, page, size),
|
...webhookDeliveriesQuery(id, page, size, statusFilter),
|
||||||
enabled: Boolean(id),
|
enabled: Boolean(id),
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -71,6 +71,8 @@ i18n
|
|||||||
'webhooks.deliveries.col.lastError': 'Последняя ошибка',
|
'webhooks.deliveries.col.lastError': 'Последняя ошибка',
|
||||||
'webhooks.deliveries.action.retry': 'Повторить доставку',
|
'webhooks.deliveries.action.retry': 'Повторить доставку',
|
||||||
'webhooks.deliveries.confirmRetry': 'Сбросить attemptCount=0 и поставить в очередь повтор? Receiver получит payload снова.',
|
'webhooks.deliveries.confirmRetry': 'Сбросить attemptCount=0 и поставить в очередь повтор? Receiver получит payload снова.',
|
||||||
|
'webhooks.deliveries.filter.label': 'Фильтр по статусу',
|
||||||
|
'webhooks.deliveries.filter.clear': 'Сбросить',
|
||||||
'audit.title': 'Журнал аудита',
|
'audit.title': 'Журнал аудита',
|
||||||
'audit.subtitle': 'Юридически значимый лог изменений НСИ',
|
'audit.subtitle': 'Юридически значимый лог изменений НСИ',
|
||||||
'audit.filter.dictionary': 'Справочник',
|
'audit.filter.dictionary': 'Справочник',
|
||||||
@@ -327,6 +329,8 @@ i18n
|
|||||||
'webhooks.deliveries.col.lastError': 'Last error',
|
'webhooks.deliveries.col.lastError': 'Last error',
|
||||||
'webhooks.deliveries.action.retry': 'Retry delivery',
|
'webhooks.deliveries.action.retry': 'Retry delivery',
|
||||||
'webhooks.deliveries.confirmRetry': 'Reset attemptCount=0 and queue a retry? The receiver will get the payload again.',
|
'webhooks.deliveries.confirmRetry': 'Reset attemptCount=0 and queue a retry? The receiver will get the payload again.',
|
||||||
|
'webhooks.deliveries.filter.label': 'Status filter',
|
||||||
|
'webhooks.deliveries.filter.clear': 'Clear',
|
||||||
'audit.title': 'Audit log',
|
'audit.title': 'Audit log',
|
||||||
'audit.subtitle': 'Legally significant log of NSI changes',
|
'audit.subtitle': 'Legally significant log of NSI changes',
|
||||||
'audit.filter.dictionary': 'Dictionary',
|
'audit.filter.dictionary': 'Dictionary',
|
||||||
|
|||||||
@@ -53,7 +53,12 @@ function WebhookDetailPage() {
|
|||||||
const { t } = useTranslation()
|
const { t } = useTranslation()
|
||||||
const sub = useWebhookSubscription(id)
|
const sub = useWebhookSubscription(id)
|
||||||
const [page, setPage] = useState(0)
|
const [page, setPage] = useState(0)
|
||||||
const deliveries = useWebhookDeliveries(id, page, 50)
|
const [statusFilter, setStatusFilter] = useState<string | undefined>(undefined)
|
||||||
|
const deliveries = useWebhookDeliveries(id, page, 50, statusFilter)
|
||||||
|
const handleStatusToggle = (s: string) => {
|
||||||
|
setPage(0)
|
||||||
|
setStatusFilter((curr) => (curr === s ? undefined : s))
|
||||||
|
}
|
||||||
const rotateMut = useRotateWebhookSecret()
|
const rotateMut = useRotateWebhookSecret()
|
||||||
const deleteMut = useDeleteWebhook()
|
const deleteMut = useDeleteWebhook()
|
||||||
const retryMut = useRetryWebhookDelivery()
|
const retryMut = useRetryWebhookDelivery()
|
||||||
@@ -213,6 +218,44 @@ function WebhookDetailPage() {
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
className="flex flex-wrap items-center gap-1.5 mb-3"
|
||||||
|
role="group"
|
||||||
|
aria-label={t('webhooks.deliveries.filter.label')}
|
||||||
|
>
|
||||||
|
{(['pending', 'retrying', 'delivered', 'dlq'] as const).map((s) => {
|
||||||
|
const active = statusFilter === s
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
key={s}
|
||||||
|
type="button"
|
||||||
|
onClick={() => handleStatusToggle(s)}
|
||||||
|
aria-pressed={active}
|
||||||
|
className={[
|
||||||
|
'inline-flex items-center gap-1.5 px-2.5 py-1 rounded-sm border text-2xs uppercase tracking-label font-secondary transition-colors',
|
||||||
|
active
|
||||||
|
? 'border-ultramarain bg-ultramarain/8 text-ultramarain'
|
||||||
|
: 'border-regolith bg-white text-carbon/70 hover:border-carbon/40',
|
||||||
|
].join(' ')}
|
||||||
|
>
|
||||||
|
{s}
|
||||||
|
</button>
|
||||||
|
)
|
||||||
|
})}
|
||||||
|
{statusFilter && (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => {
|
||||||
|
setPage(0)
|
||||||
|
setStatusFilter(undefined)
|
||||||
|
}}
|
||||||
|
className="text-xs text-ultramarain hover:underline ml-2"
|
||||||
|
>
|
||||||
|
{t('webhooks.deliveries.filter.clear')}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
{deliveries.isLoading ? (
|
{deliveries.isLoading ? (
|
||||||
<LoadingBlock size="sm" />
|
<LoadingBlock size="sm" />
|
||||||
) : !deliveries.data || deliveries.data.content.length === 0 ? (
|
) : !deliveries.data || deliveries.data.content.length === 0 ? (
|
||||||
|
|||||||
+4
@@ -54,4 +54,8 @@ public interface WebhookDeliveryRepository extends JpaRepository<WebhookDelivery
|
|||||||
/** История доставок одной подписки. */
|
/** История доставок одной подписки. */
|
||||||
Page<WebhookDelivery> findBySubscriptionIdOrderByCreatedAtDesc(
|
Page<WebhookDelivery> findBySubscriptionIdOrderByCreatedAtDesc(
|
||||||
UUID subscriptionId, Pageable pageable);
|
UUID subscriptionId, Pageable pageable);
|
||||||
|
|
||||||
|
/** История доставок одной подписки фильтрованная по status. */
|
||||||
|
Page<WebhookDelivery> findBySubscriptionIdAndStatusOrderByCreatedAtDesc(
|
||||||
|
UUID subscriptionId, WebhookDelivery.Status status, Pageable pageable);
|
||||||
}
|
}
|
||||||
|
|||||||
+20
-4
@@ -127,11 +127,27 @@ public class WebhookSubscriptionController {
|
|||||||
public Page<WebhookDeliveryResponse> deliveries(
|
public Page<WebhookDeliveryResponse> deliveries(
|
||||||
@PathVariable UUID id,
|
@PathVariable UUID id,
|
||||||
@RequestParam(defaultValue = "0") int page,
|
@RequestParam(defaultValue = "0") int page,
|
||||||
@RequestParam(defaultValue = "50") int size) {
|
@RequestParam(defaultValue = "50") int size,
|
||||||
|
@RequestParam(value = "status", required = false) String statusFilter) {
|
||||||
requireInternal();
|
requireInternal();
|
||||||
Page<WebhookDelivery> deliveries = deliveryRepository
|
PageRequest pr = PageRequest.of(page, Math.min(size, 200));
|
||||||
.findBySubscriptionIdOrderByCreatedAtDesc(
|
Page<WebhookDelivery> deliveries;
|
||||||
id, PageRequest.of(page, Math.min(size, 200)));
|
if (statusFilter != null && !statusFilter.isBlank()) {
|
||||||
|
WebhookDelivery.Status s;
|
||||||
|
try {
|
||||||
|
s = WebhookDelivery.Status.valueOf(statusFilter.toLowerCase());
|
||||||
|
} catch (IllegalArgumentException e) {
|
||||||
|
throw OrdinisException.badRequest(
|
||||||
|
"webhook_status_invalid",
|
||||||
|
"Unknown delivery status: " + statusFilter
|
||||||
|
+ ". Allowed: pending, retrying, delivered, dlq.");
|
||||||
|
}
|
||||||
|
deliveries = deliveryRepository
|
||||||
|
.findBySubscriptionIdAndStatusOrderByCreatedAtDesc(id, s, pr);
|
||||||
|
} else {
|
||||||
|
deliveries = deliveryRepository
|
||||||
|
.findBySubscriptionIdOrderByCreatedAtDesc(id, pr);
|
||||||
|
}
|
||||||
return deliveries.map(WebhookDeliveryResponse::from);
|
return deliveries.map(WebhookDeliveryResponse::from);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user