diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/svg/webhook-grey.svg b/openmetadata-ui/src/main/resources/ui/src/assets/svg/webhook-grey.svg new file mode 100644 index 00000000000..69078b26144 --- /dev/null +++ b/openmetadata-ui/src/main/resources/ui/src/assets/svg/webhook-grey.svg @@ -0,0 +1,38 @@ + + + + + + + + + + diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/svg/webhook-primary.svg b/openmetadata-ui/src/main/resources/ui/src/assets/svg/webhook-primary.svg new file mode 100644 index 00000000000..213fdf25789 --- /dev/null +++ b/openmetadata-ui/src/main/resources/ui/src/assets/svg/webhook-primary.svg @@ -0,0 +1,38 @@ + + + + + + + + + + diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/svg/webhook.svg b/openmetadata-ui/src/main/resources/ui/src/assets/svg/webhook.svg new file mode 100644 index 00000000000..073e27683bf --- /dev/null +++ b/openmetadata-ui/src/main/resources/ui/src/assets/svg/webhook.svg @@ -0,0 +1,38 @@ + + + + + + + + + + diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AddWebhook/AddWebhook.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AddWebhook/AddWebhook.tsx index 5e2cfa4a5e9..d1c8d0208f8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AddWebhook/AddWebhook.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AddWebhook/AddWebhook.tsx @@ -321,18 +321,23 @@ const AddWebhook: FunctionComponent = ({ }; const validateEventFilters = () => { - let isValid = false; + const isValid = []; if (!isEmpty(createEvents)) { - isValid = Boolean(createEvents.entities?.length); + isValid.push(Boolean(createEvents.entities?.length)); } if (!isEmpty(updateEvents)) { - isValid = Boolean(updateEvents.entities?.length); + isValid.push(Boolean(updateEvents.entities?.length)); } - if (!isEmpty(deleteEvents) && deleteEvents.entities?.length) { - isValid = Boolean(deleteEvents.entities?.length); + if (!isEmpty(deleteEvents)) { + isValid.push(Boolean(deleteEvents.entities?.length)); } - return isValid; + return ( + isValid.length > 0 && + isValid.reduce((prev, curr) => { + return prev && curr; + }, isValid[0]) + ); }; const validateForm = () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/webhook-data-card/WebhookDataCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/webhook-data-card/WebhookDataCard.tsx index b0ecd46a25e..bc1e5c6e31d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/webhook-data-card/WebhookDataCard.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/webhook-data-card/WebhookDataCard.tsx @@ -14,6 +14,7 @@ import React, { FunctionComponent } from 'react'; import { Status } from '../../../generated/entity/events/webhook'; import { stringToHTML } from '../../../utils/StringsUtils'; +import SVGIcons, { Icons } from '../../../utils/SvgUtils'; import WebhookDataCardBody from './WebhookDataCardBody'; type Props = { @@ -41,7 +42,8 @@ const WebhookDataCard: FunctionComponent = ({ data-testid="webhook-data-card">
-
+ +