From bbf31703988d091767bc01f11ba67a196d613c84 Mon Sep 17 00:00:00 2001 From: RaktimaNXG Date: Tue, 16 Apr 2024 15:01:36 +0530 Subject: [PATCH 1/4] feat: add revoke button in inprogress report to revoke/decline document --- apps/OpenSign/src/json/ReportJson.js | 9 ++ apps/OpenSign/src/pages/PdfRequestFiles.js | 6 +- .../src/primitives/GetReportDisplay.js | 91 ++++++++++++++++++- 3 files changed, 98 insertions(+), 8 deletions(-) diff --git a/apps/OpenSign/src/json/ReportJson.js b/apps/OpenSign/src/json/ReportJson.js index 486c28c5a..728ef175b 100644 --- a/apps/OpenSign/src/json/ReportJson.js +++ b/apps/OpenSign/src/json/ReportJson.js @@ -84,6 +84,15 @@ export default function reportJson(id) { btnIcon: "fa fa-trash", redirectUrl: "", action: "delete" + }, + { + btnId: "1688", + btnLabel: "Revoke", + btnColor: "#ff4848", + textColor: "white", + btnIcon: "fa-solid fa-file-circle-xmark", + redirectUrl: "", + action: "revoke" } ], helpMsg: diff --git a/apps/OpenSign/src/pages/PdfRequestFiles.js b/apps/OpenSign/src/pages/PdfRequestFiles.js index 3acb27776..026fec165 100644 --- a/apps/OpenSign/src/pages/PdfRequestFiles.js +++ b/apps/OpenSign/src/pages/PdfRequestFiles.js @@ -1092,9 +1092,9 @@ function PdfRequestFiles() { isDecline.currnt === "Sure" ? "Are you sure want to decline this document ?" : isDecline.currnt === "YouDeclined" - ? "You have declined this document!" - : isDecline.currnt === "another" && - "You cannot sign this document as it has been declined by one or more recipient(s)." + ? "You have declined this document!" + : isDecline.currnt === "another" && + "You can not sign this document as it has been declined." } footerMessage={isDecline.currnt === "Sure"} declineDoc={declineDoc} diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.js index 0445bf2db..6bbd5fe2d 100644 --- a/apps/OpenSign/src/primitives/GetReportDisplay.js +++ b/apps/OpenSign/src/primitives/GetReportDisplay.js @@ -29,6 +29,7 @@ const ReportTable = ({ const [isDocErr, setIsDocErr] = useState(false); const [isContactform, setIsContactform] = useState(false); const [isDeleteModal, setIsDeleteModal] = useState({}); + const [isRevoke, setIsRevoke] = useState({}); const [isShare, setIsShare] = useState({}); const [shareUrls, setShareUrls] = useState([]); const [copied, setCopied] = useState(false); @@ -200,6 +201,8 @@ const ReportTable = ({ setIsDeleteModal({ [item.objectId]: true }); } else if (act.action === "share") { handleShare(item); + } else if (act.action === "revoke") { + setIsRevoke({ [item.objectId]: true }); } }; // Get current list @@ -260,7 +263,10 @@ const ReportTable = ({ setActLoader({}); } }; - const handleCloseDeleteModal = () => setIsDeleteModal({}); + const handleClose = () => { + setIsRevoke({}); + setIsDeleteModal({}); + }; const handleShare = (item) => { setActLoader({ [item.objectId]: true }); @@ -281,6 +287,46 @@ const ReportTable = ({ navigator.clipboard.writeText(share.url); setCopied({ ...copied, [share.email]: true }); }; + //function to handle revoke/decline docment + const handleRevoke = async (item) => { + setIsRevoke({}); + setActLoader({ [`${item.objectId}`]: true }); + const data = { + IsDeclined: true + }; + + await axios + .put( + `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem( + "_appName" + )}_Document/${item.objectId}`, + data, + { + headers: { + "Content-Type": "application/json", + "X-Parse-Application-Id": localStorage.getItem("parseAppId"), + "X-Parse-Session-Token": localStorage.getItem("accesstoken") + } + } + ) + .then(async (result) => { + const res = result.data; + if (res) { + setActLoader({}); + setIsAlert(true); + setTimeout(() => setIsAlert(false), 1500); + const upldatedList = List.filter((x) => x.objectId !== item.objectId); + setList(upldatedList); + } + }) + .catch((err) => { + console.log("err", err); + setIsAlert(true); + setIsErr(true); + setTimeout(() => setIsAlert(false), 1500); + setActLoader({}); + }); + }; return (
{Object.keys(actLoader)?.length > 0 && ( @@ -370,7 +416,7 @@ const ReportTable = ({
@@ -388,7 +434,7 @@ const ReportTable = ({ Yes + +
+
+ + )} ) From c48579daa7f12a7aa028db3d22e6fe2f76aaf0f5 Mon Sep 17 00:00:00 2001 From: Raktima <110812506+raktima-opensignlabs@users.noreply.github.com> Date: Tue, 16 Apr 2024 16:59:18 +0530 Subject: [PATCH 2/4] Update GetReportDisplay.js --- apps/OpenSign/src/primitives/GetReportDisplay.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.js index 6bbd5fe2d..71a2eb93e 100644 --- a/apps/OpenSign/src/primitives/GetReportDisplay.js +++ b/apps/OpenSign/src/primitives/GetReportDisplay.js @@ -585,8 +585,7 @@ const ReportTable = ({ >
- Are you sure you want to revoke/decline this - document? + Are you sure you want to revoke this document?
From a40424760439ea45f95ed15b6f719f423bebbdd5 Mon Sep 17 00:00:00 2001 From: Raktima <110812506+raktima-opensignlabs@users.noreply.github.com> Date: Tue, 16 Apr 2024 17:02:11 +0530 Subject: [PATCH 3/4] Update PdfRequestFiles.js --- apps/OpenSign/src/pages/PdfRequestFiles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/OpenSign/src/pages/PdfRequestFiles.js b/apps/OpenSign/src/pages/PdfRequestFiles.js index 026fec165..8d8395cc3 100644 --- a/apps/OpenSign/src/pages/PdfRequestFiles.js +++ b/apps/OpenSign/src/pages/PdfRequestFiles.js @@ -1094,7 +1094,7 @@ function PdfRequestFiles() { : isDecline.currnt === "YouDeclined" ? "You have declined this document!" : isDecline.currnt === "another" && - "You can not sign this document as it has been declined." + "You can not sign this document as it has been declined/revoked." } footerMessage={isDecline.currnt === "Sure"} declineDoc={declineDoc} From 33bfdeef152fd71ac8678c079ef19f1375b0ea30 Mon Sep 17 00:00:00 2001 From: Raktima <110812506+raktima-opensignlabs@users.noreply.github.com> Date: Tue, 16 Apr 2024 17:27:26 +0530 Subject: [PATCH 4/4] Update GetReportDisplay.js --- .../src/primitives/GetReportDisplay.js | 49 +++++++++++++------ 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.js index 71a2eb93e..b6bbd34ba 100644 --- a/apps/OpenSign/src/primitives/GetReportDisplay.js +++ b/apps/OpenSign/src/primitives/GetReportDisplay.js @@ -1,4 +1,4 @@ -import React, { useState, useEffect, useMemo } from "react"; + import React, { useState, useEffect, useMemo } from "react"; import pad from "../assets/images/pad.svg"; import { useNavigate } from "react-router-dom"; import axios from "axios"; @@ -25,7 +25,6 @@ const ReportTable = ({ const [currentPage, setCurrentPage] = useState(1); const [actLoader, setActLoader] = useState({}); const [isAlert, setIsAlert] = useState(false); - const [isErr, setIsErr] = useState(false); const [isDocErr, setIsDocErr] = useState(false); const [isContactform, setIsContactform] = useState(false); const [isDeleteModal, setIsDeleteModal] = useState({}); @@ -33,6 +32,7 @@ const ReportTable = ({ const [isShare, setIsShare] = useState({}); const [shareUrls, setShareUrls] = useState([]); const [copied, setCopied] = useState(false); + const [alertMsg, setAlertMsg] = useState({ type: "success", message: "" }); const startIndex = (currentPage - 1) * docPerPage; // For loop is used to calculate page numbers visible below table @@ -165,7 +165,10 @@ const ReportTable = ({ } catch (err) { console.log("Err", err); setIsAlert(true); - setIsErr(true); + setAlertMsg({ + type: "danger", + message: "Something went wrong, Please try again later!" + }); setTimeout(() => setIsAlert(false), 1500); setActLoader({}); } @@ -175,14 +178,20 @@ const ReportTable = ({ } } else { setIsAlert(true); - setIsErr(true); + setAlertMsg({ + type: "danger", + message: "Something went wrong, Please try again later!" + }); setTimeout(() => setIsAlert(false), 1500); setActLoader({}); } } catch (err) { console.log("err", err); setIsAlert(true); - setIsErr(true); + setAlertMsg({ + type: "danger", + message: "Something went wrong, Please try again later!" + }); setTimeout(() => setIsAlert(false), 1500); setActLoader({}); } @@ -251,6 +260,10 @@ const ReportTable = ({ if (res.data && res.data.updatedAt) { setActLoader({}); setIsAlert(true); + setAlertMsg({ + type: "success", + message: "Record deleted successfully!" + }); setTimeout(() => setIsAlert(false), 1500); const upldatedList = List.filter((x) => x.objectId !== item.objectId); setList(upldatedList); @@ -258,7 +271,10 @@ const ReportTable = ({ } catch (err) { console.log("err", err); setIsAlert(true); - setIsErr(true); + setAlertMsg({ + type: "danger", + message: "Something went wrong, Please try again later!" + }); setTimeout(() => setIsAlert(false), 1500); setActLoader({}); } @@ -314,6 +330,10 @@ const ReportTable = ({ if (res) { setActLoader({}); setIsAlert(true); + setAlertMsg({ + type: "success", + message: "Record revoked successfully!" + }); setTimeout(() => setIsAlert(false), 1500); const upldatedList = List.filter((x) => x.objectId !== item.objectId); setList(upldatedList); @@ -322,7 +342,10 @@ const ReportTable = ({ .catch((err) => { console.log("err", err); setIsAlert(true); - setIsErr(true); + setAlertMsg({ + type: "danger", + message: "Something went wrong, Please try again later!" + }); setTimeout(() => setIsAlert(false), 1500); setActLoader({}); }); @@ -338,13 +361,7 @@ const ReportTable = ({
)}
- {isAlert && ( - - {isErr - ? "Something went wrong, Please try again later!" - : "Record deleted successfully!"} - - )} + {isAlert && {alertMsg.message}}
{ReportName}{" "} @@ -580,12 +597,12 @@ const ReportTable = ({ {isRevoke[item.objectId] && (
- Are you sure you want to revoke this document? + Are you sure you want to revoke this document?