From 7e8d1a4660bc612c5887257b2f14f46bb48e2a01 Mon Sep 17 00:00:00 2001 From: corpulent Date: Wed, 3 Aug 2022 12:04:13 +0300 Subject: [PATCH] fix: network form reset --- .../frontend/src/components/Modal/network/NetworkList.tsx | 7 +++++-- services/frontend/src/components/Modal/network/index.tsx | 2 -- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/services/frontend/src/components/Modal/network/NetworkList.tsx b/services/frontend/src/components/Modal/network/NetworkList.tsx index 6000c0f..3f1700e 100644 --- a/services/frontend/src/components/Modal/network/NetworkList.tsx +++ b/services/frontend/src/components/Modal/network/NetworkList.tsx @@ -65,7 +65,10 @@ const NetworkList: FunctionComponent = ( const handleEdit = (networkUuid: string) => () => onEdit(networkUuid); - const handleRemove = (networkUuid: string) => () => onRemove(networkUuid); + const handleRemove = (e: any, networkUuid: string) => { + e.stopPropagation(); + onRemove(networkUuid); + }; return ( @@ -83,7 +86,7 @@ const NetworkList: FunctionComponent = ( variant="soft" size="sm" color="danger" - onClick={handleRemove(networkUuid)} + onClick={(e) => handleRemove(e, networkUuid)} > diff --git a/services/frontend/src/components/Modal/network/index.tsx b/services/frontend/src/components/Modal/network/index.tsx index 1340842..beeac3f 100644 --- a/services/frontend/src/components/Modal/network/index.tsx +++ b/services/frontend/src/components/Modal/network/index.tsx @@ -62,8 +62,6 @@ const ModalNetwork = (props: IModalNetworkProps) => { const handleRemove = useCallback( (networkUuid: string) => { onDeleteNetwork(networkUuid); - /* Show the new network form only when the selected node was deleted. */ - /* BUG: If a selected node is deleted, it still remains in the form. */ if (selectedNetwork?.key === networkUuid) { setSelectedNetwork(null); }