From b4d43bc0dd66c9afff54a5d0c1f10148005e25f0 Mon Sep 17 00:00:00 2001 From: headlesdev Date: Tue, 20 May 2025 20:06:32 +0200 Subject: [PATCH] Sites & Network Finally Statement --- components/dialogues/AddNetwork.tsx | 5 +++ components/dialogues/AddSite.tsx | 3 ++ components/dialogues/DeleteNetwork.tsx | 28 +++++++-------- components/dialogues/EditNetwork.tsx | 48 +++++++++++++------------- components/dialogues/EditSite.tsx | 8 ++--- 5 files changed, 47 insertions(+), 45 deletions(-) diff --git a/components/dialogues/AddNetwork.tsx b/components/dialogues/AddNetwork.tsx index 4d12210..b868de8 100644 --- a/components/dialogues/AddNetwork.tsx +++ b/components/dialogues/AddNetwork.tsx @@ -41,6 +41,11 @@ export default function AddNetwork({ onNetworkAdded, siteId }: AddNetworkProps) } } catch (apiError: any) { setError(apiError) + } finally { + setName("") + setIpv4Subnet("") + setIpv6Subnet("") + setGateway("") } }; diff --git a/components/dialogues/AddSite.tsx b/components/dialogues/AddSite.tsx index c4ee511..be01ced 100644 --- a/components/dialogues/AddSite.tsx +++ b/components/dialogues/AddSite.tsx @@ -32,6 +32,9 @@ export default function AddSite({ onSiteAdded }: AddSiteProps) { } } catch (apiError: any) { setError(apiError) + } finally { + setName("") + setDescription("") } }; diff --git a/components/dialogues/DeleteNetwork.tsx b/components/dialogues/DeleteNetwork.tsx index 18662b8..c95ef3c 100644 --- a/components/dialogues/DeleteNetwork.tsx +++ b/components/dialogues/DeleteNetwork.tsx @@ -16,24 +16,20 @@ export default function DeleteNetwork({ networkId, onNetworkDeleted }: DeleteNet const { deleteNetwork } = useNetworks(); const handleDelete = async () => { - try { - const response = deleteNetwork(networkId); - if (typeof response === "string") { - setError(response) - return - } + const response = deleteNetwork(networkId); + if (typeof response === "string") { + setError(response) + return + } - try { - const successMessage = await response - if (onNetworkDeleted && successMessage) { - onNetworkDeleted() - setSuccess(successMessage) - } - } catch (apiError: any) { - setError(apiError) + try { + const successMessage = await response + if (onNetworkDeleted && successMessage) { + onNetworkDeleted() + setSuccess(successMessage) } - } catch (err) { - setError("Failed to delete network") + } catch (apiError: any) { + setError(apiError) } }; diff --git a/components/dialogues/EditNetwork.tsx b/components/dialogues/EditNetwork.tsx index 69cc119..c04931f 100644 --- a/components/dialogues/EditNetwork.tsx +++ b/components/dialogues/EditNetwork.tsx @@ -23,32 +23,32 @@ export default function EditNetwork({ onNetworkEdited, siteId, network }: EditNe const { editNetwork } = useNetworks(); const handleEdit = async () => { - try { - const response = editNetwork({ - id: network.id, - siteId, - name: editName, - ipv4Subnet: editIpv4Subnet, - ipv6Subnet: editIpv6Subnet, - gateway: editGateway - }); - if (typeof response === "string") { - setError(response) - return - } + const response = editNetwork({ + id: network.id, + siteId, + name: editName, + ipv4Subnet: editIpv4Subnet, + ipv6Subnet: editIpv6Subnet, + gateway: editGateway + }); + if (typeof response === "string") { + setError(response) + return + } - try{ - const successMessage = await response - if (onNetworkEdited && successMessage) { - onNetworkEdited() - setSuccess(successMessage) - } - } catch (apiError: any) { - setError(apiError) + try{ + const successMessage = await response + if (onNetworkEdited && successMessage) { + onNetworkEdited() + setSuccess(successMessage) } - - } catch (err: any) { - setError("Failed to edit network") + } catch (apiError: any) { + setError(apiError) + } finally { + setEditName("") + setEditIpv4Subnet("") + setEditIpv6Subnet("") + setEditGateway("") } }; diff --git a/components/dialogues/EditSite.tsx b/components/dialogues/EditSite.tsx index 45cc1aa..958f220 100644 --- a/components/dialogues/EditSite.tsx +++ b/components/dialogues/EditSite.tsx @@ -25,7 +25,6 @@ export default function EditSite({ site, onSiteEdited }: EditSiteProps) { }, [site]) const handleEditSite = async () => { - try { const result = editSite({ id: site.id, name, description, networks: site.networks }) if (typeof result === "string") { @@ -41,11 +40,10 @@ export default function EditSite({ site, onSiteEdited }: EditSiteProps) { } } catch (apiError) { setError(typeof apiError === "string" ? apiError : "Failed to edit site") + } finally { + setName("") + setDescription("") } - } catch (err) { - console.error("Error in handleEditSite:", err) - setError("Failed to edit site") - } } return (