diff --git a/apps/OpenSign/src/components/BulkSendUi.js b/apps/OpenSign/src/components/BulkSendUi.js index 3b84ac5ea..c5445ad66 100644 --- a/apps/OpenSign/src/components/BulkSendUi.js +++ b/apps/OpenSign/src/components/BulkSendUi.js @@ -164,54 +164,72 @@ const BulkSendUi = (props) => { > )} -
-
- {forms?.map((form, index) => ( -
- {form?.fields?.map((field, fieldIndex) => ( -
- - - handleInputChange(index, signer, fieldIndex) - } - /> -
- ))} - {index > 0 && ( + {props.Placeholders?.length > 0 ? ( + <> + {props.Placeholders?.some((x) => !x.signerObjId) ? ( + +
+ {forms?.map((form, index) => ( +
+ {form?.fields?.map((field, fieldIndex) => ( +
+ + + handleInputChange(index, signer, fieldIndex) + } + /> +
+ ))} + {forms?.length > 1 && ( + + )} +
+
+ ))} +
+
- )} -
+ +
+ + ) : ( +
+ All roles in this document are currently linked to contacts. To + 'quick send' copies of this template to multiple + signers, please ensure that at least one role is not linked to any + contact.
- ))} + )} + + ) : ( +
+ Please add at least one role to this template in order to 'quick + send' copies of it to multiple signers.
-
- - -
- + )} ); }; diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.js index 38b2e6492..52940e19c 100644 --- a/apps/OpenSign/src/primitives/GetReportDisplay.js +++ b/apps/OpenSign/src/primitives/GetReportDisplay.js @@ -25,7 +25,6 @@ const ReportTable = (props) => { const [currentPage, setCurrentPage] = useState(1); const [actLoader, setActLoader] = useState({}); const [isAlert, setIsAlert] = useState(false); - const [isDocErr, setIsDocErr] = useState(false); const [isContactform, setIsContactform] = useState(false); const [isDeleteModal, setIsDeleteModal] = useState({}); const [isRevoke, setIsRevoke] = useState({}); @@ -186,7 +185,6 @@ const ReportTable = (props) => { setActLoader({}); } } else { - setIsDocErr(true); setActLoader({}); } } else { @@ -648,7 +646,6 @@ const ReportTable = (props) => { const handleBulkSend = async (template) => { setIsBulkSend({ [template.objectId]: true }); setIsLoader({ [template.objectId]: true }); - setIsDocErr(false); try { const params = { templateId: template.objectId, @@ -666,18 +663,12 @@ const ReportTable = (props) => { } ); const templateRes = axiosRes.data && axiosRes.data.result; - if (templateRes?.Placeholders?.length > 0) { - setPlaceholders(templateRes?.Placeholders); - setTemplateDetails(templateRes); - setIsLoader({}); - } else { - setIsLoader(false); - setIsDocErr(true); - } + setPlaceholders(templateRes?.Placeholders); + setTemplateDetails(templateRes); + setIsLoader({}); } catch (err) { console.log("err in fetch template in bulk modal", err); setIsBulkSend({}); - setIsDocErr(false); setIsAlert(true); setAlertMsg({ type: "danger", @@ -940,19 +931,11 @@ const ReportTable = (props) => { >
) : ( - <> - {isDocErr ? ( -
- Please add Signers or Roles in template -
- ) : ( - - )} - + )} )}