Merge pull request #331 from OpenSignLabs/staging

v1.1.1-beta

Author: nxglabs

apps/OpenSign/src/primitives/TemplateForm.js

@@ -22,6 +22,8 @@ const TemplateForm = () => {
   const [fileload, setfileload] = useState(false);
   const [percentage, setpercentage] = useState(0);
   const [isAlert, setIsAlert] = useState(false);
+  const [isSubmit, setIsSubmit] = useState(false);
+  const [isErr, setIsErr] = useState("");
   const handleStrInput = (e) => {
     setFormData({ ...formData, [e.target.name]: e.target.value });
   };
@@ -128,6 +130,7 @@ const TemplateForm = () => {
   const dropboxCancel = async () => {};
   const handleSubmit = async (e) => {
     e.preventDefault();
+    setIsSubmit(true);
     try {
       const currentUser = Parse.User.current();
       const template = new Parse.Object(templateCls);
@@ -155,10 +158,6 @@ const TemplateForm = () => {
 
       const res = await template.save();
       if (res) {
-        setIsAlert(true);
-        setTimeout(() => {
-          setIsAlert(false);
-        }, 1000);
         setSigners([]);
         setFolder({ ObjectId: "", Name: "" });
         setFormData({
@@ -175,7 +174,13 @@ const TemplateForm = () => {
       }
     } catch (err) {
       console.log("err ", err);
+      setIsErr(true);
+    } finally {
       setIsAlert(true);
+      setTimeout(() => {
+        setIsAlert(false);
+      }, 1000);
+      setIsSubmit(false);
     }
   };
 
@@ -207,7 +212,13 @@ const TemplateForm = () => {
   return (
     <div className="shadow-md rounded my-2 p-3 bg-[#ffffff] md:border-[1px] md:border-gray-600/50">
       <Title title="New Template" />
-      {isAlert && <Alert type="success">Template created successfully!</Alert>}
+      {isAlert && (
+        <Alert type={isErr ? "danger" : "success"}>
+          {isErr
+            ? "Something went wrong please try again!"
+            : "Template created successfully!"}
+        </Alert>
+      )}
       <form onSubmit={handleSubmit}>
         <h1 className="text-[20px] font-semibold mb-4">New Template</h1>
         {fileload && (
@@ -302,8 +313,11 @@ const TemplateForm = () => {
         <SelectFolder onSuccess={handleFolder} folderCls={templateCls} />
         <div className="flex items-center mt-3 gap-2 text-white">
           <button
-            className="bg-[#1ab6ce] rounded-sm shadow-md text-[14px] font-semibold uppercase text-white py-1.5 px-2.5 focus:outline-none"
+            className={`${
+              isSubmit && "cursor-progress"
+            } bg-[#1ab6ce] rounded-sm shadow-md text-[14px] font-semibold uppercase text-white py-1.5 px-2.5 focus:outline-none`}
             type="submit"
+            disabled={isSubmit}
           >
             Submit
           </button>

microfrontends/SignDocuments/package-lock.json

@@ -34,7 +34,6 @@
     "react-select": "^5.8.0",
     "react-signature-canvas": "^1.0.6",
     "reactour": "^1.19.1",
-    "select-dom": "^9.0.0",
     "web-vitals": "^2.1.4"
   },
   "scripts": {

microfrontends/SignDocuments/package.json

@@ -20,7 +20,8 @@ function PdfFileComponent({
   setDocId,
   setIsLoading,
   setPdfData,
-  isList
+  isList,
+  setIsAlert
 }) {
   const [rename, setRename] = useState("");
   const [renameValue, setRenameValue] = useState("");
@@ -103,7 +104,10 @@ function PdfFileComponent({
           // console.log("res", res);
         })
         .catch((err) => {
-          console.log("error updating field is decline ", err);
+          setIsAlert({
+            isShow: true,
+            alertMessage: "something went wrong"
+          });
         });
     }
   };
@@ -187,11 +191,16 @@ function PdfFileComponent({
       )
       .then((result) => {
         const res = result.data;
-        const updatedData = pdfData.filter((x) => x.objectId !== docId);
-        setPdfData(updatedData);
+        if (res) {
+          const updatedData = pdfData.filter((x) => x.objectId !== docId);
+          setPdfData(updatedData);
+        }
       })
       .catch((err) => {
-        console.log("err", err);
+        setIsAlert({
+          isShow: true,
+          alertMessage: "something went wrong"
+        });
       });
   };
   const handleMoveDocument = async (docData) => {
@@ -243,10 +252,13 @@ function PdfFileComponent({
 
         .then((Listdata) => {
           // console.log("Listdata ", Listdata);
-          const json = Listdata.data;
-
-          const updatedData = pdfData.filter((x) => x.objectId !== updateDocId);
-          setPdfData(updatedData);
+          const res = Listdata.data;
+          if (res) {
+            const updatedData = pdfData.filter(
+              (x) => x.objectId !== updateDocId
+            );
+            setPdfData(updatedData);
+          }
         })
         .catch((err) => {
           console.log("err", err);
@@ -276,13 +288,7 @@ function PdfFileComponent({
 
   //component to handle type of document and render according to type
   const handleFolderData = (data, ind, listType) => {
-    let createddate,
-      status,
-      isDecline,
-      signerExist,
-      isComplete,
-      signUrl,
-      isPlaceholder;
+    let createddate, status, isDecline, signerExist, isComplete, isPlaceholder;
     if (data.Type !== "Folder") {
       const expireDate = data.ExpiryDate && data.ExpiryDate.iso;
       const createdDate = data.createdAt && data.createdAt;
@@ -291,7 +297,7 @@ function PdfFileComponent({
       isDecline = data.IsDeclined && data.IsDeclined;
       isPlaceholder = data.Placeholders && data.Placeholders;
       signerExist = data.Signers && data.Signers;
-      signUrl = data.SignedUrl && data.SignedUrl;
+
       const expireUpdateDate = new Date(expireDate).getTime();
       const currDate = new Date().getTime();
       let isExpire = false;
@@ -732,11 +738,8 @@ function PdfFileComponent({
             onClick={() => {
               setIsDeleteDoc(false);
             }}
-            style={{
-              color: "black"
-            }}
             type="button"
-            className="finishBtn"
+            className="finishBtn cancelBtn"
           >
             No
           </button>

microfrontends/SignDocuments/src/Component/LegaDrive/FolderDrive/legaDriveComponent.js

@@ -116,7 +116,9 @@
   margin: 30px;
   height: 100%;
 }
-
+.inputStyle{
+  border: 1.6px solid #ccc !important;
+}
 .folderComponent::-webkit-scrollbar {
   display: none;
   /* for Chrome, Safari, and Opera */