{selectedDocuments && selectedDocuments.length && selectedDocuments.map((document, indx) => {
@@ -34,7 +34,7 @@ const DocumentPages = ({ selectedDocuments, setDropDownTogglePage, dropDownToggl
document.pages != undefined && 
}
diff --git a/src/components/client/SignDocument.tsx b/src/components/client/SignDocument.tsx
index 39850d4..89fed20 100644
--- a/src/components/client/SignDocument.tsx
+++ b/src/components/client/SignDocument.tsx
@@ -1,9 +1,9 @@
-import { useEffect, useLayoutEffect, useState } from "react";
+import { useEffect, useState } from "react";
import axios from "axios"
import { RootState } from "../../store/store";
import { useNavigate, useParams } from "react-router-dom"
-import { DroppedItem, DroppedItemsObj, TagsTypes } from "../../utlity/types";
+import { DroppedItem, TagsTypes } from "../../utlity/types";
import Loader from "../dashboard/Loader";
import SignCon from "../signature/SignCon";
@@ -11,24 +11,22 @@ import { Bounce, toast } from "react-toastify";
import { useDispatch, useSelector } from "react-redux";
import { hideLoader, showLoader } from "../../store/slices/loaderSlice";
-import { FaRegImage, FaFileAlt, FaSignature, FaStamp, FaCheck, FaQuestionCircle } from 'react-icons/fa'
+import { FaFileAlt, FaSignature, FaStamp, FaCheck, FaQuestionCircle } from 'react-icons/fa'
import { IoIosDocument, IoMdClose } from 'react-icons/io'
import { MdKeyboardArrowDown } from 'react-icons/md'
-import { TbChevronsDownLeft, TbSignature } from "react-icons/tb";
+import { TbSignature } from "react-icons/tb";
import { BsFileArrowDownFill } from "react-icons/bs";
import dayjs from "dayjs";
import maskUtils from "../../utlity/maskUtils";
import StampUpload from "../stamp/StampUpload";
-import TermsModal from "./TermsModal";
import DocumentPages from "./DocumentPages";
import FieldList from "../process/processStepTwo/FieldList";
import typeToIconMap from "../../helper/iconMap";
-import { droppedTagsDefaultField } from "../process/processStepTwo/DocumentContainer";
import SignCompletionScreen from "./SignCompletionScreen";
import api from "../../config/api";
-import RightSideBar from "../process/processStepTwo/rightSideBar/RightSideBar";
import { RiDragMoveFill } from "react-icons/ri";
import { handleGroupBorderPosition } from "../../utlity/tagGroupConUtils";
+import RightSideBar from "../process/processStepTwo/rightSideBar/RightSideBar";
@@ -45,6 +43,7 @@ interface RecipientType {
phone: string | null;
index: number;
type: string;
+ provideOwnTags: boolean;
recipientStatus: string;
authType: string | null;
language: string | null;
@@ -134,6 +133,11 @@ const fitObj = [
},
]
+enum RightSideNav {
+ ATTRIBUTES = "attributes",
+ PAGES = "pages"
+}
+
// Functions - LIST
// handleSignClick - Handle when sign || Initial tag got clicked
// fetchData - Fetch document pages and tags data
@@ -157,6 +161,7 @@ const SignDocument = () => {
const [stamp, setStamp] = useState({ open: false, blob: "" });
+ const [rightSideNavToggle, setRightSideNavToggle] = useState(RightSideNav.PAGES);
// Handling Date Opacity
const [dateValues, setDateValues] = useState<{ [key: string]: string }>({});
@@ -348,6 +353,8 @@ const SignDocument = () => {
setTransaction(res?.data?.transaction)
setRecSignStatus(res?.data?.status)
+ if (res?.data?.details.provideOwnTags) setRightSideNavToggle(RightSideNav.ATTRIBUTES)
+
if ("provideOwnTags" in res?.data?.details && res?.data?.details.provideOwnTags) {
setProvideTags(true)
}
@@ -938,6 +945,10 @@ const SignDocument = () => {
};
+ const handleSetIsFields = (setTo: boolean) => {
+ if (setTo !== isFields) setIsFields(setTo);
+ }
+
// const [showTerms, setShowTerms] = useState(true);
return (
@@ -990,6 +1001,19 @@ const SignDocument = () => {
{/* FIT - END */}
+ {provideTags && handleSetIsFields(true)}
+ className={`flex items-center gap-1 cursor-pointer text-xs px-2 py-1 rounded-sm ${isFields ? 'bg-slate-100' : ''}`}>
+
}
+
+ Fields
+ handleSetIsFields(provideTags ? false : !isFields)}
+ className={`flex items-center gap-1 cursor-pointer text-xs px-2 py-1 rounded-sm ${!isFields ? 'bg-slate-100' : ''}`}>
+
Pages
+
{
@@ -1669,15 +1697,9 @@ const SignDocument = () => {
-
- {selectedDocuments !== null &&
+ {/* Right Side Attributes Section if providedTags - START */}
{
selTagKey={selectedTag.key}
selTagIndx={selectedTag.index}
signClient={true}
- />} */}
-
-
-
+ />
+ {/* Right Side Attributes Section if providedTags - END */}
+ }
{/* Right Side - START */}
{/*
diff --git a/src/components/home/StartNow.tsx b/src/components/home/StartNow.tsx
index 641c8ca..f01dd59 100644
--- a/src/components/home/StartNow.tsx
+++ b/src/components/home/StartNow.tsx
@@ -24,7 +24,10 @@ const StartNow = () => {
const transactionId = transactionRes.data.id
const formData = new FormData();
- formData.append("file", filesToUpload[0]);
+
+ filesToUpload.forEach(file => {
+ formData.append("file", file);
+ });
dispatch(uploadDocuments({ formData, accountId, transactionId }))
.unwrap()
diff --git a/src/components/home/StartSection.tsx b/src/components/home/StartSection.tsx
index f1d07ec..381dc54 100644
--- a/src/components/home/StartSection.tsx
+++ b/src/components/home/StartSection.tsx
@@ -125,13 +125,13 @@ const StartSection = () => {
{/* Recent Data Section */}
-
+
-
+ {/*
+ */}
diff --git a/src/components/process/RecipientAddCard.tsx b/src/components/process/RecipientAddCard.tsx
deleted file mode 100644
index f85a325..0000000
--- a/src/components/process/RecipientAddCard.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { useState } from "react";
-import { FaPlus } from "react-icons/fa";
-
-type RecipientAddCardProps = {
- addRecipient: (name: string, email: string, type: "mailToSign" | "inPerson" | "cc") => void; // Adjust the parameter type as needed
-};
-
-const RecipientAddCard: React.FC = ({ addRecipient }) => {
-
- const [recipient] = useState()
-
- const handleRecipientAdd = () => {
-
- }
-
-
- return (
- = ({ id, name, isCompleted , tra
let lastUpdate = 0;
const delay = 1000;
- const docProgSSE = new EventSource(`http://192.168.2.112:8083/api/progress/${id}`);
+ const docProgSSE = new EventSource(`http://192.168.2.176:8083/api/progress/${id}`);
docProgSSE.addEventListener('progress', (event) => {
const jsonData = JSON.parse(event.data);
diff --git a/src/components/process/processStepOne/ProcessStepOne.tsx b/src/components/process/processStepOne/ProcessStepOne.tsx
index eba3c0f..b3742ae 100644
--- a/src/components/process/processStepOne/ProcessStepOne.tsx
+++ b/src/components/process/processStepOne/ProcessStepOne.tsx
@@ -47,16 +47,6 @@ const ProcessStepOne = () => {
const [editCase, setEditCase] = useState("")
const [editRecipient, setEditRecipient] = useState({})
-
-
- // if (!accountId || !transactionId) {
- // window.location.href = "/";
- // return null;
- // }
-
- // const selectedDocuments = useSelector((state: RootState) => state.selectedDocuments.selectedDocuments)
- // const { selectedDocuments, signType } = useSelector((state: RootState) => state.selectedDocuments)
-
const selectedDocuments = useSelector((state: RootState) => state.documents.documents)
const selectedRecipients = useSelector((state: RootState) => state.selectedRecipients.recipients)
const [showSelfSignWarnModal, setShowSelfSignWarnModal] = useState(false)
@@ -82,13 +72,9 @@ const ProcessStepOne = () => {
}, 5000); // hide icon while typing, show it again after 500ms of no input
};
- // const userData = useSelector((state: RootState) => state.user)
-
const [transactionDetails, setTransactionDetails] = useState([]);
useEffect(() => {
- // <<<<<<< HEAD
- // Fetching Transaction Details - START
(async () => {
try {
const res = await api.get(`/api/accounts/${accountId}/${transactionTemplateToggle}/${transactionId}`);
@@ -105,31 +91,24 @@ const ProcessStepOne = () => {
} catch (e) {
}
})()
- // Fetching Transaction Details - END
-
- // =======
- // (async () => {
- // const res = await api.get(`/api/accounts/${accountId}/${transactionTemplateToggle}/${transactionId}`)
- // })()
- // >>>>>>> origin/main
-
- // (async () => {
- // const res = await api.get(`/api/accounts/${accountId}/${transactionTemplateToggle}/${transactionId}`)
- // })()
selectedRecipients.length === 0 && dispatch(fetchRecipients({ accountId, transactionId }));
selectedDocuments.length === 0 && dispatch(fetchDocuments({ accountId, transactionId }));
}, [])
- // const signingOrder = useSelector((state: RootState) => state.selectedRecipients.signingOrder)
- // const user = useSelector((state: RootState) => state.user)
-
const [emailDtls, setEmailDtls] = useState({ subject: "Documents for Signature", message: "" });
useEffect(() => {
dispatch(hideLoader());
}, [])
+
+ const getMinRoutingOrder = () => {
+ return selectedRecipients.reduce((min, recipient) => {
+ return Math.min(min, recipient.routingOrder ?? Infinity);
+ }, Infinity);
+ };
+
const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
const handleNextClick = async (saveAndClose: boolean = false) => {
@@ -208,13 +187,13 @@ const ProcessStepOne = () => {
dispatch(showLoader("Processing Recipients..."));
- let minRoutingOrder = 1
- selectedRecipients.forEach((recipient) => {
- if (recipient.routingOrder ?? 1 < minRoutingOrder) {
- minRoutingOrder = recipient.routingOrder ?? 1;
- }
- });
-
+ let minRoutingOrder = getMinRoutingOrder();
+ // selectedRecipients.forEach((recipient) => {
+ // if (recipient.routingOrder ?? 1 < minRoutingOrder) {
+ // minRoutingOrder = recipient.routingOrder ?? 1;
+ // }
+ // });
+
const recipientsData = selectedRecipients.map((recipient, index) => ({
id: "id" in recipient ? recipient.id : null,
routingOrder: "routingOrder" in recipient && recipient.routingOrder ? recipient.routingOrder : 1,
@@ -248,11 +227,10 @@ const ProcessStepOne = () => {
await Promise.all(
selectedRecipients.map((recipient) => dispatch(removeRecipientAsync({
recipientId: recipient.id,
- email: recipient.email,
accountId,
transactionId,
- }))
- )
+ email: recipient.email,
+ })))
);
recipientsDataTemp = [{
@@ -273,9 +251,11 @@ const ProcessStepOne = () => {
phone: "",
accessCode: "",
accessCodeDelivery: true,
- language: "en",
+ language: userData.language ? userData.language : "en",
name: `${userData.firstName} ${userData.lastName}`,
- roleName: ""
+ roleName: "",
+ allowSenderToEdit: true,
+ allowSenderToDelete: true,
}]
try {
@@ -287,7 +267,8 @@ const ProcessStepOne = () => {
}
} else {
- await dispatch(addRecipientAsync({ recipientsData: recipientsDataTemp, accountId, transactionId }));
+ if(!accountId || !transactionId) return;
+ dispatch(addRecipientAsync({ recipientsData: recipientsDataTemp, accountId, transactionId }));
}
dispatch(showLoader("Processing Message..."));
@@ -297,11 +278,6 @@ const ProcessStepOne = () => {
status: "CREATED"
})
- // if (isSendNow) {
- // dispatch(updateTransactionStatus(TRANSACTION_STATUS_ENUMS.TRANSACTION_SEND_SUCCESS));
- // }
- // else {
- // setTimeout(() => {
dispatch(resetDocuments())
dispatch(resetRecipients())
if (transactionTemplateToggle === TRANSACTION_TEMPLATE_TOGGLE.TEMPLATES) {
@@ -397,7 +373,7 @@ const ProcessStepOne = () => {
className='flex items-center gap-3'>
{transactionTemplateToggle === TRANSACTION_TEMPLATE_TOGGLE.TEMPLATES &&
-
+ }
-
- );
-};
-
-export default RecipientAddCard;
\ No newline at end of file
diff --git a/src/components/process/processStepOne/DocumentCard.tsx b/src/components/process/processStepOne/DocumentCard.tsx
index b79f52c..264371a 100644
--- a/src/components/process/processStepOne/DocumentCard.tsx
+++ b/src/components/process/processStepOne/DocumentCard.tsx
@@ -39,7 +39,7 @@ const DocumentCard: React.FCAdd Recipient Details
-
-
-
-
-
-
-
-
-
-
-
- {[
- { label: "Mail To Sign", value: "mailToSign" },
- { label: "In-Person", value: "inPerson" },
- { label: "CC", value: "cc" }
- ].map((option) => (
-
- ))}
-
-
-
-
-