diff --git a/config-ui/src/plugins/register/webhook/components/delete-dialog.tsx b/config-ui/src/plugins/register/webhook/components/delete-dialog.tsx index 846d51ecae2..8b05c3cd48d 100644 --- a/config-ui/src/plugins/register/webhook/components/delete-dialog.tsx +++ b/config-ui/src/plugins/register/webhook/components/delete-dialog.tsx @@ -27,10 +27,9 @@ import { operator } from '@/utils'; interface Props { initialId: ID; onCancel: () => void; - onSubmitAfter?: (id: ID) => void; } -export const DeleteDialog = ({ initialId, onCancel, onSubmitAfter }: Props) => { +export const DeleteDialog = ({ initialId, onCancel }: Props) => { const [operating, setOperating] = useState(false); const dispatch = useAppDispatch(); @@ -41,7 +40,6 @@ export const DeleteDialog = ({ initialId, onCancel, onSubmitAfter }: Props) => { }); if (success) { - onSubmitAfter?.(initialId); onCancel(); } }; diff --git a/config-ui/src/plugins/register/webhook/connection.tsx b/config-ui/src/plugins/register/webhook/connection.tsx index 4ad661db3b9..32bfd6f5e8b 100644 --- a/config-ui/src/plugins/register/webhook/connection.tsx +++ b/config-ui/src/plugins/register/webhook/connection.tsx @@ -17,24 +17,26 @@ */ import { useState } from 'react'; -import { EyeOutlined, FormOutlined, DeleteOutlined, PlusOutlined } from '@ant-design/icons'; -import { Flex, Table, Space, Button } from 'antd'; +import { EyeOutlined, FormOutlined, CloseCircleOutlined, DeleteOutlined, PlusOutlined } from '@ant-design/icons'; +import { Flex, Table, Space, Button, Modal } from 'antd'; +import { Message } from '@/components'; import { useAppSelector } from '@/hooks'; import { selectWebhooks } from '@/features/connections'; import { IWebhook } from '@/types'; import { CreateDialog, ViewDialog, EditDialog, DeleteDialog } from './components'; -type Type = 'add' | 'edit' | 'show' | 'delete'; +type Type = 'add' | 'edit' | 'show' | 'delete' | 'remove'; interface Props { + fromProject?: boolean; filterIds?: ID[]; - onCreateAfter?: (id: ID) => void; - onDeleteAfter?: (id: ID) => void; + onAssociate?: (id: ID) => void; + onRemove?: (id: ID) => void; } -export const WebHookConnection = ({ filterIds, onCreateAfter, onDeleteAfter }: Props) => { +export const WebHookConnection = ({ filterIds, fromProject = false, onAssociate, onRemove }: Props) => { const [type, setType] = useState(); const [currentID, setCurrentID] = useState(); @@ -76,7 +78,21 @@ export const WebHookConnection = ({ filterIds, onCreateAfter, onDeleteAfter }: P - {type === 'add' && onCreateAfter?.(id)} />} + {type === 'add' && onAssociate?.(id)} />} {type === 'show' && currentID && } {type === 'edit' && currentID && } - {type === 'delete' && currentID && ( - onDeleteAfter?.(id)} /> + {type === 'delete' && currentID && } + {type === 'remove' && currentID && ( + onRemove?.(currentID)} + > + + )} ); diff --git a/config-ui/src/routes/project/webhook/index.tsx b/config-ui/src/routes/project/webhook/index.tsx index fafd41d05e5..9d267b243f6 100644 --- a/config-ui/src/routes/project/webhook/index.tsx +++ b/config-ui/src/routes/project/webhook/index.tsx @@ -71,6 +71,7 @@ export const ProjectWebhook = () => { if (success) { setVersion(version + 1); + handleCancel(); } }; @@ -96,6 +97,7 @@ export const ProjectWebhook = () => { if (success) { setVersion(version + 1); + handleCancel(); } }; @@ -115,6 +117,7 @@ export const ProjectWebhook = () => { if (success) { setVersion(version + 1); + handleCancel(); } }; @@ -161,7 +164,7 @@ export const ProjectWebhook = () => { )} ) : ( - + )} );