diff --git a/microfrontends/SignDocuments/src/Component/LegaDrive/FolderDrive/legaDriveComponent.js b/microfrontends/SignDocuments/src/Component/LegaDrive/FolderDrive/legaDriveComponent.js
index 760ce39af..a50857a01 100644
--- a/microfrontends/SignDocuments/src/Component/LegaDrive/FolderDrive/legaDriveComponent.js
+++ b/microfrontends/SignDocuments/src/Component/LegaDrive/FolderDrive/legaDriveComponent.js
@@ -20,7 +20,8 @@ function PdfFileComponent({
setDocId,
setIsLoading,
setPdfData,
- isList
+ isList,
+ setIsAlert
}) {
const [rename, setRename] = useState("");
const [renameValue, setRenameValue] = useState("");
@@ -103,7 +104,10 @@ function PdfFileComponent({
// console.log("res", res);
})
.catch((err) => {
- console.log("error updating field is decline ", err);
+ setIsAlert({
+ isShow: true,
+ alertMessage: "something went wrong"
+ });
});
}
};
@@ -191,7 +195,10 @@ function PdfFileComponent({
setPdfData(updatedData);
})
.catch((err) => {
- console.log("err", err);
+ setIsAlert({
+ isShow: true,
+ alertMessage: "something went wrong"
+ });
});
};
const handleMoveDocument = async (docData) => {
diff --git a/microfrontends/SignDocuments/src/Component/LegaDrive/LegaDrive.js b/microfrontends/SignDocuments/src/Component/LegaDrive/LegaDrive.js
index fef248eb6..e68045b8e 100644
--- a/microfrontends/SignDocuments/src/Component/LegaDrive/LegaDrive.js
+++ b/microfrontends/SignDocuments/src/Component/LegaDrive/LegaDrive.js
@@ -1,13 +1,9 @@
import React, { useEffect, useState, useRef } from "react";
-import axios from "axios";
import "./LegaDrive.css";
import loader from "../../assests/loader2.gif";
import PdfFileComponent from "./FolderDrive/legaDriveComponent";
-import Modal from "react-bootstrap/Modal";
-import ModalHeader from "react-bootstrap/esm/ModalHeader";
import { themeColor, iconColor } from "../../utils/ThemeColor/backColor";
import { getDrive } from "../../utils/Utils";
-import AlertComponent from "../component/alertComponent";
import { useNavigate } from "react-router-dom";
import Title from "../component/Title";
import Parse from "parse";
@@ -57,32 +53,38 @@ function PdfFile() {
isLoad: true,
message: "This might take some time"
};
-
+ let driveDetails;
setIsLoading(load);
-
- const driveDetails = await getDrive();
- if (driveDetails) {
- if (driveDetails.length > 0) {
- setPdfData(driveDetails);
- sortApps(null, null, driveDetails);
- }
- const data = [
- {
- name: "OpenSign™ Drive",
- objectId: ""
+ try {
+ driveDetails = await getDrive();
+ if (driveDetails) {
+ if (driveDetails.length > 0) {
+ setPdfData(driveDetails);
+ sortApps(null, null, driveDetails);
}
- ];
- setFolderName(data);
- const loadObj = {
- isLoad: false
- };
- setIsLoading(loadObj);
- } else if (driveDetails === "Error: Something went wrong!") {
- const loadObj = {
- isLoad: false
- };
- setHandleError("Error: Something went wrong!");
- setIsLoading(loadObj);
+ const data = [
+ {
+ name: "OpenSign™ Drive",
+ objectId: ""
+ }
+ ];
+ setFolderName(data);
+ const loadObj = {
+ isLoad: false
+ };
+ setIsLoading(loadObj);
+ } else if (driveDetails === "Error: Something went wrong!") {
+ const loadObj = {
+ isLoad: false
+ };
+ setHandleError("Error: Something went wrong!");
+ setIsLoading(loadObj);
+ }
+ } catch (e) {
+ setIsAlert({
+ isShow: true,
+ alertMessage: "something went wrong"
+ });
}
};
//function for get parent folder document list
@@ -92,24 +94,33 @@ function PdfFile() {
message: "This might take some time"
};
setIsLoading(load);
- const driveDetails = await getDrive(docId);
- if (driveDetails) {
- if (driveDetails.length > 0) {
- setPdfData(driveDetails);
- sortApps(null, null, driveDetails);
- } else {
- setPdfData([]);
+ let driveDetails;
+ try {
+ driveDetails = await getDrive(docId);
+
+ if (driveDetails) {
+ if (driveDetails.length > 0) {
+ setPdfData(driveDetails);
+ sortApps(null, null, driveDetails);
+ } else {
+ setPdfData([]);
+ }
+ const loadObj = {
+ isLoad: false
+ };
+ setIsLoading(loadObj);
+ } else if (driveDetails === "Error: Something went wrong!") {
+ const loadObj = {
+ isLoad: false
+ };
+ setHandleError("Error: Something went wrong!");
+ setIsLoading(loadObj);
}
- const loadObj = {
- isLoad: false
- };
- setIsLoading(loadObj);
- } else if (driveDetails === "Error: Something went wrong!") {
- const loadObj = {
- isLoad: false
- };
- setHandleError("Error: Something went wrong!");
- setIsLoading(loadObj);
+ } catch (e) {
+ setIsAlert({
+ isShow: true,
+ alertMessage: "something went wrong!"
+ });
}
};
@@ -187,7 +198,7 @@ function PdfFile() {
} catch (e) {
setIsAlert({
isShow: true,
- alertMessage: "something went wrong"
+ alertMessage: "something went wrong!"
});
}
} else {
@@ -328,11 +339,46 @@ function PdfFile() {
-
+
{
+ setIsAlert({
+ isShow: false,
+ alertMessage: ""
+ });
+ }}
+ >
+
+
{isAlert.alertMessage}
+
+
+
+
+
)}
>
diff --git a/microfrontends/SignDocuments/src/Component/PdfRequestFiles.js b/microfrontends/SignDocuments/src/Component/PdfRequestFiles.js
index 471d2bf1f..8c384da3b 100644
--- a/microfrontends/SignDocuments/src/Component/PdfRequestFiles.js
+++ b/microfrontends/SignDocuments/src/Component/PdfRequestFiles.js
@@ -851,19 +851,25 @@ function PdfRequestFiles() {
}}
>
{/* this modal is used show this document is already sign */}
+
{
+ setIsCompleted({ isModal: false, isCertificate: true });
+ }}
+ >
+
+
This document has been signed by all Signers.
-
-
- Sign Documents
-
-
-
-
- This document has been signed by all Signers.
-
-
-
-
+
-
-
+
+
+
{/* this component is used for signature pad modal */}
500 && "20px"
}}
>
-
- {/* this modal is used show this document is already sign */}
- modalAlign()}
- backdropClassName="signature-backdrop"
+ {
+ setIsAlert({
+ isShow: false,
+ alertMessage: ""
+ });
+ }}
>
-
- Sign Documents
-
+
+
{isAlert.alertMessage}
-
+
+
+
+
+
+ {/* this modal is used show this document is already sign */}
+ {
+ setShowAlreadySignDoc({ status: false });
+ }}
+ >
+
{showAlreadySignDoc.mssg}
-
-
+
- {showAlreadySignDoc.sure && (
-
- )}
-
-
+
+
+
-
- Copy to all pages
-
-
-
+ {
+ props.setIsPageCopy(false);
+ }}
+ >
+
{copyType.map((data, key) => {
return (
@@ -223,20 +226,16 @@ function PlaceholderCopy(props) {
);
})}
-
-
-
-
+ >
-
-
+
+
+
);
}
diff --git a/microfrontends/SignDocuments/src/Component/component/emailComponent.js b/microfrontends/SignDocuments/src/Component/component/emailComponent.js
index 0c9e3ffb7..b5f8b323c 100644
--- a/microfrontends/SignDocuments/src/Component/component/emailComponent.js
+++ b/microfrontends/SignDocuments/src/Component/component/emailComponent.js
@@ -1,8 +1,6 @@
import React, { useState } from "react";
import { saveAs } from "file-saver";
import celebration from "../../assests/newCeleb.gif";
-import Modal from "react-bootstrap/Modal";
-import ModalHeader from "react-bootstrap/esm/ModalHeader";
import axios from "axios";
import { getBase64FromUrl } from "../../utils/Utils";
import { themeColor } from "../../utils/ThemeColor/backColor";
@@ -159,251 +157,269 @@ function EmailComponent({
return (
{/* isEmail */}
-
- {isLoading && (
-
-

-
- This might take some time
-
-
- )}
-
-
- Successfully signed!
-
-
-
- {!isAndroid && (
-