BhawanSingh
/
SME-Web
2
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Template fix and auto save fix

This commit is contained in:
=bhagwanSingh 2025-08-07 13:49:15 +05:30
parent 3e0ce80278
commit 4de7c2540e
13 changed files with 564 additions and 525 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/client/SignCompletionScreen.tsx
View File

@ -301,7 +301,7 @@ const SignCompletionScreen: React.FC = () => {
> >
{/* <a> */} {/* <a> */}
<IoMdArrowRoundBack className="w-5 h-5 mr-3" /> <IoMdArrowRoundBack className="w-5 h-5 mr-3" />
Back Sign Made Easy Back to Sign Made Easy
{/* </a> */} {/* </a> */}
</a> : </a> :
<a <a

57
src/components/client/SignDocument.tsx
View File

@ -25,6 +25,7 @@ import FieldList from "../process/processStepTwo/FieldList";
import typeToIconMap from "../../helper/iconMap"; import typeToIconMap from "../../helper/iconMap";
import { droppedTagsDefaultField } from "../process/processStepTwo/DocumentContainer"; import { droppedTagsDefaultField } from "../process/processStepTwo/DocumentContainer";
import SignCompletionScreen from "./SignCompletionScreen"; import SignCompletionScreen from "./SignCompletionScreen";
import api from "../../config/api";
@ -81,6 +82,7 @@ export enum SaveTypeEnum {
UPLOAD = "IMAGE", UPLOAD = "IMAGE",
} }
export interface SaveType { export interface SaveType {
signatureId: string | null
saveType: SaveTypeEnum | null; saveType: SaveTypeEnum | null;
save: boolean; save: boolean;
signature: string | null; signature: string | null;
@ -134,7 +136,15 @@ const fitObj = [
// fetchData - Fetch document pages and tags data // fetchData - Fetch document pages and tags data
// handleFormSubmit - handle form submit and send data to server // handleFormSubmit - handle form submit and send data to server
const SignDocument = () => { const SignDocument = () => {
useEffect(() => {
axios.get("https://concrete-gladly-mullet.ngrok-free.app/api/sign/session?recipientId=103&sessionId=iqlo2inofsqaqib8mcos4njssj").then((res) => {
console.log(res, "RESPONSE")
})
}, [])
const { recipientId } = useParams(); const { recipientId } = useParams();
const dispatch = useDispatch(); const dispatch = useDispatch();
@ -151,7 +161,6 @@ const SignDocument = () => {
const [stamp, setStamp] = useState<StampTypeObj>({ open: false, blob: "" }); const [stamp, setStamp] = useState<StampTypeObj>({ open: false, blob: "" });
console.log(recipient, "recipient Line 145")
// Handling Date Opacity // Handling Date Opacity
const [dateValues, setDateValues] = useState<{ [key: string]: string }>({}); const [dateValues, setDateValues] = useState<{ [key: string]: string }>({});
@ -179,6 +188,7 @@ const SignDocument = () => {
const [showCompletionScreen, setShowCompletionScreen] = useState(false) const [showCompletionScreen, setShowCompletionScreen] = useState(false)
const [saved, setSaved] = useState<SaveType>({ const [saved, setSaved] = useState<SaveType>({
signatureId: null,
saveType: null, saveType: null,
save: false, save: false,
signature: null, signature: null,
@ -190,7 +200,6 @@ const SignDocument = () => {
const [signConfObj, setSignConfObj] = useState<SignConfTypeObj | {}>({}); const [signConfObj, setSignConfObj] = useState<SignConfTypeObj | {}>({});
console.log("signConfObj", signConfObj)
const zoom = (percentage: number, contentClass: string) => { const zoom = (percentage: number, contentClass: string) => {
const content = document.querySelector(`.${contentClass}`); const content = document.querySelector(`.${contentClass}`);
@ -224,15 +233,12 @@ const SignDocument = () => {
} }
}, [droppedItems]) }, [droppedItems])
console.log(saved, "Line 162")
useEffect(() => { useEffect(() => {
if (recSignStatus === "COMPLETED") { if (recSignStatus === "COMPLETED") {
console.log("SETTING HIDE TAGS to TRUE LIne 161")
// setHideTags(true); // setHideTags(true);
setTransparentTags(true); setTransparentTags(true);
} else { } else {
console.log("SETTING HIDE TAGS to TRUE LIne 161")
setHideTags(false); setHideTags(false);
} }
}, [recSignStatus]) }, [recSignStatus])
@ -256,7 +262,6 @@ const SignDocument = () => {
}, [saved]) }, [saved])
const handleSignClick = (index: number, id: number) => { const handleSignClick = (index: number, id: number) => {
console.log("IDNumber", id)
setSignTagId(id) setSignTagId(id)
if (saved.save) { if (saved.save) {
if (index in signConfObj) { if (index in signConfObj) {
@ -287,7 +292,6 @@ const SignDocument = () => {
const handleStampClick = (index: number) => { const handleStampClick = (index: number) => {
console.log("Stamp Clicked", index)
setStamp({ setStamp({
open: true, open: true,
blob: "" blob: ""
@ -308,10 +312,8 @@ const SignDocument = () => {
{ "ngrok-skip-browser-warning": "69420", } { "ngrok-skip-browser-warning": "69420", }
}) })
.then((res) => { .then((res) => {
console.dir(res)
if (res.status === 200) { if (res.status === 200) {
console.log(res, "Line 288")
setSelectedDocuments(res.data.documents) setSelectedDocuments(res.data.documents)
setRecipient(res.data.details) setRecipient(res.data.details)
@ -335,12 +337,10 @@ const SignDocument = () => {
}) })
.catch((err) => { .catch((err) => {
console.error(err.message)
}); });
} }
console.log(droppedItems, "Line 261")
const handleFormSubmit = (e: React.FormEvent<HTMLFormElement>) => { const handleFormSubmit = (e: React.FormEvent<HTMLFormElement>) => {
e.preventDefault(); e.preventDefault();
@ -366,7 +366,6 @@ const SignDocument = () => {
} }
} }
console.log(signInitialsCount, Object.keys(signConfObj).length, "boom")
if (signInitialsCount !== Object.keys(signConfObj).length) { if (signInitialsCount !== Object.keys(signConfObj).length) {
toast.error("Please ensure all signature and initials are signed", { toast.error("Please ensure all signature and initials are signed", {
@ -384,7 +383,6 @@ const SignDocument = () => {
} }
for (const tag of droppedItems) { for (const tag of droppedItems) {
console.log(tag, "Tag Data")
// if ((tag.type === "SIGNATURE" || tag.subType === "INITIALS") && !tag.value) { // if ((tag.type === "SIGNATURE" || tag.subType === "INITIALS") && !tag.value) {
if (("required" in tag && tag.required) && ((tag.type !== "SIGNATURE" && tag.type !== "INITIALS") && (tag.value === "" || !("value" in tag)))) { if (("required" in tag && tag.required) && ((tag.type !== "SIGNATURE" && tag.type !== "INITIALS") && (tag.value === "" || !("value" in tag)))) {
@ -460,9 +458,6 @@ const SignDocument = () => {
dispatch(showLoader("Signing ...")); dispatch(showLoader("Signing ..."));
axios.post(`${import.meta.env.VITE_BASE_URI}/api/sign?recipientId=${recipientId}`, submitData, { headers: { "ngrok-skip-browser-warning": "69420", } }) axios.post(`${import.meta.env.VITE_BASE_URI}/api/sign?recipientId=${recipientId}`, submitData, { headers: { "ngrok-skip-browser-warning": "69420", } })
.then((res) => { .then((res) => {
console.group("Submitting Sign Details");
console.dir(res);
console.groupEnd();
if (res.status === 200) { if (res.status === 200) {
setTransparentTags(true) setTransparentTags(true)
setTimeout(() => { setTimeout(() => {
@ -486,7 +481,6 @@ const SignDocument = () => {
} }
}) })
.catch((err) => { .catch((err) => {
console.error(err.message)
} }
) )
}; };
@ -538,11 +532,9 @@ const SignDocument = () => {
headers: { "ngrok-skip-browser-warning": "69420" } headers: { "ngrok-skip-browser-warning": "69420" }
}); });
if (response.status === 200) { if (response.status === 200) {
console.log("line 516", response.data)
return response.data; return response.data;
} }
} catch (error) { } catch (error) {
console.error("Error fetching signature data:", error);
} }
return null; return null;
} }
@ -552,9 +544,7 @@ const SignDocument = () => {
// if (droppedItems) { // if (droppedItems) {
// for (const tag of droppedItems) { // for (const tag of droppedItems) {
// if (tag.type === "SIGNATURE" && "value" in tag) { // if (tag.type === "SIGNATURE" && "value" in tag) {
// console.log(tag, "line 533")
// const signatureData = await fetchSignatureData(tag["value"]); // const signatureData = await fetchSignatureData(tag["value"]);
// console.log("Currnet Signature",signatureData);
// } // }
// } // }
// } // }
@ -588,7 +578,6 @@ const SignDocument = () => {
// HANDLE DROP - START // HANDLE DROP - START
const handleDrop = (event: React.DragEvent<HTMLDivElement>, docId: string, documentId: number, pageIndex: number) => { const handleDrop = (event: React.DragEvent<HTMLDivElement>, docId: string, documentId: number, pageIndex: number) => {
console.log("// HANDLE DROP - START")
event.preventDefault(); event.preventDefault();
const data = window.dragElemData; const data = window.dragElemData;
@ -763,7 +752,6 @@ const SignDocument = () => {
left = Math.max(0, Math.min(left, conScrollWidth - elementRect.width)); left = Math.max(0, Math.min(left, conScrollWidth - elementRect.width));
top = Math.max(0, Math.min(top, conScrollHeight - elementRect.height)); top = Math.max(0, Math.min(top, conScrollHeight - elementRect.height));
console.log(left, top, "LEFTTOP")
if (groupElements != null && groupElements.length) handleGroupBorderPosition(groupElements, containerRect, offsetX, offsetY); if (groupElements != null && groupElements.length) handleGroupBorderPosition(groupElements, containerRect, offsetX, offsetY);
@ -791,18 +779,17 @@ const SignDocument = () => {
// Updated handleRemoveTag function with your existing API logic and group handling // Updated handleRemoveTag function with your existing API logic and group handling
const handleRemoveTag = (key: string, targetIndex: number) => { const handleRemoveTag = (key: string, targetIndex: number) => {
console.log(droppedItems, "Line 784")
const tag = droppedItems[key][targetIndex]; const tag = droppedItems[key][targetIndex];
const recipientId = tag.recipientId; const recipientId = tag.recipientId;
console.log(tag, "line 776");
(async () => { (async () => {
if ("id" in tag) { if ("id" in tag) {
try { try {
const response = await api.delete(`/api/accounts/${accountId}/${transactionTemplateToggle}/${transactionId}/recipients/${recipientId}/tags/${tag.id}`) const response = await api.delete(`/api/accounts/${accountId}/${transactionTemplateToggle}/${transactionId}/recipients/${recipientId}/tags/${tag.id}`)
if (response.status !== 200) throw "Tag Deletion error" if (response.status !== 200) throw "Tag Deletion error"
} catch (err) { } catch (err) {
console.error("Tag Deletion error")
return; return;
} }
} }
@ -826,7 +813,6 @@ const SignDocument = () => {
if (isParentItem && groupItems.length > 1) { if (isParentItem && groupItems.length > 1) {
// If removing the parent and there are child items, mark all items in the group as deleted // If removing the parent and there are child items, mark all items in the group as deleted
console.log(`Removing parent item and all children for group: ${groupId}`);
// Get indices of all group items to mark as deleted // Get indices of all group items to mark as deleted
const indicesToDelete = groupItems.map(({ index }) => index); const indicesToDelete = groupItems.map(({ index }) => index);
@ -845,7 +831,6 @@ const SignDocument = () => {
} else { } else {
// If removing a child item or the only item in group, just mark this item as deleted // If removing a child item or the only item in group, just mark this item as deleted
console.log(`Removing individual item from group: ${groupId}`);
setDroppedItems(prevState => ({ setDroppedItems(prevState => ({
...prevState, ...prevState,
@ -881,7 +866,6 @@ const SignDocument = () => {
})() })()
}; };
console.log(droppedItems, "DROPPED ITEMS LINE 680")
// const [showTerms, setShowTerms] = useState<boolean>(true); // const [showTerms, setShowTerms] = useState<boolean>(true);
return ( return (
@ -1017,7 +1001,6 @@ const SignDocument = () => {
{ {
selectedDocuments && selectedDocuments.length > 0 && selectedDocuments.map((doc) => { selectedDocuments && selectedDocuments.length > 0 && selectedDocuments.map((doc) => {
console.log(droppedItems, "tagJsontagJsontagJson")
return ( return (
<div key={doc.documentId} className='flex flex-col'> <div key={doc.documentId} className='flex flex-col'>
<div className='py-2 text-sm'> <div className='py-2 text-sm'>
@ -1028,12 +1011,9 @@ const SignDocument = () => {
{ {
doc.pages && doc.pages.length > 0 && doc.pages.map((page, indx) => { doc.pages && doc.pages.length > 0 && doc.pages.map((page, indx) => {
const key = `${doc.documentId}_${page.index}`; const key = `${doc.documentId}_${page.index}`;
console.log(droppedItems, "line 820")
// const tagJsonData = [...droppedItems]; // const tagJsonData = [...droppedItems];
// console.log(tagJsonData, "Line 821")
const currDocTags = droppedItems.filter((val) => val.pageIndex === page.index) const currDocTags = droppedItems.filter((val) => val.pageIndex === page.index)
console.log(currDocTags, droppedItems, page, doc, "innnnnnnnnnnnn")
return ( return (
<div <div
key={indx} key={indx}
@ -1047,9 +1027,9 @@ const SignDocument = () => {
{currDocTags.map((item, index) => { {currDocTags.map((item, index) => {
console.log(item, "micCheck 842") if (item.pageIndex !== page.index || item.documentId != doc.documentId) return <></>;
if (item.pageIndex !== page.index) return;
return ( return (
<>
<div <div
tabIndex={1} tabIndex={1}
@ -1082,6 +1062,8 @@ const SignDocument = () => {
</p> */} </p> */}
<p className='capitalize text-ellipsis whitespace-nowrap'>{item.label}</p> <p className='capitalize text-ellipsis whitespace-nowrap'>{item.label}</p>
<IoMdClose onClick={(e) => { <IoMdClose onClick={(e) => {
console.log("Handle Remove Tag Called");
e.stopPropagation(); e.stopPropagation();
handleRemoveTag(key, index) handleRemoveTag(key, index)
}} className='cursor-pointer' /> }} className='cursor-pointer' />
@ -1141,14 +1123,11 @@ const SignDocument = () => {
if (e.key === "Enter") e.preventDefault(); if (e.key === "Enter") e.preventDefault();
}} }}
onFocus={() => { onFocus={() => {
console.log("focus")
}} }}
onBlur={(e) => { onBlur={(e) => {
let val = e.target.textContent; let val = e.target.textContent;
console.log(item.mask, val, "Line 586")
if (typeof item.mask?.maskType === "string" && typeof val === "string") { if (typeof item.mask?.maskType === "string" && typeof val === "string") {
val = val.replace(/ /g, ""); val = val.replace(/ /g, "");
console.log("onBlur", item.mask.maskCharacter, maskUtils((item.mask as { maskType: string }).maskType, val, (item.mask as { maskCharacter: string }).maskCharacter))
e.target.textContent = maskUtils((item.mask as { maskType: string }).maskType, val, (item.mask as { maskCharacter: string }).maskCharacter) e.target.textContent = maskUtils((item.mask as { maskType: string }).maskType, val, (item.mask as { maskCharacter: string }).maskCharacter)
} }
}} }}
@ -1406,7 +1385,7 @@ const SignDocument = () => {
</> </>
} }
</div> </div>
</>
) )
}) })
} }

2
src/components/home/StartNow.tsx
View File

@ -50,7 +50,7 @@ const StartNow = () => {
<div <div
onClick={() => fileInputRef.current?.click()} onClick={() => fileInputRef.current?.click()}
id='start-now-upload-con' id='start-now-upload-con'
className="group cursor-pointer border-slate-300 rounded-lg bg-white/60 transition-all duration-200 p-4 flex flex-col items-center justify-center gap-2 text-center shadow-sm hover:shadow-md"> className="group col-span-2 cursor-pointer border-slate-300 rounded-lg bg-white/60 transition-all duration-200 p-4 flex flex-col items-center justify-center gap-2 text-center shadow-sm hover:shadow-md">
{/* Upload icon with subtle animation */} {/* Upload icon with subtle animation */}
<div className="p-2 text-blue-600 group-hover:text-blue-700 transition-colors"> <div className="p-2 text-blue-600 group-hover:text-blue-700 transition-colors">
<FiUpload className="text-lg" /> <FiUpload className="text-lg" />

43
src/components/home/StartSection.tsx
View File

@ -28,16 +28,17 @@ const cards = [
// buttonText: 'Start Now', // buttonText: 'Start Now',
// bg: 'bg-white/60', // bg: 'bg-white/60',
// }, // },
{ // {
icon: <FiEdit className="w-5 h-5 text-green-700" />, // icon: <FiEdit className="w-5 h-5 text-green-700" />,
title: 'Sign an Agreement', // title: 'Sign an Agreement',
description: 'Upload a document you need to sign and place your signature.', // description: 'Upload a document you need to sign and place your signature.',
bg: 'bg-white/60', // bg: 'bg-white/60',
}, // },
{ {
icon: <FiFolder className="w-5 h-5 text-purple-700" />, icon: <FiFolder className="w-5 h-5 text-purple-700" />,
title: 'Use a Template', title: 'Use a Template',
description: 'Pick from ready-made templates for common agreements.', description: 'Pick from ready-made templates for common agreements.',
link: "/templates",
bg: 'bg-white/60', bg: 'bg-white/60',
}, },
]; ];
@ -54,19 +55,19 @@ const StartSection = () => {
const defaultAccountId = user.account.id; const defaultAccountId = user.account.id;
const handleStartSectionClick = (card: StartCard) => { const handleStartSectionClick = (link: string) => {
if ("buttonText" in card && card.buttonText === "Start Now") { // if ("buttonText" in card && card.buttonText === "Start Now") {
api.post(`/api/accounts/${defaultAccountId}/transactions`) // api.post(`/api/accounts/${defaultAccountId}/transactions`)
.then(res => { // .then(res => {
if (res.status === 200 || res.status === 201) { // if (res.status === 200 || res.status === 201) {
dispatch(updateTransactionStatus(TRANSACTION_STATUS_ENUMS.TRANSACTION_INITIATED)); // dispatch(updateTransactionStatus(TRANSACTION_STATUS_ENUMS.TRANSACTION_INITIATED));
dispatch(setTransactionId(res.data)); // dispatch(setTransactionId(res.data));
setTimeout(() => navigate(`/process-step-one/${defaultAccountId}/${res.data.id}`), 0) // setTimeout(() => navigate(`/process-step-one/${defaultAccountId}/${res.data.id}`), 0)
} // }
}) // })
.catch(err => console.log(err)) // .catch(err => console.log(err))
} // }
// navigate("/process-step-one"); navigate(link);
} }
// useEffect(() => { // useEffect(() => {
@ -87,10 +88,10 @@ const StartSection = () => {
<StartNow /> <StartNow />
<div className='col-span-2 grid grid-cols-2 justify-between gap-4'> <div className='col-span-1 grid grid-cols-1 justify-between gap-4'>
{cards.map((card, index) => ( {cards.map((card, index) => (
<div <div
onClick={() => handleStartSectionClick(card)} onClick={() => handleStartSectionClick(card.link)}
key={index} key={index}
className={`${card.bg} w-full max-h-max cursor-pointer relative border border-gray-200 rounded-xl p-4 shadow-sm hover:shadow-md transition-all flex flex-col justify-between`} className={`${card.bg} w-full max-h-max cursor-pointer relative border border-gray-200 rounded-xl p-4 shadow-sm hover:shadow-md transition-all flex flex-col justify-between`}
> >

4
src/components/process/CompletionScreen/DocumentCompletionScreen.tsx
View File

@ -285,8 +285,8 @@ const DocumentCompletionScreen = () => {
className='flex items-center gap-3'> className='flex items-center gap-3'>
<Link to={`/accounts/${accountId}/transactions/${transactionId}`} className="flex items-center gap-2 cursor-pointer text-xs px-4 py-2 ml-3 rounded-sm bg-[var(--primary)]"> <Link to={`/accounts/${accountId}/transactions/${transactionId}`} className="flex items-center gap-2 cursor-pointer text-xs px-4 py-2 ml-3 rounded-sm bg-[var(--primary)]">
<FaPen className=" text-white text-md" /> {/* <FaPen className=" text-white text-md" /> */}
<span className="tracking-wide text-white">Edit</span> <span className="tracking-wide text-white">View Transaction</span>
</Link> </Link>
{/* <button {/* <button

11
src/components/process/processStepOne/ProcessStepOne.tsx
View File

@ -95,6 +95,15 @@ const ProcessStepOne = () => {
try { try {
const res = await api.get(`/api/accounts/${accountId}/${transactionTemplateToggle}/${transactionId}`); const res = await api.get(`/api/accounts/${accountId}/${transactionTemplateToggle}/${transactionId}`);
setTransactionDetails(res.data) setTransactionDetails(res.data)
if (transactionTemplateToggle === TRANSACTION_TEMPLATE_TOGGLE.TEMPLATES) {
setTemplateName(res.data.name)
}
setEmailDtls(
{ subject: res.data.subject ? res.data.subject : "Documents for Signature", message: res.data.message ? res.data.message : "" }
)
// console.log("setTransactionDetails",res.data) // console.log("setTransactionDetails",res.data)
} catch (e) { } catch (e) {
console.log("Error - transactions details") console.log("Error - transactions details")
@ -425,7 +434,7 @@ const ProcessStepOne = () => {
{ {
(signType !== SignTypeEnum.selfSign || showSelfSignWarnModal) && (signType !== SignTypeEnum.selfSign || showSelfSignWarnModal) &&
<div className="flex flex-col gap-4 align-start"> <div className="flex flex-col gap-4 align-start">
<RecipientCards transactionTemplateToggle={transactionTemplateToggle} setEditRecipient={setEditRecipient} setEditCase={setEditCase} /> <RecipientCards editRecipient={editRecipient} transactionTemplateToggle={transactionTemplateToggle} setEditRecipient={setEditRecipient} setEditCase={setEditCase} />
{/* {signType !== "self-sign" && <RecipientAddCard />} */} {/* {signType !== "self-sign" && <RecipientAddCard />} */}
<div <div

11
src/components/process/processStepOne/RecipientCards.tsx
View File

@ -26,12 +26,13 @@ const getInitials = (name: string) => {
}; };
type CardsData = { type CardsData = {
editRecipient: any;
setEditRecipient: (recipient: any) => void; // Replace `any` with the actual type if known setEditRecipient: (recipient: any) => void; // Replace `any` with the actual type if known
setEditCase: (string: any) => void; setEditCase: (string: any) => void;
transactionTemplateToggle: string transactionTemplateToggle: string
}; };
const RecipientCards = ({ setEditRecipient, setEditCase, transactionTemplateToggle , editRecipient ,editCase }: CardsData) => { const RecipientCards = ({ editRecipient, setEditRecipient, setEditCase, transactionTemplateToggle }: CardsData) => {
const templateId = useParams<{ templateId: string }>().templateId; const templateId = useParams<{ templateId: string }>().templateId;
let { accountId, transactionId } = useParams<{ accountId: string, transactionId: string }>(); let { accountId, transactionId } = useParams<{ accountId: string, transactionId: string }>();
@ -127,7 +128,10 @@ const RecipientCards = ({ setEditRecipient, setEditCase, transactionTemplateTogg
)} )}
<div className="flex flex-col divide-y divide-gray-200"> <div className="flex flex-col divide-y divide-gray-200">
{recipients.map((recipient, idx) => ( {recipients.map((recipient, idx) => {
// if(recipient.id === editRecipient.id) return
return (
<div <div
key={recipient.email + idx} key={recipient.email + idx}
className="flex items-center justify-between px-4 py-3 hover:bg-gray-50 transition-colors" className="flex items-center justify-between px-4 py-3 hover:bg-gray-50 transition-colors"
@ -214,7 +218,8 @@ const RecipientCards = ({ setEditRecipient, setEditCase, transactionTemplateTogg
)} )}
</div> </div>
))} )
})}
</div> </div>
</> </>
) : ( ) : (

46
src/components/process/processStepTwo/DocumentContainer.tsx
View File

@ -77,9 +77,6 @@ const DocumentContainer: React.FC<DocumentContainerProps> = ({ transactionSaving
selectedDocuments.length === 0 && dispatch(fetchDocuments({ accountId, transactionId })); selectedDocuments.length === 0 && dispatch(fetchDocuments({ accountId, transactionId }));
}, []) }, [])
// FETCHING TAG - START
useEffect(() => {
if (selectedRecipients.length === 0) return;
const fetchTags = async () => { const fetchTags = async () => {
try { try {
@ -92,9 +89,9 @@ const DocumentContainer: React.FC<DocumentContainerProps> = ({ transactionSaving
for (const tag of res.data) { for (const tag of res.data) {
const key = `${tag.documentId}_${tag.pageIndex}`; const key = `${tag.documentId}_${tag.pageIndex}`;
if (recTags[key]) { if (recTags[key]) {
recTags[key].push(tag); recTags[key].push({ ...tag, update: false });
} else { } else {
recTags[key] = [tag]; // Initialize with an array recTags[key] = [{ ...tag, update: false }]; // Initialize with an array
} }
} }
} }
@ -106,6 +103,9 @@ const DocumentContainer: React.FC<DocumentContainerProps> = ({ transactionSaving
} }
}; };
// FETCHING TAG - START
useEffect(() => {
if (selectedRecipients.length === 0) return;
fetchTags(); fetchTags();
}, [selectedRecipients]); }, [selectedRecipients]);
@ -161,7 +161,6 @@ const DocumentContainer: React.FC<DocumentContainerProps> = ({ transactionSaving
delete updateTags[updateTags.length - 1].update delete updateTags[updateTags.length - 1].update
} }
} }
updatedData[recipientId] = updateTags updatedData[recipientId] = updateTags
} }
@ -174,16 +173,30 @@ const DocumentContainer: React.FC<DocumentContainerProps> = ({ transactionSaving
}); });
try { try {
const responses = await Promise.all(requests); const response = await Promise.all(requests);
const droppedItemsUpdateFalse = Object.fromEntries(
Object.entries(droppedItems).map(([recipientId, tags]) => {
return [recipientId, tags.map(tag => ({ ...tag, update: false }))];
})
)
console.log(droppedItemsUpdateFalse, "Line 182") let recTags = droppedItems;
setDroppedItems(droppedItemsUpdateFalse); for (const res of response) {
for (const tag of res.data) {
const key = `${tag.documentId}_${tag.pageIndex}`;
if (recTags[key]) {
recTags[key].push({ ...tag, update: false });
} else {
recTags[key] = [{ ...tag, update: false }]; // Initialize with an array
}
}
}
setSelectedTag(null);
// setTimeout(async () => {
// await fetchTags()
// setSelectedTag(null);
// }, 1000)
// console.log(droppedItemsUpdateFalse, "Line 182")
// setDroppedItems(droppedItemsUpdateFalse);
} catch (error) { } catch (error) {
console.error("Error submitting recipient tags:", error); console.error("Error submitting recipient tags:", error);
} }
@ -300,6 +313,11 @@ const DocumentContainer: React.FC<DocumentContainerProps> = ({ transactionSaving
await sendTagsToRecipients(tagsData, accountId, transactionId); await sendTagsToRecipients(tagsData, accountId, transactionId);
// if (save) {
// setSelectedTag(null);
// await fetchTags();
// }
// SENDING Transaction - START // SENDING Transaction - START
if (!save) { if (!save) {
const res = await api.put(`/api/accounts/${accountId}/${transactionTemplateToggle}/${transactionId}`, { status: "SENT" }) const res = await api.put(`/api/accounts/${accountId}/${transactionTemplateToggle}/${transactionId}`, { status: "SENT" })

16
src/components/process/processStepTwo/LeftSideBar.tsx
View File

@ -80,7 +80,13 @@ const LeftSideBar: React.FC<LeftSideBarProps> = ({ isFields, selectedRecipientIn
<div className='flex items-center gap-1.5'> <div className='flex items-center gap-1.5'>
<p className='w-3 h-3 rounded-sm' style={{ background: selectedRecipient.color }}></p> <p className='w-3 h-3 rounded-sm' style={{ background: selectedRecipient.color }}></p>
{/* <FaUserTie className='w-3 h-3 text-2xl mt-[1px]' style={{ color: selectedRecipient.color }} /> */} {/* <FaUserTie className='w-3 h-3 text-2xl mt-[1px]' style={{ color: selectedRecipient.color }} /> */}
<p>{selectedRecipient.firstName} {selectedRecipient.lastName}</p> <p>
{
selectedRecipient.firstName.length === 0 && selectedRecipient.lastName.length === 0 ?
(selectedRecipient.email.length === 0 ? selectedRecipient.roleName : selectedRecipient.email) :
`${selectedRecipient.firstName + " " + selectedRecipient.lastName}`
}
</p>
</div> </div>
<MdKeyboardArrowDown /> <MdKeyboardArrowDown />
</div> </div>
@ -101,7 +107,13 @@ const LeftSideBar: React.FC<LeftSideBarProps> = ({ isFields, selectedRecipientIn
<div className='flex items-center gap-1.5'> <div className='flex items-center gap-1.5'>
<p className='w-3 h-3 rounded-sm' style={{ background: recipient.color }}></p> <p className='w-3 h-3 rounded-sm' style={{ background: recipient.color }}></p>
{/* <FaUser className='w-3 h-3 text-2xl mt-[1px]' style={{ color: recipient.color }} /> */} {/* <FaUser className='w-3 h-3 text-2xl mt-[1px]' style={{ color: recipient.color }} /> */}
<p>{recipient.firstName} {recipient.lastName} </p> <p>
{
recipient.firstName.length === 0 && recipient.lastName.length === 0 ?
(recipient.email.length === 0 ? recipient.roleName : recipient.email) :
`${recipient.firstName + " " + recipient.lastName}`
}
</p>
</div> </div>
{selectedRecipientIndx === indx && <IoCheckmark className='text-[var(--primary)]' />} {selectedRecipientIndx === indx && <IoCheckmark className='text-[var(--primary)]' />}
</div>) </div>)

8
src/components/process/processStepTwo/NavTwo.tsx
View File

@ -125,11 +125,11 @@ const NavTwo: React.FC<NavTwoProps> = ({ transactionSaving, isFields, setIsField
setTimeout(() => { setTimeout(() => {
if (transactionTemplateToggle === TRANSACTION_TEMPLATE_TOGGLE.TRANSACTIONS) { if (transactionTemplateToggle === TRANSACTION_TEMPLATE_TOGGLE.TRANSACTIONS) {
if (isSignSend) { if (isSignSend) {
navigate(`./../../../sign/${selfUserSign.recipientId}`); window.open(`./../../../sign/${selfUserSign.recipientId}`, "_self");
}
else {
navigate(`/document-completion-screen/${accountId}/${transactionId}`)
} }
// else {
// navigate(`/document-completion-screen/${accountId}/${transactionId}`)
// }
} else { } else {
navigate(`/templates`); navigate(`/templates`);
toast.success("Template Saved...!", { toast.success("Template Saved...!", {

16
src/components/process/processStepTwo/rightSideBar/RecipientsAttrCon.tsx
View File

@ -53,7 +53,13 @@ const RecipientsAttrCon: React.FC<RecipientsAttrConIntr> = ({ selectedRecipientI
<div className='flex items-center gap-1.5'> <div className='flex items-center gap-1.5'>
<p className='w-3 h-3 rounded-sm' style={{ background: selectedRecipient.color }}></p> <p className='w-3 h-3 rounded-sm' style={{ background: selectedRecipient.color }}></p>
{/* <FaUserTie className='w-3 h-3 text-2xl mt-[1px]' style={{ color: selectedRecipient.color }} /> */} {/* <FaUserTie className='w-3 h-3 text-2xl mt-[1px]' style={{ color: selectedRecipient.color }} /> */}
<p>{"firstName" in selectedRecipient && selectedRecipient.firstName} {"lastName" in selectedRecipient && selectedRecipient.lastName}</p> <p>
{
selectedRecipient.firstName.length === 0 && selectedRecipient.lastName.length === 0 ?
(selectedRecipient.email.length === 0 ? selectedRecipient.roleName : selectedRecipient.email) :
`${selectedRecipient.firstName + " " + selectedRecipient.lastName}`
}
</p>
</div> </div>
<MdKeyboardArrowDown /> <MdKeyboardArrowDown />
</div> </div>
@ -74,7 +80,13 @@ const RecipientsAttrCon: React.FC<RecipientsAttrConIntr> = ({ selectedRecipientI
<div className='flex items-center gap-1.5'> <div className='flex items-center gap-1.5'>
<p className='w-3 h-3 rounded-sm' style={{ background: recipient.color }}></p> <p className='w-3 h-3 rounded-sm' style={{ background: recipient.color }}></p>
{/* <FaUser className='w-3 h-3 text-2xl mt-[1px]' style={{ color: recipient.color }} /> */} {/* <FaUser className='w-3 h-3 text-2xl mt-[1px]' style={{ color: recipient.color }} /> */}
<p>{recipient.firstName} {recipient.lastName} </p> <p>
{
recipient.firstName.length === 0 && recipient.lastName.length === 0 ?
(recipient.email.length === 0 ? recipient.roleName : recipient.email) :
`${recipient.firstName + " " + recipient.lastName}`
}
</p>
</div> </div>
{selectedRecipientId === recipient.id && <IoCheckmark className='text-[var(--primary)]' />} {selectedRecipientId === recipient.id && <IoCheckmark className='text-[var(--primary)]' />}
</div>) </div>)

4
src/components/signature/SignCon.tsx
View File

@ -166,6 +166,7 @@ const AddSignatureModal: React.FC<AddSignatureModalProps> = ({
if (initialsBlob && signatureBlob) { if (initialsBlob && signatureBlob) {
setSaved({ setSaved({
signatureId: res.data.id,
saveType: SaveTypeEnum.DRAW, saveType: SaveTypeEnum.DRAW,
save: true, save: true,
signature: signatureBlob, signature: signatureBlob,
@ -293,6 +294,7 @@ const AddSignatureModal: React.FC<AddSignatureModalProps> = ({
initials: "", initials: "",
}) })
setSaved({ setSaved({
signatureId: res.data.id ?? null,
saveType: res.data.signatureType ?? null, saveType: res.data.signatureType ?? null,
save: true, save: true,
signature: res.data.signatureBlob ?? null, signature: res.data.signatureBlob ?? null,
@ -647,7 +649,7 @@ const AddSignatureModal: React.FC<AddSignatureModalProps> = ({
</> </>
) : ( ) : (
<> <>
CREATE SIGNATURE {activeTab === "SAVED" ? "CHANGE SIGNATURE" : "CREATE SIGNATURE"}
{/* isEditMode ? 'UPDATE SIGNATURE' : 'CREATE SIGNATURE' */} {/* isEditMode ? 'UPDATE SIGNATURE' : 'CREATE SIGNATURE' */}
</> </>
)} )}

5
src/components/transactions/TransactionView.tsx
View File

@ -9,6 +9,7 @@ import { IoCloseOutline } from 'react-icons/io5';
import { MdEditDocument } from "react-icons/md"; import { MdEditDocument } from "react-icons/md";
import { useSelector } from 'react-redux'; import { useSelector } from 'react-redux';
import { RootState } from '../../store/store'; import { RootState } from '../../store/store';
import { SignTypeEnum } from '../../utlity/types';
// Sample recipient data — you can replace this with actual API data later // Sample recipient data — you can replace this with actual API data later
const recipients = [ const recipients = [
@ -62,7 +63,7 @@ const TransactionView = () => {
const handleNavigateToSign = (id: number) => { const handleNavigateToSign = (id: number) => {
window.open(`./../../../../sign/${id}`) window.open(`./../../../../sign/${id}/${SignTypeEnum.selfSign}`)
} }
return ( return (
@ -138,7 +139,7 @@ const TransactionView = () => {
{recipient.email === user.email && recipient.status !== "COMPLETED" && {recipient.email === user.email && recipient.status !== "COMPLETED" &&
<p <p
onClick={() => handleNavigateToSign(recipient.id)} onClick={() => handleNavigateToSign(recipient.id)}
className='text-white rounded-sm bg-[var(--primary)] px-3 py-1 font-semibold'> className='text-white rounded-sm bg-[var(--primary)] px-3 py-1 font-semibold cursor-pointer'>
Sign Sign
</p>} </p>}
</div> </div>