Skip to content

🔥 The free & Open Source DocuSign alternative

fix: date z-index and default data of email,name,company name, job title widgets in guest login flow

RaktimaNXG86b0e909481a
diff --git a/apps/OpenSign/src/components/pdf/Placeholder.js b/apps/OpenSign/src/components/pdf/Placeholder.js
index bb93d16ba..ff0f199e4 100644
--- a/apps/OpenSign/src/components/pdf/Placeholder.js
+++ b/apps/OpenSign/src/components/pdf/Placeholder.js
@@ -573,7 +573,9 @@ function Placeholder(props) {
: "all-scroll",
zIndex:
props.pos.type === "date"
- ? "99"
+ ? props.pos.key === props.selectWidgetId
+ ? 99 + 1
+ : 99
: props?.pos?.zIndex
? props.pos.zIndex
: "5",
diff --git a/apps/OpenSign/src/components/pdf/PlaceholderType.js b/apps/OpenSign/src/components/pdf/PlaceholderType.js
index e61310f8f..7d10c3ef4 100644
--- a/apps/OpenSign/src/components/pdf/PlaceholderType.js
+++ b/apps/OpenSign/src/components/pdf/PlaceholderType.js
@@ -133,7 +133,7 @@ function PlaceholderType(props) {
}
}
// eslint-disable-next-line react-hooks/exhaustive-deps
- }, [props.pos?.options?.defaultValue]);
+ }, [props.pos]);
const dateValue = (value) => {
return <span>{value}</span>;
diff --git a/apps/OpenSign/src/components/pdf/RenderPdf.js b/apps/OpenSign/src/components/pdf/RenderPdf.js
index 2ed1493eb..7e7cadef6 100644
--- a/apps/OpenSign/src/components/pdf/RenderPdf.js
+++ b/apps/OpenSign/src/components/pdf/RenderPdf.js
@@ -270,6 +270,8 @@ function RenderPdf({
setIsInitial={setIsInitial}
setValidateAlert={setValidateAlert}
unSignedWidgetId={unSignedWidgetId}
+ setSelectWidgetId={setSelectWidgetId}
+ selectWidgetId={selectWidgetId}
/>
</React.Fragment>
)
diff --git a/apps/OpenSign/src/pages/GuestLogin.js b/apps/OpenSign/src/pages/GuestLogin.js
index 5ddf29b65..6f048a64a 100644
--- a/apps/OpenSign/src/pages/GuestLogin.js
+++ b/apps/OpenSign/src/pages/GuestLogin.js
@@ -4,6 +4,7 @@ import "../styles/loginPage.css";
import loader from "../assets/images/loader2.gif";
import axios from "axios";
import { themeColor } from "../constant/const";
+import { contractUsers } from "../constant/Utils";
function GuestLogin() {
const { id, userMail, contactBookId, serverUrl } = useParams();
@@ -103,11 +104,19 @@ function GuestLogin() {
} else {
let _user = user.data.result;
const parseId = localStorage.getItem("parseAppId");
+ const contractUserDetails = await contractUsers(_user.email);
localStorage.setItem("UserInformation", JSON.stringify(_user));
localStorage.setItem(
`Parse/${parseId}/currentUser`,
JSON.stringify(_user)
);
+ if (contractUserDetails) {
+ localStorage.setItem(
+ "Extand_Class",
+ JSON.stringify(contractUserDetails)
+ );
+ }
+
localStorage.setItem("username", _user.name);
localStorage.setItem("accesstoken", _user.sessionToken);
//save isGuestSigner true in local to handle login flow header in mobile view
diff --git a/apps/OpenSign/src/pages/PdfRequestFiles.js b/apps/OpenSign/src/pages/PdfRequestFiles.js
index 326d029b9..1025bdfc1 100644
--- a/apps/OpenSign/src/pages/PdfRequestFiles.js
+++ b/apps/OpenSign/src/pages/PdfRequestFiles.js
@@ -49,6 +49,7 @@ function PdfRequestFiles() {
const [imgWH, setImgWH] = useState({});
const imageRef = useRef(null);
const [handleError, setHandleError] = useState();
+ const [selectWidgetId, setSelectWidgetId] = useState("");
const [isLoading, setIsLoading] = useState({
isLoad: true,
message: "This might take some time"
@@ -646,6 +647,7 @@ function PdfRequestFiles() {
});
}
}
+ console.log("signer", signerPos);
//function for update TourStatus
const closeTour = async () => {
setWidgetsTour(false);
@@ -1176,6 +1178,8 @@ function PdfRequestFiles() {
setIsInitial={setIsInitial}
setValidateAlert={setValidateAlert}
unSignedWidgetId={unSignedWidgetId}
+ setSelectWidgetId={setSelectWidgetId}
+ selectWidgetId={selectWidgetId}
/>
)}
</div>