From d1e7b9a2abaac9d65874e7387e0b4741123cd391 Mon Sep 17 00:00:00 2001 From: RaktimaNXG Date: Wed, 27 Mar 2024 12:19:17 +0530 Subject: [PATCH 1/8] fix: document list sorting issue on scroll down in opensign-drive issue, disable recipient's list and field after send request --- .../src/components/pdf/RecipientList.js | 8 +- .../src/components/pdf/SignerListPlace.js | 4 + .../src/components/pdf/WidgetComponent.js | 7 +- apps/OpenSign/src/pages/Opensigndrive.js | 189 ++++++++---------- apps/OpenSign/src/pages/PlaceHolderSign.js | 11 +- .../OpenSign/src/pages/TemplatePlaceholder.js | 3 +- apps/OpenSign/src/styles/signature.css | 6 +- 7 files changed, 113 insertions(+), 115 deletions(-) diff --git a/apps/OpenSign/src/components/pdf/RecipientList.js b/apps/OpenSign/src/components/pdf/RecipientList.js index e608da1f86..ba9b5166ce 100644 --- a/apps/OpenSign/src/components/pdf/RecipientList.js +++ b/apps/OpenSign/src/components/pdf/RecipientList.js @@ -116,7 +116,13 @@ const RecipientList = (props) => { data-tut="reactourFirst" onMouseEnter={() => setIsHover(ind)} onMouseLeave={() => setIsHover(null)} - className={props.sendInOrder && "dragCursor"} + className={ + props.sendInOrder + ? props.isMailSend + ? "disabled" + : "dragCursor" + : props.isMailSend && "disabled" + } style={ (!isMobile && isHover === ind) || props.isSelectListId === ind ? onHoverStyle(ind, obj?.blockColor) diff --git a/apps/OpenSign/src/components/pdf/SignerListPlace.js b/apps/OpenSign/src/components/pdf/SignerListPlace.js index 046aa9fa08..335bc4411c 100644 --- a/apps/OpenSign/src/components/pdf/SignerListPlace.js +++ b/apps/OpenSign/src/components/pdf/SignerListPlace.js @@ -23,6 +23,10 @@ function SignerListPlace(props) { data-tut="reactourAddbtn" className="p-[10px] my-[2px] flex flex-row items-center justify-center border-[1px] border-[#47a3ad] hover:bg-[#47a3ad] text-[#47a3ad] hover:text-white cursor-pointer" onClick={() => props.handleAddSigner()} + style={{ + opacity: props.isMailSend && "0.5", + pointerEvents: props.isMailSend && "none" + }} > Add role diff --git a/apps/OpenSign/src/components/pdf/WidgetComponent.js b/apps/OpenSign/src/components/pdf/WidgetComponent.js index 7cbc9b889b..e9bff561a0 100644 --- a/apps/OpenSign/src/components/pdf/WidgetComponent.js +++ b/apps/OpenSign/src/components/pdf/WidgetComponent.js @@ -364,7 +364,12 @@ function WidgetComponent({ ) ) : ( -
+
0) { setSkip((prevSkip) => prevSkip + limit); - sortApps("Date", "Decending", driveDetails, true); + sortApps(orderName.Date, orderName.Descending, driveDetails, true); } if (!docId) { setFolderName([{ name: "OpenSign™ Drive", objectId: "" }]); @@ -211,34 +219,40 @@ function Opensigndrive() { }; const sortingApp = (appInfo, type, order) => { - if (type === "Name") { - if (order === "Accending") { + if (type === orderName.Name) { + if (order === orderName.Ascending) { return appInfo.sort((a, b) => (a.Name > b.Name ? 1 : -1)); - } else if (order === "Decending") { + } else if (order === orderName.Descending) { return appInfo.sort((a, b) => (a.Name > b.Name ? -1 : 1)); } - } else if (type === "Date") { - if (order === "Accending") { + } else if (type === orderName.Date) { + if (order === orderName.Ascending) { return appInfo.sort((a, b) => (a.createdAt > b.createdAt ? 1 : -1)); - } else if (order === "Decending") { + } else if (order === orderName.Descending) { return appInfo.sort((a, b) => (a.createdAt > b.createdAt ? -1 : 1)); } } }; const sortApps = (type, order, driveDetails, isInitial) => { - const selectedSortType = type ? type : selectedSort ? selectedSort : "Date"; - const sortOrder = order ? order : sortingOrder ? sortingOrder : "Decending"; - if (selectedSortType === "Name") { - sortingApp(driveDetails, "Name", sortOrder); - } else if (selectedSortType === "Date") { - sortingApp(driveDetails, "Date", sortOrder); - } - if (isInitial) { - setPdfData([...pdfData, ...driveDetails]); - } else { - setPdfData(driveDetails); + const selectedSortType = type + ? type + : selectedSort + ? selectedSort + : orderName.Date; + const sortOrder = order + ? order + : sortingOrder + ? sortingOrder + : orderName.Descending; + const allPdfData = isInitial ? [...pdfData, ...driveDetails] : driveDetails; + if (selectedSortType === orderName.Name) { + sortingApp(driveDetails, orderName.Name, sortOrder); + } else if (selectedSortType === orderName.Date) { + sortingApp(allPdfData, orderName.Date, sortOrder); } + + setPdfData(allPdfData); }; //function for handle auto scroll on folder path @@ -611,95 +625,56 @@ function Opensigndrive() { aria-labelledby="dropdownMenuButton" aria-expanded={isShowSort ? "true" : "false"} > - { - setSelectedSort("Name"); - sortApps("Name", null, pdfData); - }} - className="dropdown-item itemColor" - > - {selectedSort !== "Name" ? ( - - ) : ( - - )} - Name - - { - setSelectedSort("Date"); - sortApps("Date", null, pdfData); - }} - className="dropdown-item itemColor" - > - {selectedSort !== "Date" ? ( - - ) : ( - - )} - Date - + {sortingValue.map((value, ind) => { + return ( + { + setSelectedSort(value); + sortApps(value, null, pdfData); + }} + className="dropdown-item itemColor" + style={{ + marginLeft: selectedSort !== value && "15px" + }} + > + {selectedSort === value && ( + + )} + {value} + + ); + })} +
- { - setSortingOrder("Accending"); - sortApps(null, "Accending", pdfData); - }} - className="dropdown-item itemColor" - > - {sortingOrder !== "Accending" ? ( - - ) : ( - - )} - Accending - - { - setSortingOrder("Decending"); - sortApps(null, "Decending", pdfData); - }} - className="dropdown-item itemColor" - > - {sortingOrder !== "Decending" ? ( - - ) : ( - - )} - Decending - + {sortOrder.map((order, ind) => { + return ( + { + setSortingOrder(order); + sortApps(null, order, pdfData); + }} + className="dropdown-item itemColor" + style={{ + marginLeft: sortingOrder !== order && "15px" + }} + > + {sortingOrder === order && ( + + )} + {order} + + ); + })}
diff --git a/apps/OpenSign/src/pages/PlaceHolderSign.js b/apps/OpenSign/src/pages/PlaceHolderSign.js index 3228e963ba..3dbdce63b5 100644 --- a/apps/OpenSign/src/pages/PlaceHolderSign.js +++ b/apps/OpenSign/src/pages/PlaceHolderSign.js @@ -1450,7 +1450,7 @@ function PlaceHolderSign() { {isSendAlert.mssg === "sure" ? (

Please add field for all recipients.

) : isSendAlert.mssg === textWidget ? ( -

Please confirm that you have filled label widget.

+

Please confirm that you have filled the text field.

) : ( isSendAlert.mssg === "confirm" && (

@@ -1716,9 +1716,11 @@ function PlaceHolderSign() {

) : (
-
+
{ className="autoSignScroll" > { />
); }; - + //useEffect for set already draw or save signature url/text url of signature text type and draw type for initial type and signature type widgets useEffect(() => { - if (canvasRef.current && isSignImg) { - canvasRef.current.fromDataURL(isSignImg); + if (currWidgetsDetails && canvasRef.current) { + const isWidgetType = currWidgetsDetails?.type; + const signatureType = currWidgetsDetails?.signatureType; + const url = currWidgetsDetails?.SignUrl; + + //checking widget type and draw type signature url + if (isWidgetType === "initials" && signatureType === "draw" && url) { + canvasRef.current.fromDataURL(url); + } else if ( + isWidgetType === "signature" && + signatureType === "draw" && + url + ) { + canvasRef.current.fromDataURL(url); + } } + const trimmedName = currentUserName.trim(); const firstCharacter = trimmedName.charAt(0); const userName = isInitial ? firstCharacter : currentUserName; @@ -349,6 +359,7 @@ function SignPad({ setIsDefaultSign(false); setIsImageSelect(true); setIsTab("uploadImage"); + setSignatureType(""); }} style={{ color: @@ -373,6 +384,7 @@ function SignPad({ setIsDefaultSign(false); setIsImageSelect(false); setIsTab("type"); + setSignatureType(""); setImage(); }} style={{ @@ -400,6 +412,7 @@ function SignPad({ setIsDefaultSign(true); setIsImageSelect(true); setIsTab("mysignature"); + setSignatureType(""); setImage(); }} style={{ @@ -430,6 +443,7 @@ function SignPad({ setIsDefaultSign(true); setIsImageSelect(true); setIsTab("mysignature"); + setSignatureType(""); setImage(); }} style={{ @@ -469,6 +483,7 @@ function SignPad({ setIsDefaultSign(false); setImage(); setIsTab("draw"); + setSignatureType("draw"); setSignValue(""); setIsStamp(false); }} diff --git a/apps/OpenSign/src/constant/Utils.js b/apps/OpenSign/src/constant/Utils.js index 40b71434b5..044d6c0d60 100644 --- a/apps/OpenSign/src/constant/Utils.js +++ b/apps/OpenSign/src/constant/Utils.js @@ -935,6 +935,7 @@ export const embedDocId = async (pdfDoc, documentId, allPages) => { //function for save button to save signature or image url export function onSaveSign( + type, xyPostion, index, signKey, @@ -975,6 +976,7 @@ export function onSaveSign( Width: posWidth, Height: posHeight, SignUrl: signatureImg, + signatureType: type && type, options: { ...position.options, response: signatureImg diff --git a/apps/OpenSign/src/pages/PdfRequestFiles.js b/apps/OpenSign/src/pages/PdfRequestFiles.js index 7f2bf551d7..4b430c9341 100644 --- a/apps/OpenSign/src/pages/PdfRequestFiles.js +++ b/apps/OpenSign/src/pages/PdfRequestFiles.js @@ -87,6 +87,7 @@ function PdfRequestFiles() { const [widgetsTour, setWidgetsTour] = useState(false); const [minRequiredCount, setminRequiredCount] = useState(); const [sendInOrder, setSendInOrder] = useState(false); + const [currWidgetsDetails, setCurrWidgetsDetails] = useState({}); const divRef = useRef(null); const isMobile = window.innerWidth < 767; const rowLevel = @@ -731,7 +732,7 @@ function PdfRequestFiles() { }; //function for save button to save signature or image url - const saveSign = (isDefaultSign, width, height) => { + const saveSign = (type, isDefaultSign, width, height) => { const isTypeText = width && height ? true : false; const signatureImg = isDefaultSign ? isDefaultSign === "initials" @@ -767,6 +768,7 @@ function PdfRequestFiles() { const placeholderPosition = currentSigner[0].placeHolder; //function of save signature image and get updated position with signature image url const getUpdatePosition = onSaveSign( + type, placeholderPosition, getIndex, signKey, @@ -1133,6 +1135,8 @@ function PdfRequestFiles() { isInitial={isInitial} setIsInitial={setIsInitial} setIsStamp={setIsStamp} + currWidgetsDetails={currWidgetsDetails} + setCurrWidgetsDetails={setCurrWidgetsDetails} /> {/* pdf header which contain funish back button */}
)}
diff --git a/apps/OpenSign/src/pages/PlaceHolderSign.js b/apps/OpenSign/src/pages/PlaceHolderSign.js index 3dbdce63b5..b152c8cf87 100644 --- a/apps/OpenSign/src/pages/PlaceHolderSign.js +++ b/apps/OpenSign/src/pages/PlaceHolderSign.js @@ -97,7 +97,7 @@ function PlaceHolderSign() { const [widgetType, setWidgetType] = useState(""); const [isUiLoading, setIsUiLoading] = useState(false); const [isRadio, setIsRadio] = useState(false); - const [currWidgetsDetails, setCurrWidgetsDetails] = useState([]); + const [currWidgetsDetails, setCurrWidgetsDetails] = useState({}); const [selectWidgetId, setSelectWidgetId] = useState(""); const [isCheckbox, setIsCheckbox] = useState(false); const [isNameModal, setIsNameModal] = useState(false); diff --git a/apps/OpenSign/src/pages/SignyourselfPdf.js b/apps/OpenSign/src/pages/SignyourselfPdf.js index 69915f333a..4a28e73133 100644 --- a/apps/OpenSign/src/pages/SignyourselfPdf.js +++ b/apps/OpenSign/src/pages/SignyourselfPdf.js @@ -90,7 +90,7 @@ function SignYourSelf() { const [showAlreadySignDoc, setShowAlreadySignDoc] = useState({ status: false }); - const [currWidgetsDetails, setCurrWidgetsDetails] = useState([]); + const [currWidgetsDetails, setCurrWidgetsDetails] = useState({}); const [isCheckbox, setIsCheckbox] = useState(false); const [widgetType, setWidgetType] = useState(""); const [pdfLoadFail, setPdfLoadFail] = useState({ @@ -708,7 +708,7 @@ function SignYourSelf() { }; //function for save button to save signature or image url - const saveSign = (isDefaultSign, width, height) => { + const saveSign = (type, isDefaultSign, width, height) => { const isTypeText = width && height ? true : false; const signatureImg = isDefaultSign ? isDefaultSign === "initials" @@ -731,6 +731,7 @@ function SignYourSelf() { } } const getUpdatePosition = onSaveSign( + type, xyPostion, index, signKey, @@ -1105,6 +1106,8 @@ function SignYourSelf() { setIsInitial={setIsInitial} setIsStamp={setIsStamp} widgetType={widgetType} + currWidgetsDetails={currWidgetsDetails} + setCurrWidgetsDetails={setCurrWidgetsDetails} /> {/*render email component to send email after finish signature on document */} Date: Wed, 27 Mar 2024 18:09:06 +0530 Subject: [PATCH 4/8] fix: expired document message --- apps/OpenSign/src/pages/PdfRequestFiles.js | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/apps/OpenSign/src/pages/PdfRequestFiles.js b/apps/OpenSign/src/pages/PdfRequestFiles.js index 4b430c9341..e810cf503e 100644 --- a/apps/OpenSign/src/pages/PdfRequestFiles.js +++ b/apps/OpenSign/src/pages/PdfRequestFiles.js @@ -10,6 +10,7 @@ import { useParams } from "react-router-dom"; import SignPad from "../components/pdf/SignPad"; import RenderAllPdfPage from "../components/pdf/RenderAllPdfPage"; import Tour from "reactour"; +import moment from "moment"; import { contractDocument, multiSignEmbed, @@ -65,6 +66,7 @@ function PdfRequestFiles() { const [currentSigner, setCurrentSigner] = useState(false); const [isAlert, setIsAlert] = useState({ isShow: false, alertMessage: "" }); const [unSignedWidgetId, setUnSignedWidgetId] = useState(""); + const [expiredDate, setExpiredDate] = useState(""); const [defaultSignAlert, setDefaultSignAlert] = useState({ isShow: false, alertMessage: "" @@ -168,7 +170,11 @@ function PdfRequestFiles() { }; setIsDecline(currentDecline); } else if (currDate > expireUpdateDate) { + const expireDateFormat = moment(new Date(expireDate)).format( + "MMM DD, YYYY" + ); setIsExpired(true); + setExpiredDate(expireDateFormat); } if (documentData.length > 0) { @@ -368,7 +374,6 @@ function PdfRequestFiles() { return true; } }; - //function for embed signature or image url in pdf async function embedWidgetsData() { const validateSigning = checkSendInOrder(); @@ -928,7 +933,17 @@ function PdfRequestFiles() {
)} -
+
Date: Wed, 27 Mar 2024 20:31:30 +0530 Subject: [PATCH 5/8] fix: drive details sorting, signature and intial widgets signature url isuue --- .../src/components/pdf/PlaceholderType.js | 5 +++++ apps/OpenSign/src/components/pdf/SignPad.js | 8 +++++--- apps/OpenSign/src/pages/Opensigndrive.js | 19 ++++++++++++------- apps/OpenSign/src/pages/SignyourselfPdf.js | 1 + 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/apps/OpenSign/src/components/pdf/PlaceholderType.js b/apps/OpenSign/src/components/pdf/PlaceholderType.js index 00e9274291..58bdd0f143 100644 --- a/apps/OpenSign/src/components/pdf/PlaceholderType.js +++ b/apps/OpenSign/src/components/pdf/PlaceholderType.js @@ -307,6 +307,7 @@ function PlaceholderType(props) { return props.pos.SignUrl ? ( signimg signimg { @@ -154,8 +154,10 @@ function SignPad({ const url = currWidgetsDetails?.SignUrl; //checking widget type and draw type signature url - if (isWidgetType === "initials" && signatureType === "draw" && url) { - canvasRef.current.fromDataURL(url); + if (isInitial) { + if (isWidgetType === "initials" && signatureType === "draw" && url) { + canvasRef.current.fromDataURL(url); + } } else if ( isWidgetType === "signature" && signatureType === "draw" && diff --git a/apps/OpenSign/src/pages/Opensigndrive.js b/apps/OpenSign/src/pages/Opensigndrive.js index 93079a69d5..82773faa95 100644 --- a/apps/OpenSign/src/pages/Opensigndrive.js +++ b/apps/OpenSign/src/pages/Opensigndrive.js @@ -88,7 +88,7 @@ function Opensigndrive() { setHandleError("Error: Something went wrong!"); } else if (driveDetails && driveDetails.length > 0) { setSkip((prevSkip) => prevSkip + limit); - sortApps(orderName.Date, orderName.Descending, driveDetails, true); + sortingData(null, null, driveDetails, true); } if (!docId) { setFolderName([{ name: "OpenSign™ Drive", objectId: "" }]); @@ -218,7 +218,8 @@ function Opensigndrive() { } }; - const sortingApp = (appInfo, type, order) => { + //function to use sorting document list according to type and order + const sortedBy = (appInfo, type, order) => { if (type === orderName.Name) { if (order === orderName.Ascending) { return appInfo.sort((a, b) => (a.Name > b.Name ? 1 : -1)); @@ -234,7 +235,8 @@ function Opensigndrive() { } }; - const sortApps = (type, order, driveDetails, isInitial) => { + //function to use get sorting type, order and document list to sort + const sortingData = (type, order, driveDetails, isInitial) => { const selectedSortType = type ? type : selectedSort @@ -245,11 +247,14 @@ function Opensigndrive() { : sortingOrder ? sortingOrder : orderName.Descending; + + //check isInitial true it means sort previous 20 and get on scrolling 20 = 40 document list const allPdfData = isInitial ? [...pdfData, ...driveDetails] : driveDetails; + //call sortedBy function according to selected Type and order if (selectedSortType === orderName.Name) { - sortingApp(driveDetails, orderName.Name, sortOrder); + sortedBy(driveDetails, orderName.Name, sortOrder); } else if (selectedSortType === orderName.Date) { - sortingApp(allPdfData, orderName.Date, sortOrder); + sortedBy(allPdfData, orderName.Date, sortOrder); } setPdfData(allPdfData); @@ -631,7 +636,7 @@ function Opensigndrive() { key={ind} onClick={() => { setSelectedSort(value); - sortApps(value, null, pdfData); + sortingData(value, null, pdfData); }} className="dropdown-item itemColor" style={{ @@ -657,7 +662,7 @@ function Opensigndrive() { key={ind} onClick={() => { setSortingOrder(order); - sortApps(null, order, pdfData); + sortingData(null, order, pdfData); }} className="dropdown-item itemColor" style={{ diff --git a/apps/OpenSign/src/pages/SignyourselfPdf.js b/apps/OpenSign/src/pages/SignyourselfPdf.js index 4a28e73133..4538732f8f 100644 --- a/apps/OpenSign/src/pages/SignyourselfPdf.js +++ b/apps/OpenSign/src/pages/SignyourselfPdf.js @@ -768,6 +768,7 @@ function SignYourSelf() { //function for delete signature block const handleDeleteSign = (key) => { + setCurrWidgetsDetails({}); const updateResizeData = []; let filterData = xyPostion[index].pos.filter((data) => data.key !== key); From 6d5e07dac7d1cec021ccb840c48738011074ef3b Mon Sep 17 00:00:00 2001 From: RaktimaNXG Date: Thu, 28 Mar 2024 11:03:54 +0530 Subject: [PATCH 6/8] fix: sorting issue in open-sign drive --- apps/OpenSign/src/pages/Opensigndrive.js | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/apps/OpenSign/src/pages/Opensigndrive.js b/apps/OpenSign/src/pages/Opensigndrive.js index 82773faa95..377b5f286f 100644 --- a/apps/OpenSign/src/pages/Opensigndrive.js +++ b/apps/OpenSign/src/pages/Opensigndrive.js @@ -122,6 +122,7 @@ function Opensigndrive() { //disableLoading is used disable initial loader const disableLoading = true; // If the fetched data length is less than the limit, it means there's no more data to fetch + if (!loading && pdfData.length % 100 === 0) { getPdfDocumentList(disableLoading); } @@ -137,7 +138,7 @@ function Opensigndrive() { }; } // eslint-disable-next-line - }, [loading]); // Add/remove scroll event listener when loading changes + }, [loading, sortingOrder]); // Add/remove scroll event listener when loading changes //function for handle folder name path const handleRoute = (index) => { @@ -237,16 +238,8 @@ function Opensigndrive() { //function to use get sorting type, order and document list to sort const sortingData = (type, order, driveDetails, isInitial) => { - const selectedSortType = type - ? type - : selectedSort - ? selectedSort - : orderName.Date; - const sortOrder = order - ? order - : sortingOrder - ? sortingOrder - : orderName.Descending; + const selectedSortType = type ? type : selectedSort; + const sortOrder = order ? order : sortingOrder; //check isInitial true it means sort previous 20 and get on scrolling 20 = 40 document list const allPdfData = isInitial ? [...pdfData, ...driveDetails] : driveDetails; @@ -640,7 +633,7 @@ function Opensigndrive() { }} className="dropdown-item itemColor" style={{ - marginLeft: selectedSort !== value && "15px" + paddingLeft: selectedSort !== value && "33px" }} > {selectedSort === value && ( @@ -666,7 +659,7 @@ function Opensigndrive() { }} className="dropdown-item itemColor" style={{ - marginLeft: sortingOrder !== order && "15px" + paddingLeft: sortingOrder !== order && "33px" }} > {sortingOrder === order && ( From 1f50368259f96816c5ee400a69f3004925714ed0 Mon Sep 17 00:00:00 2001 From: RaktimaNXG Date: Thu, 28 Mar 2024 12:30:28 +0530 Subject: [PATCH 7/8] fix: open-sign drive sorting issue by date and name --- apps/OpenSign/src/pages/Opensigndrive.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/OpenSign/src/pages/Opensigndrive.js b/apps/OpenSign/src/pages/Opensigndrive.js index 377b5f286f..5633706fa0 100644 --- a/apps/OpenSign/src/pages/Opensigndrive.js +++ b/apps/OpenSign/src/pages/Opensigndrive.js @@ -138,7 +138,7 @@ function Opensigndrive() { }; } // eslint-disable-next-line - }, [loading, sortingOrder]); // Add/remove scroll event listener when loading changes + }, [loading, sortingOrder, selectedSort]); // Add/remove scroll event listener when loading changes //function for handle folder name path const handleRoute = (index) => { From 036c9b8d4a9cb9bd20ae92bd1fe7a4f3d62e4af5 Mon Sep 17 00:00:00 2001 From: RaktimaNXG Date: Thu, 28 Mar 2024 12:46:15 +0530 Subject: [PATCH 8/8] fix: open-sign drive sorting issue by name --- apps/OpenSign/src/pages/Opensigndrive.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/OpenSign/src/pages/Opensigndrive.js b/apps/OpenSign/src/pages/Opensigndrive.js index 5633706fa0..192a9d766a 100644 --- a/apps/OpenSign/src/pages/Opensigndrive.js +++ b/apps/OpenSign/src/pages/Opensigndrive.js @@ -245,7 +245,7 @@ function Opensigndrive() { const allPdfData = isInitial ? [...pdfData, ...driveDetails] : driveDetails; //call sortedBy function according to selected Type and order if (selectedSortType === orderName.Name) { - sortedBy(driveDetails, orderName.Name, sortOrder); + sortedBy(allPdfData, orderName.Name, sortOrder); } else if (selectedSortType === orderName.Date) { sortedBy(allPdfData, orderName.Date, sortOrder); }