diff --git a/apps/admin-x-settings/src/components/settings/advanced/Integrations.tsx b/apps/admin-x-settings/src/components/settings/advanced/Integrations.tsx index 627fb165f9..549dfe6fbe 100644 --- a/apps/admin-x-settings/src/components/settings/advanced/Integrations.tsx +++ b/apps/admin-x-settings/src/components/settings/advanced/Integrations.tsx @@ -18,7 +18,7 @@ import {useRouting} from '@tryghost/admin-x-framework/routing'; interface IntegrationItemProps { icon?: React.ReactNode, title: string, - detail: string, + detail: string | React.ReactNode, action: () => void; onDelete?: () => void; active?: boolean; @@ -173,11 +173,13 @@ const CustomIntegrations: React.FC<{integrations: Integration[]}> = ({integratio {integrations.map(integration => ( updateRoute({route: `integrations/${integration.id}`})} - detail={integration.description || 'No description'} + detail={
+ {integration.description || 'No description'} +
} icon={ integration.icon_image ? - : - + : + } title={integration.name} custom diff --git a/apps/admin-x-settings/src/components/settings/advanced/integrations/WebhooksTable.tsx b/apps/admin-x-settings/src/components/settings/advanced/integrations/WebhooksTable.tsx index 10d188e719..8316634dfd 100644 --- a/apps/admin-x-settings/src/components/settings/advanced/integrations/WebhooksTable.tsx +++ b/apps/admin-x-settings/src/components/settings/advanced/integrations/WebhooksTable.tsx @@ -36,35 +36,36 @@ const WebhooksTable: React.FC<{integration: Integration}> = ({integration}) => { {integration.webhooks?.length || 0} {integration.webhooks?.length === 1 ? 'webhook' : 'webhooks'} Last triggered - {integration.webhooks?.map(webhook => ( - { - e?.stopPropagation(); - handleDelete(webhook.id); - }} /> - } - hideActions - onClick={() => { - NiceModal.show(WebhookModal, { - webhook, - integrationId: + { + e?.stopPropagation(); + handleDelete(webhook.id); + }} /> + } + bgOnHover={false} + hideActions + onClick={() => { + NiceModal.show(WebhookModal, { + webhook, + integrationId: integration.id - }); - }} + }); + }} > - +
{webhook.name}
Event: {getWebhookEventLabel(webhook.event)} URL: - {webhook.target_url} + + {webhook.target_url} +
- + {webhook.last_triggered_at && new Date(webhook.last_triggered_at).toLocaleString('default', { weekday: 'short', month: 'short',