From 1c9fb5ebcbf18d6955616633600fe3940b91e49a Mon Sep 17 00:00:00 2001 From: prafull-opensignlabs Date: Wed, 10 Jul 2024 16:44:20 +0530 Subject: [PATCH] feat: ask reason for decline/revoke document --- apps/OpenSign/src/components/pdf/PdfHeader.js | 51 ++++------------- apps/OpenSign/src/json/ReportJson.js | 16 +++--- apps/OpenSign/src/pages/PdfRequestFiles.js | 30 ++++------ .../src/primitives/GetReportDisplay.js | 57 +++++++++++-------- .../src/primitives/PdfDeclineModal.js | 32 ++++++++--- .../parsefunction/SubscriptionAftersave.js | 4 +- ...0163936-addfield_declinereason_doc_cls.cjs | 21 +++++++ 7 files changed, 112 insertions(+), 99 deletions(-) create mode 100644 apps/OpenSignServer/databases/migrations/20240710163936-addfield_declinereason_doc_cls.cjs diff --git a/apps/OpenSign/src/components/pdf/PdfHeader.js b/apps/OpenSign/src/components/pdf/PdfHeader.js index 4223194b9..878ed5c12 100644 --- a/apps/OpenSign/src/components/pdf/PdfHeader.js +++ b/apps/OpenSign/src/components/pdf/PdfHeader.js @@ -44,10 +44,7 @@ function Header({ //function for show decline alert const handleDeclinePdfAlert = async () => { - const currentDecline = { - currnt: "Sure", - isDeclined: true - }; + const currentDecline = { currnt: "Sure", isDeclined: true }; setIsDecline(currentDecline); }; @@ -209,7 +206,7 @@ function Header({ Finish -
-
- -
-
    -
  • - handleDownloadPdf( - pdfDetails, - pdfUrl, - setIsDownloading - ) - } - > - - {" "} - Download - -
    • -
-
+ )} diff --git a/apps/OpenSign/src/json/ReportJson.js b/apps/OpenSign/src/json/ReportJson.js index 91dc7004e..a33990b46 100644 --- a/apps/OpenSign/src/json/ReportJson.js +++ b/apps/OpenSign/src/json/ReportJson.js @@ -346,14 +346,14 @@ export default function reportJson(id) { message: "This menu reveals more options such as Edit & Delete. Use the 'Edit' button to add signer roles, modify fields, and update your template. Changes will apply to all future documents created from this template but won’t affect existing documents.Use the Delete button you can delete template. ", subaction: [ - // { - // btnId: "1873", - // btnLabel: "Share-with", - // hoverLabel: "Share-with", - // btnIcon: "fa-light fa-share-nodes", - // redirectUrl: "", - // action: "sharewith" - // }, + { + btnId: "1873", + btnLabel: "Share-with", + hoverLabel: "Share-with", + btnIcon: "fa-light fa-share-nodes", + redirectUrl: "", + action: "sharewith" + }, { btnId: "2434", btnLabel: "Edit", diff --git a/apps/OpenSign/src/pages/PdfRequestFiles.js b/apps/OpenSign/src/pages/PdfRequestFiles.js index 526a751f3..3b0d4cd52 100644 --- a/apps/OpenSign/src/pages/PdfRequestFiles.js +++ b/apps/OpenSign/src/pages/PdfRequestFiles.js @@ -1140,11 +1140,9 @@ function PdfRequestFiles() { }); }; //function for set decline true on press decline button - const declineDoc = async () => { + const declineDoc = async (reason) => { setIsDecline({ isDeclined: false }); - const data = { - IsDeclined: true - }; + const data = { IsDeclined: true, DeclineReason: reason }; setIsUiLoading(true); await axios @@ -1486,12 +1484,9 @@ function PdfRequestFiles() { { - setDefaultSignAlert({ - isShow: false, - alertMessage: "" - }); - }} + handleClose={() => + setDefaultSignAlert({ isShow: false, alertMessage: "" }) + } >

{defaultSignAlert.alertMessage}

@@ -1506,12 +1501,12 @@ function PdfRequestFiles() { Yes diff --git a/apps/OpenSign/src/primitives/PdfDeclineModal.js b/apps/OpenSign/src/primitives/PdfDeclineModal.js index 6345fb02f..67c16c5e2 100644 --- a/apps/OpenSign/src/primitives/PdfDeclineModal.js +++ b/apps/OpenSign/src/primitives/PdfDeclineModal.js @@ -1,4 +1,4 @@ -import React from "react"; +import React, { useState } from "react"; import "../styles/signature.css"; function CustomModal({ @@ -9,10 +9,11 @@ function CustomModal({ declineDoc, setIsDecline }) { + const [reason, setReason] = useState(""); return ( show && ( - -
+ +

{headMsg && headMsg}

@@ -21,19 +22,34 @@ function CustomModal({
{footerMessage && ( <> -
-
+
+ +
+ {/*
*/} +
diff --git a/apps/OpenSignServer/cloud/parsefunction/SubscriptionAftersave.js b/apps/OpenSignServer/cloud/parsefunction/SubscriptionAftersave.js index 445452101..9c8ae81bd 100644 --- a/apps/OpenSignServer/cloud/parsefunction/SubscriptionAftersave.js +++ b/apps/OpenSignServer/cloud/parsefunction/SubscriptionAftersave.js @@ -65,7 +65,7 @@ export default async function SubscriptionAftersave(request) { const extUserRes = await extUserQuery.first({ useMasterKey: true }); if (extUserRes) { const extUser = JSON.parse(JSON.stringify(extUserRes)); - if (extUser?.UserRole !== 'contracts_Admin') { + if (!extUser?.OrganizationId) { await addTeamAndOrg(extUser); } } @@ -86,7 +86,7 @@ export default async function SubscriptionAftersave(request) { const extUserRes = await extUserQuery.first({ useMasterKey: true }); if (extUserRes) { const extUser = JSON.parse(JSON.stringify(extUserRes)); - if (extUser?.UserRole !== 'contracts_Admin') { + if (!extUser?.OrganizationId) { await addTeamAndOrg(extUser); } } diff --git a/apps/OpenSignServer/databases/migrations/20240710163936-addfield_declinereason_doc_cls.cjs b/apps/OpenSignServer/databases/migrations/20240710163936-addfield_declinereason_doc_cls.cjs new file mode 100644 index 000000000..e14b25c2e --- /dev/null +++ b/apps/OpenSignServer/databases/migrations/20240710163936-addfield_declinereason_doc_cls.cjs @@ -0,0 +1,21 @@ +/** + * + * @param {Parse} Parse + */ +exports.up = async Parse => { + const className = 'contracts_Document'; + const schema = new Parse.Schema(className); + schema.addString('DeclineReason'); + return schema.update(); +}; + +/** + * + * @param {Parse} Parse + */ +exports.down = async Parse => { + const className = 'contracts_Document'; + const schema = new Parse.Schema(className); + schema.deleteField('DeclineReason'); + return schema.update(); +};