From 8e5d5d72870ef4834222e12f3cdead9e37fd5bc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Gangloff?= Date: Sat, 17 Aug 2024 01:13:48 +0200 Subject: [PATCH] fix: duplicate tracked events in select --- .../components/tracking/watchlist/UpdateWatchlistButton.tsx | 2 +- assets/pages/tracking/WatchlistPage.tsx | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/assets/components/tracking/watchlist/UpdateWatchlistButton.tsx b/assets/components/tracking/watchlist/UpdateWatchlistButton.tsx index 6286a1b..c6411ae 100644 --- a/assets/components/tracking/watchlist/UpdateWatchlistButton.tsx +++ b/assets/components/tracking/watchlist/UpdateWatchlistButton.tsx @@ -35,7 +35,7 @@ export function UpdateWatchlistButton({watchlist, onUpdateWatchlist, connectors} {name: 'name', value: watchlist.name}, {name: 'connector', value: watchlist.connector?.id}, {name: 'domains', value: watchlist.domains.map(d => d.ldhName)}, - {name: 'triggers', value: watchlist.triggers?.map(t => t.event)}, + {name: 'triggers', value: [...new Set(watchlist.triggers?.map(t => t.event))]}, {name: 'dsn', value: watchlist.dsn} ]) }}/> diff --git a/assets/pages/tracking/WatchlistPage.tsx b/assets/pages/tracking/WatchlistPage.tsx index d7b0765..1ff4e35 100644 --- a/assets/pages/tracking/WatchlistPage.tsx +++ b/assets/pages/tracking/WatchlistPage.tsx @@ -65,12 +65,15 @@ export default function WatchlistPage() { dsn?: string[] }) => { const domainsURI = values.domains.map(d => '/api/domains/' + d) + let triggers = values.triggers.map(t => ({event: t, action: 'email'})) + if(values.dsn !== undefined) triggers = [...triggers, ...values.triggers.map(t => ({event: t, action: 'chat'}))] + return putWatchlist({ token: values.token, name: values.name, domains: domainsURI, - triggers: values.triggers.map(t => ({event: t, action: 'email'})), + triggers, connector: values.connector !== undefined ? ('/api/connectors/' + values.connector) : undefined, dsn: values.dsn }).then((w) => {