From 465a99c2b1c63aa0a566d7e767bbf24904c86792 Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 28 Nov 2023 12:48:21 +0800 Subject: [PATCH] fix proof create and cancel bugs --- src/pages/Proof/Create_FromApp/ProofForm.js | 5 +++++ src/pages/Proof/Reply_GLD/ApplicationDetails.js | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/pages/Proof/Create_FromApp/ProofForm.js b/src/pages/Proof/Create_FromApp/ProofForm.js index 0a1a446..14dfdfa 100644 --- a/src/pages/Proof/Create_FromApp/ProofForm.js +++ b/src/pages/Proof/Create_FromApp/ProofForm.js @@ -35,6 +35,8 @@ const FormPanel = ({ formData }) => { const [isWarningPopUp, setIsWarningPopUp] = React.useState(false); const [warningText, setWarningText] = React.useState(""); + const [saving, setSaving] = React.useState(false); + const navigate = useNavigate() React.useEffect(() => { @@ -111,9 +113,11 @@ const FormPanel = ({ formData }) => { enableReinitialize: true, initialValues: data, onSubmit: values => { + setSaving(true); if (!attachments || attachments.length <= 0) { setWarningText("Please upload file."); setIsWarningPopUp(true); + setSaving(false); return; } // console.log(values); @@ -410,6 +414,7 @@ const FormPanel = ({ formData }) => { variant="contained" color="success" type="submit" + disabled = {saving} sx={{ textTransform: 'capitalize', alignItems: 'end' diff --git a/src/pages/Proof/Reply_GLD/ApplicationDetails.js b/src/pages/Proof/Reply_GLD/ApplicationDetails.js index 950b1d9..0837a10 100644 --- a/src/pages/Proof/Reply_GLD/ApplicationDetails.js +++ b/src/pages/Proof/Reply_GLD/ApplicationDetails.js @@ -16,7 +16,6 @@ import * as HttpUtils from "utils/HttpUtils" import * as UrlUtils from "utils/ApiPathConst" import * as DateUtils from "utils/DateUtils" import * as FormatUtils from "utils/FormatUtils" -import { useNavigate } from "react-router-dom"; import { useParams } from "react-router-dom"; import Loadable from 'components/Loadable'; const MainCard = Loadable(React.lazy(() => import('components/MainCard'))); @@ -30,7 +29,6 @@ const ApplicationDetailCard = ({ }) => { const params = useParams(); - const navigate = useNavigate() const [data, setData] = React.useState({}); const [cancelPopUp, setCancelPopUp] = React.useState(false); @@ -75,7 +73,7 @@ const ApplicationDetailCard = ({ HttpUtils.get({ url: UrlUtils.CANCEL_PROOF+"/"+params.id, onSuccess: function(){ - navigate("/proof/reply/"+params.id); + window.location.reload(false); } }); }