diff --git a/apps/OpenSign/src/pages/Form.js b/apps/OpenSign/src/pages/Form.js index 8e8e5ad7c..8f580ab6f 100644 --- a/apps/OpenSign/src/pages/Form.js +++ b/apps/OpenSign/src/pages/Form.js @@ -74,9 +74,8 @@ const Forms = (props) => { const [fileload, setfileload] = useState(false); const [percentage, setpercentage] = useState(0); const [isReset, setIsReset] = useState(false); - const [isAlert, setIsAlert] = useState(false); + const [isAlert, setIsAlert] = useState({ type: "success", message: "" }); const [isSubmit, setIsSubmit] = useState(false); - const [isErr, setIsErr] = useState(""); const [isPassword, setIsPassword] = useState(false); const [isDecrypting, setIsDecrypting] = useState(false); const [isCorrectPass, setIsCorrectPass] = useState(true); @@ -389,6 +388,10 @@ const Forms = (props) => { return { url: savetos3.url }; } catch (err) { console.log("err in save to customfile", err); + alert(err?.message); + if (inputFileRef.current) { + inputFileRef.current.value = ""; // Set file input value to empty string + } return { url: "" }; } }; @@ -600,13 +603,17 @@ const Forms = (props) => { setFileUpload(""); setpercentage(0); navigate(`/${props?.redirectRoute}/${res.id}`); + setIsAlert((obj) => ({ + ...obj, + type: "success", + message: `${props.msgVar} created successfully!` + })); } } catch (err) { console.log("err ", err); - setIsErr(true); + setIsAlert({ type: "danger", message: t("something-went-wrong-mssg") }); } finally { - setIsAlert(true); - setTimeout(() => setIsAlert(false), 1000); + setTimeout(() => setIsAlert({ type: "success", message: "" }), 1000); setIsSubmit(false); } } else { @@ -768,13 +775,7 @@ const Forms = (props) => { return (
- {isAlert && ( - <Alert type={isErr ? "danger" : "success"}> - {isErr - ? t("something-went-wrong-mssg") - : `${props.msgVar} created successfully!`} - </Alert> - )} + {isAlert?.message && <Alert type={isAlert.type}>{isAlert.message}</Alert>} {isSubmit ? ( <div className="h-[300px] flex justify-center items-center"> <Loader /> diff --git a/apps/OpenSignServer/cloud/parsefunction/saveToFileAdapter.js b/apps/OpenSignServer/cloud/parsefunction/saveToFileAdapter.js index 47d73a070..63a843348 100644 --- a/apps/OpenSignServer/cloud/parsefunction/saveToFileAdapter.js +++ b/apps/OpenSignServer/cloud/parsefunction/saveToFileAdapter.js @@ -44,7 +44,8 @@ export default async function saveToFileAdapter(request) { return { url: presignedUrl }; } catch (err) { console.error('Error generate presigned url:', err); - throw new Parse.Error(400, 'Something went wrong.'); + const msg = 'Fileadapter credentials are invalid.'; + throw new Parse.Error(400, msg); } } else { throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'S3 credentials not found.'); diff --git a/apps/OpenSignServer/cloud/parsefunction/uploadFiletoS3.js b/apps/OpenSignServer/cloud/parsefunction/uploadFiletoS3.js index 7947b69c6..d17f30420 100644 --- a/apps/OpenSignServer/cloud/parsefunction/uploadFiletoS3.js +++ b/apps/OpenSignServer/cloud/parsefunction/uploadFiletoS3.js @@ -30,7 +30,7 @@ async function uploadFileToS3(buffer, fileName, mimeType, adapter) { const presignedUrl = await getSignedUrl(client, getCommand, { expiresIn: 900 }); // URL expiration time in seconds (e.g., 15 min) return presignedUrl; } catch (error) { - console.error('Error uploading file to aws:', error); + console.error('Error uploading file to aws:', error?.message); throw error; } }