diff --git a/client/src/Pages/StatusPage/Create/index.jsx b/client/src/Pages/StatusPage/Create/index.jsx index 43f93acfb..9c218d3c4 100644 --- a/client/src/Pages/StatusPage/Create/index.jsx +++ b/client/src/Pages/StatusPage/Create/index.jsx @@ -126,11 +126,18 @@ const CreateStatusPage = () => { setProgress({ value: 0, isLoading: false }); }; - const handleDelete = () => { - deleteStatusPage(); - setIsDeleteOpen(false); - navigate("/status"); - }; + /** + * Handle status page deletion with optimistic UI update + * Immediately navigates away without waiting for the deletion to complete + * to prevent unnecessary network requests for the deleted page + */ +const handleDelete = async () => { + setIsDeleteOpen(false); + // Start deletion process but don't wait for it + deleteStatusPage(); + // Immediately navigate away to prevent additional fetches for the deleted page + navigate("/status"); +}; const handleSubmit = async () => { let toSubmit = { diff --git a/client/src/Pages/StatusPage/Status/Hooks/useStatusPageDelete.jsx b/client/src/Pages/StatusPage/Status/Hooks/useStatusPageDelete.jsx index d5c87c530..1a2079f98 100644 --- a/client/src/Pages/StatusPage/Status/Hooks/useStatusPageDelete.jsx +++ b/client/src/Pages/StatusPage/Status/Hooks/useStatusPageDelete.jsx @@ -1,19 +1,34 @@ -import { useSelector } from "react-redux"; -import { useState } from "react"; -import { networkService } from "../../../../main"; -import { createToast } from "../../../../Utils/toastUtils"; +import { useState } from "react"; +import { networkService } from "../../../../Utils/NetworkService"; +import { createToast } from "../../../../Utils/toastUtils"; +import { useTranslation } from "react-i18next"; + +/** + * Hook for deleting a status page with optimistic UI update + * @param {Function} fetchStatusPage - Function to fetch status page data + * @param {string} url - URL of the status page + * @returns {Array} - [deleteStatusPage function, isLoading state] + */ const useStatusPageDelete = (fetchStatusPage, url) => { const [isLoading, setIsLoading] = useState(false); + const { t } = useTranslation(); + + /** + * Delete a status page with optimistic UI update + * @returns {Promise} - Success status + */ const deleteStatusPage = async () => { + // We don't need to call fetchStatusPage after deletion + // This prevents the 404 error when trying to fetch a deleted status page try { setIsLoading(true); await networkService.deleteStatusPage({ url }); - fetchStatusPage?.(); + createToast({ body: t("statusPage.deleteSuccess", "Status page deleted successfully") }); return true; } catch (error) { createToast({ - body: error.message, + body: t("statusPage.deleteFailed", "Failed to delete status page"), }); return false; } finally { diff --git a/client/src/locales/en.json b/client/src/locales/en.json index a7d9fe069..ae285707a 100644 --- a/client/src/locales/en.json +++ b/client/src/locales/en.json @@ -275,6 +275,10 @@ "date&Time": "Date & Time", "type": "Type", "statusPageName": "Status page name", + "statusPage": { + "deleteSuccess": "Status page deleted successfully", + "deleteFailed": "Failed to delete status page" + }, "publicURL": "Public URL", "repeat": "Repeat", "edit": "Edit",