Skip to content

🔥 The free & Open Source DocuSign alternative

feat: implement dragging functionality on recipient's list to modify sequence of send-in-order during edit document

RaktimaNXGaf6cb4c17de6
diff --git a/apps/OpenSign/src/components/opensigndrive/DriveBody.js b/apps/OpenSign/src/components/opensigndrive/DriveBody.js
index 89241f54f..a550e8eef 100644
--- a/apps/OpenSign/src/components/opensigndrive/DriveBody.js
+++ b/apps/OpenSign/src/components/opensigndrive/DriveBody.js
@@ -280,14 +280,13 @@ function DriveBody(props) {
//component to handle type of document and render according to type
const handleFolderData = (data, ind, listType) => {
- let createddate, status, isDecline, signerExist, isComplete, isPlaceholder;
+ let createddate, status, isDecline, signerExist, isComplete;
if (data.Type !== "Folder") {
const expireDate = data.ExpiryDate && data.ExpiryDate.iso;
const createdDate = data.createdAt && data.createdAt;
createddate = new Date(createdDate).toLocaleDateString();
isComplete = data.IsCompleted && data.IsCompleted ? true : false;
isDecline = data.IsDeclined && data.IsDeclined;
- isPlaceholder = data.Placeholders && data.Placeholders;
signerExist = data.Signers && data.Signers;
const signedUrl = data.SignedUrl;
diff --git a/apps/OpenSign/src/components/pdf/PlaceholderType.js b/apps/OpenSign/src/components/pdf/PlaceholderType.js
index 52137b19a..03e79efb6 100644
--- a/apps/OpenSign/src/components/pdf/PlaceholderType.js
+++ b/apps/OpenSign/src/components/pdf/PlaceholderType.js
@@ -443,7 +443,7 @@ function PlaceholderType(props) {
>
{/* Default/Title option */}
<option value="" disabled hidden>
- {props.pos.options.name}
+ {props?.pos?.options?.name}
</option>
{props.pos?.options?.values.map((data, ind) => {
diff --git a/apps/OpenSign/src/components/pdf/RecipientList.js b/apps/OpenSign/src/components/pdf/RecipientList.js
index a46519d49..0b413e09f 100644
--- a/apps/OpenSign/src/components/pdf/RecipientList.js
+++ b/apps/OpenSign/src/components/pdf/RecipientList.js
@@ -43,7 +43,8 @@ const RecipientList = (props) => {
display: "flex",
flexDirection: "row",
borderBottom: "1px solid #e3e1e1",
- alignItems: "center"
+ alignItems: "center",
+ cursor: props.sendInOrder && "move"
};
return style;
};
@@ -55,7 +56,8 @@ const RecipientList = (props) => {
display: "flex",
flexDirection: "row",
borderBottom: "1px solid #e3e1e1",
- alignItems: "center"
+ alignItems: "center",
+ cursor: props.sendInOrder && "move"
};
return style;
};
@@ -63,19 +65,61 @@ const RecipientList = (props) => {
return props.signerPos.some((x) => x.Id === Id);
};
+ //handle drag start
+ const handleDragStart = (e, id) => {
+ // `e.dataTransfer.getData('text/plain')`is used to set the data to be transferred during a drag operation.
+ // The first argument specifies the type of data being set, and the second argument is the actual data you want to transfer.
+ e.dataTransfer.setData("text/plain", id);
+ };
+
+ //handleDragOver prevents the default behavior of the dragover event, which is necessary for the drop event to be triggered.
+ const handleDragOver = (e) => {
+ e.preventDefault();
+ };
+
+ //handle draggable element drop
+ const handleDrop = (e, index) => {
+ e.preventDefault();
+ //`e.dataTransfer.getData('text/plain')` is used to get data thet you have save.
+ const draggedItemId = e.dataTransfer.getData("text/plain");
+ //convert string to number
+ const intDragId = parseInt(draggedItemId);
+ const draggedItem = props.signersdata.filter(
+ (item) => item.Id === intDragId
+ );
+ const remainingItems = props.signersdata.filter(
+ (item) => item.Id !== intDragId
+ );
+ //splice method is used to replace or add new value in array at specific index
+ remainingItems.splice(index, 0, ...draggedItem);
+ props.setSignersData(remainingItems);
+
+ //set current draggable recipient details after replace recipient list
+ props.setSignerObjId(remainingItems[index]?.objectId || "");
+ props.setIsSelectId(index);
+ props.setContractName(remainingItems[index]?.className || "");
+ props.setUniqueId(remainingItems[index]?.Id);
+ props.setRoleName(remainingItems[index]?.Role);
+ };
return (
<>
{props.signersdata.length > 0 &&
props.signersdata.map((obj, ind) => {
return (
<div
+ key={ind}
+ draggable={props.sendInOrder ? true : false}
+ onDragStart={(e) =>
+ props.sendInOrder && handleDragStart(e, obj.Id)
+ }
+ onDragOver={(e) => props.sendInOrder && handleDragOver(e)}
+ onDrop={(e) => props.sendInOrder && handleDrop(e, ind, obj.Id)}
data-tut="reactourFirst"
onMouseEnter={() => setIsHover(ind)}
onMouseLeave={() => setIsHover(null)}
- key={ind}
style={
isHover === ind || props.isSelectListId === ind
- ? onHoverStyle(ind, obj.blockColor)
+ ? onHoverStyle(ind, obj?.blockColor)
: nonHoverStyle(ind)
}
onClick={() => {
@@ -100,8 +144,8 @@ const RecipientList = (props) => {
<div
className="signerStyle"
style={{
- background: obj.blockColor
- ? darkenColor(obj.blockColor, 0.4)
+ background: obj?.blockColor
+ ? darkenColor(obj?.blockColor, 0.4)
: nameColor[ind % nameColor.length],
width: 30,
height: 30,
@@ -109,7 +153,8 @@ const RecipientList = (props) => {
borderRadius: 30 / 2,
justifyContent: "center",
alignItems: "center",
- marginRight: "12px"
+ marginRight: "12px",
+ cursor: props.sendInOrder && "move"
}}
>
<span
@@ -118,7 +163,8 @@ const RecipientList = (props) => {
textAlign: "center",
fontWeight: "bold",
color: "white",
- textTransform: "uppercase"
+ textTransform: "uppercase",
+ cursor: props.sendInOrder && "move"
}}
>
{isWidgetExist(obj.Id) ? (
@@ -136,11 +182,15 @@ const RecipientList = (props) => {
style={{
display: "flex",
flexDirection: obj.Name ? "column" : "row",
- alignItems: "center"
+ alignItems: "center",
+ cursor: props.sendInOrder && "move"
}}
>
{obj.Name ? (
- <span className="userName" style={{ cursor: "default" }}>
+ <span
+ className="userName"
+ style={{ cursor: props.sendInOrder ? "move" : "default" }}
+ >
{obj.Name}
</span>
) : (
@@ -179,13 +229,16 @@ const RecipientList = (props) => {
</>
)}
{obj.Name && (
- <span className="useEmail" style={{ cursor: "default" }}>
+ <span
+ className="useEmail"
+ style={{ cursor: props.sendInOrder ? "move" : "default" }}
+ >
{obj.Role}
</span>
)}
</div>
</div>
- {props.handleDeleteUser && (
+ {props.handleDeleteUser ? (
<div
onClick={(e) => {
e.stopPropagation();
@@ -195,6 +248,12 @@ const RecipientList = (props) => {
>
<i className="fa-regular fa-trash-can"></i>
</div>
+ ) : (
+ props.sendInOrder && (
+ <div style={{ cursor: "pointer" }}>
+ <i className="fa-solid fa-ellipsis-vertical"></i>
+ </div>
+ )
)}
<hr />
</div>
diff --git a/apps/OpenSign/src/pages/Form.js b/apps/OpenSign/src/pages/Form.js
index 24fa145d5..924542ae6 100644
--- a/apps/OpenSign/src/pages/Form.js
+++ b/apps/OpenSign/src/pages/Form.js
@@ -165,6 +165,8 @@ const Forms = (props) => {
"TimeToCompleteDays",
parseInt(formData?.TimeToCompleteDays)
);
+ }
+ if (props.title !== "Sign Yourself") {
const isChecked = formData.SendinOrder === "true" ? true : false;
object.set("SendinOrder", isChecked);
}
diff --git a/apps/OpenSign/src/pages/PlaceHolderSign.js b/apps/OpenSign/src/pages/PlaceHolderSign.js
index 1d8496a80..07c3d401e 100644
--- a/apps/OpenSign/src/pages/PlaceHolderSign.js
+++ b/apps/OpenSign/src/pages/PlaceHolderSign.js
@@ -1372,7 +1372,6 @@ function PlaceHolderSign() {
const closePopup = () => {
setIsAddUser({});
};
-
return (
<>
<Title title={state?.title ? state.title : "New Document"} />
@@ -1735,6 +1734,8 @@ function PlaceHolderSign() {
setContractName={setContractName}
setUniqueId={setUniqueId}
setRoleName={setRoleName}
+ sendInOrder={pdfDetails[0].SendinOrder}
+ setSignersData={setSignersData}
// handleAddSigner={handleAddSigner}
/>
<div data-tut="reactourSecond">
diff --git a/apps/OpenSign/src/pages/TemplatePlaceholder.js b/apps/OpenSign/src/pages/TemplatePlaceholder.js
index c6069ac17..bc21458a2 100644
--- a/apps/OpenSign/src/pages/TemplatePlaceholder.js
+++ b/apps/OpenSign/src/pages/TemplatePlaceholder.js
@@ -446,7 +446,7 @@ const TemplatePlaceholder = () => {
setIsCheckbox(true);
} else if (dragTypeValue === radioButtonWidget) {
setIsRadio(true);
- }
+ }
setCurrWidgetsDetails({});
setWidgetType(dragTypeValue);
setSignKey(key);
@@ -1466,6 +1466,8 @@ const TemplatePlaceholder = () => {
handleRoleChange={handleRoleChange}
handleOnBlur={handleOnBlur}
title={"Roles"}
+ sendInOrder={pdfDetails[0]?.SendinOrder}
+ setSignersData={setSignersData}
/>
<div data-tut="reactourSecond">
<WidgetComponent