From d764c8a302ad41d7ccccd6d99bf48159817eb406 Mon Sep 17 00:00:00 2001 From: Corey Alexander Date: Thu, 21 Jul 2022 21:51:13 -0400 Subject: [PATCH] Start displaying status with an icon and add createdAt date too --- app/models/WebhookDelivery.ts | 4 ++ .../Settings/components/WebhookDeliveries.tsx | 38 ++++++++++++++++--- server/presenters/webhookDelivery.ts | 1 + shared/i18n/locales/en_US/translation.json | 1 + 4 files changed, 38 insertions(+), 6 deletions(-) diff --git a/app/models/WebhookDelivery.ts b/app/models/WebhookDelivery.ts index 934fb8824b..fbea8ba968 100644 --- a/app/models/WebhookDelivery.ts +++ b/app/models/WebhookDelivery.ts @@ -6,6 +6,10 @@ class WebhookDelivery extends BaseModel { @Field @observable id: string; + + @Field + @observable + status: string; } export default WebhookDelivery; diff --git a/app/scenes/Settings/components/WebhookDeliveries.tsx b/app/scenes/Settings/components/WebhookDeliveries.tsx index c3c1c8d9a1..8389964b13 100644 --- a/app/scenes/Settings/components/WebhookDeliveries.tsx +++ b/app/scenes/Settings/components/WebhookDeliveries.tsx @@ -1,8 +1,11 @@ +import { BugIcon, SmileyIcon } from "outline-icons"; import * as React from "react"; import { useTranslation } from "react-i18next"; -import { WebhookDelivery } from "@server/models"; +import WebhookDelivery from "~/models/WebhookDelivery"; import WebhookSubscription from "~/models/WebhookSubscription"; +import Flex from "~/components/Flex"; import TableFromParams from "~/components/TableFromParams"; +import Time from "~/components/Time"; import useStores from "~/hooks/useStores"; type Props = { @@ -19,25 +22,48 @@ const WebhookDeliveries = ({ webhook }: Props) => { const { webhookDeliveries } = useStores(); + const [deliveries, setDeliveries] = React.useState([]); + React.useEffect(() => { - webhookDeliveries.fetchPage({ webhookSubscriptionId: webhook.id }); + async function fetch() { + const resp = await webhookDeliveries.fetchPage({ + webhookSubscriptionId: webhook.id, + }); + + setDeliveries(resp); + } + fetch(); }, [webhookDeliveries, webhook]); return (
-

{webhook.name}

-

This is a list of webhook deliveries.

- ) => ( + + {value === "failed" ? : } + {value} + + ), + }, { id: "id", Header: t("ID"), accessor: "id", Cell: ({ value }: CellProps) => value, }, + { + id: "createdAt", + Header: "", + accessor: "createdAt", + Cell: ({ value }: CellProps) =>