From 74f66122712dff9e1a0e90e9feadc7c8146df155 Mon Sep 17 00:00:00 2001 From: RaktimaNXG Date: Fri, 7 Jun 2024 19:33:28 +0530 Subject: [PATCH] refactor code --- apps/OpenSign/src/components/BulkSendUi.js | 1 + apps/OpenSign/src/pages/UserProfile.js | 94 +++--- .../src/primitives/GetReportDisplay.js | 293 +++++++++--------- 3 files changed, 198 insertions(+), 190 deletions(-) diff --git a/apps/OpenSign/src/components/BulkSendUi.js b/apps/OpenSign/src/components/BulkSendUi.js index 98ba5c0b8..6e4aa5e76 100644 --- a/apps/OpenSign/src/components/BulkSendUi.js +++ b/apps/OpenSign/src/components/BulkSendUi.js @@ -13,6 +13,7 @@ const BulkSendUi = (props) => { const allowedSigners = 50; useEffect(() => { signatureExist(); + // eslint-disable-next-line react-hooks/exhaustive-deps }, []); //function to check atleast one signature field exist diff --git a/apps/OpenSign/src/pages/UserProfile.js b/apps/OpenSign/src/pages/UserProfile.js index cbc0d2429..a7599666e 100644 --- a/apps/OpenSign/src/pages/UserProfile.js +++ b/apps/OpenSign/src/pages/UserProfile.js @@ -1,4 +1,8 @@ -import React, { useState, useEffect, useRef } from "react"; +import React, { + useState, + useEffect + // useRef +} from "react"; import { Navigate, useNavigate } from "react-router-dom"; import Parse from "parse"; import { SaveFileSize } from "../constant/saveFileSize"; @@ -27,10 +31,10 @@ function UserProfile() { const [percentage, setpercentage] = useState(0); const [isDisableDocId, setIsDisableDocId] = useState(false); const [isSubscribe, setIsSubscribe] = useState(false); - const [publicUserName, setPublicUserName] = useState( - extendUser && extendUser?.[0]?.UserName - ); - const previousPublicUserName = useRef(publicUserName); + // const [publicUserName, setPublicUserName] = useState( + // extendUser && extendUser?.[0]?.UserName + // ); + // const previousPublicUserName = useRef(publicUserName); const [company, setCompany] = useState( extendUser && extendUser?.[0]?.Company ); @@ -41,7 +45,7 @@ function UserProfile() { const [otp, setOtp] = useState(""); const [otpLoader, setOtpLoader] = useState(false); const [isEmailVerified, setIsEmailVerified] = useState(false); - const [userNameError, setUserNameError] = useState(""); + // const [userNameError, setUserNameError] = useState(""); useEffect(() => { getUserDetail(); }, []); @@ -80,31 +84,31 @@ function UserProfile() { } }; //function to check public username already exist - const handleCheckPublicUserName = async () => { - try { - const res = await Parse.Cloud.run("getpublicusername", { - username: publicUserName - }); - if (res) { - setIsLoader(false); - setUserNameError("user name already exist"); - setTimeout(() => { - setUserNameError(""); - }, 3000); - return res; - } - } catch (e) { - console.log("error in getpublicusername cloud function"); - } - }; + // const handleCheckPublicUserName = async () => { + // try { + // const res = await Parse.Cloud.run("getpublicusername", { + // username: publicUserName + // }); + // if (res) { + // setIsLoader(false); + // setUserNameError("user name already exist"); + // setTimeout(() => { + // setUserNameError(""); + // }, 3000); + // return res; + // } + // } catch (e) { + // console.log("error in getpublicusername cloud function"); + // } + // }; const handleSubmit = async (e) => { e.preventDefault(); let phn = Phone, - res; + res = ""; //condition to call cloud function when user change publicUserName - if (previousPublicUserName.current !== publicUserName) { - res = await handleCheckPublicUserName(); - } + // if (previousPublicUserName.current !== publicUserName) { + // res = await handleCheckPublicUserName(); + // } if (!res) { setIsLoader(true); try { @@ -158,8 +162,8 @@ function UserProfile() { Name: obj.Name, HeaderDocId: isDisableDocId, JobTitle: jobTitle, - Company: company, - UserName: publicUserName || "" + Company: company + // UserName: publicUserName || "" }; await axios.put( @@ -273,23 +277,23 @@ function UserProfile() { alert("OTP sent on you email"); }; //function to handle onchange username and restrict 6-characters username for free users - const handleOnchangeUserName = (e) => { - const value = e.target.value; - if (value.length > 6 && !isSubscribe) { - setUserNameError("Please upgrade to allow more than 6 characters."); - setTimeout(() => { - setUserNameError(""); - }, 2000); - } else { - setPublicUserName(e.target.value); - } - }; + // const handleOnchangeUserName = (e) => { + // const value = e.target.value; + // if (value.length > 6 && !isSubscribe) { + // setUserNameError("Please upgrade to allow more than 6 characters."); + // setTimeout(() => { + // setUserNameError(""); + // }, 2000); + // } else { + // setPublicUserName(e.target.value); + // } + // }; const handleCancel = () => { setEditMode(false); SetName(localStorage.getItem("username")); SetPhone(UserProfile && UserProfile.phone); setImage(localStorage.getItem("profileImg")); - setPublicUserName(extendUser && extendUser?.[0]?.UserName); + // setPublicUserName(extendUser && extendUser?.[0]?.UserName); setCompany(extendUser && extendUser?.[0]?.Company); setJobTitle(extendUser?.[0]?.JobTitle); }; @@ -315,13 +319,13 @@ function UserProfile() { ) : (
- {userNameError && ( + {/* {userNameError && (
{userNameError}
- )} + )} */}
@@ -449,7 +453,7 @@ function UserProfile() { )} - {isEnableSubscription && ( + {/* {isEnableSubscription && (
  • Public profile :{" "} @@ -479,7 +483,7 @@ function UserProfile() { )}
    • - )} + )} */}
  • { const [isTour, setIsTour] = useState(false); const [tourStatusArr, setTourStatusArr] = useState([]); const [isResendMail, setIsResendMail] = useState({}); - const [isMakePublic, setIsMakePublic] = useState({}); + // const [isMakePublic, setIsMakePublic] = useState({}); const [mail, setMail] = useState({ subject: "", body: "" }); const [userDetails, setUserDetails] = useState({}); const [isNextStep, setIsNextStep] = useState({}); @@ -49,12 +52,12 @@ const ReportTable = (props) => { const [templateDeatils, setTemplateDetails] = useState({}); const [placeholders, setPlaceholders] = useState([]); const [isLoader, setIsLoader] = useState({}); - const [selectedPublicRole, setSelectedPublicRole] = useState(""); - const [isCelebration, setIsCelebration] = useState(false); + // const [selectedPublicRole, setSelectedPublicRole] = useState(""); + // const [isCelebration, setIsCelebration] = useState(false); const [currentLists, setCurrentLists] = useState([]); - const [isPublic, setIsPublic] = useState({}); - const [isPublicProfile, setIsPublicProfile] = useState({}); - const [publicUserName, setIsPublicUserName] = useState(""); + // const [isPublic, setIsPublic] = useState({}); + // const [isPublicProfile, setIsPublicProfile] = useState({}); + // const [publicUserName, setIsPublicUserName] = useState(""); const [isViewShare, setIsViewShare] = useState({}); const startIndex = (currentPage - 1) * props.docPerPage; const { isMoreDocs, setIsNextRecord } = props; @@ -251,12 +254,12 @@ const ReportTable = (props) => { // `currentLists` is total record render on current page const currentList = props.List?.slice(indexOfFirstDoc, indexOfLastDoc); //check public template and save in a object to show public and private template - setIsPublic( - currentList.reduce((acc, item) => { - acc[item.objectId] = item?.IsPublic || false; - return acc; - }, {}) - ); + // setIsPublic( + // currentList.reduce((acc, item) => { + // acc[item.objectId] = item?.IsPublic || false; + // return acc; + // }, {}) + // ); setCurrentLists(currentList); // eslint-disable-next-line react-hooks/exhaustive-deps }, [indexOfLastDoc, indexOfFirstDoc]); @@ -321,16 +324,16 @@ const ReportTable = (props) => { setActLoader({}); } }; - const handleClose = (item) => { + const handleClose = () => { setIsRevoke({}); setIsDeleteModal({}); - setIsMakePublic({}); - setSelectedPublicRole(""); - setIsPublic((prevStates) => ({ - ...prevStates, - [item.objectId]: !prevStates[item.objectId] - })); - setIsPublicProfile({}); + // setIsMakePublic({}); + // setSelectedPublicRole(""); + // setIsPublic((prevStates) => ({ + // ...prevStates, + // [item.objectId]: !prevStates[item.objectId] + // })); + // setIsPublicProfile({}); }; const handleShare = (item) => { @@ -730,130 +733,130 @@ const ReportTable = (props) => { }; //function to make template public and set public role - const handlePublicTemplate = async (item) => { - if (selectedPublicRole || !isPublic[item.objectId]) { - setActLoader({ [item.objectId]: true }); - setIsMakePublic(false); - try { - const res = await Parse.Cloud.run("createpublictemplate", { - templateid: item.objectId, - ispublic: isPublic[item.objectId], - publicrole: [selectedPublicRole] - }); + // const handlePublicTemplate = async (item) => { + // if (selectedPublicRole || !isPublic[item.objectId]) { + // setActLoader({ [item.objectId]: true }); + // setIsMakePublic(false); + // try { + // const res = await Parse.Cloud.run("createpublictemplate", { + // templateid: item.objectId, + // ispublic: isPublic[item.objectId], + // publicrole: [selectedPublicRole] + // }); - if (res.status === "success") { - setIsAlert(true); - setTimeout(() => setIsAlert(false), 1500); - if (isPublic[item.objectId]) { - setAlertMsg({ - type: "success", - message: "You have successfully made the template public." - }); - setIsCelebration(true); - setTimeout(() => { - setIsCelebration(false); - }, 5000); - setIsPublicProfile({ [item.objectId]: isPublic[item.objectId] }); - } else { - setAlertMsg({ - type: "success", - message: "You have successfully made the template private." - }); - setSelectedPublicRole(""); - } - const updateList = props.List.map((x) => - x.objectId === item.objectId - ? { ...x, IsPublic: isPublic[item.objectId] } - : x - ); - props.setList(updateList); - setActLoader({}); - } - } catch (e) { - console.log("error in createpublictemplate", e); - setIsAlert(true); - setAlertMsg({ - type: "danger", - message: "Something went wrong, Please try again later!" - }); - setTimeout(() => setIsAlert(false), 1500); - setIsPublic((prevStates) => ({ - ...prevStates, - [item.objectId]: !prevStates[item.objectId] - })); - } - } else { - setIsAlert(true); - setAlertMsg({ - type: "danger", - message: "You need to select a role for the public signers." - }); - setTimeout(() => setIsAlert(false), 1500); - } - }; + // if (res.status === "success") { + // setIsAlert(true); + // setTimeout(() => setIsAlert(false), 1500); + // if (isPublic[item.objectId]) { + // setAlertMsg({ + // type: "success", + // message: "You have successfully made the template public." + // }); + // setIsCelebration(true); + // setTimeout(() => { + // setIsCelebration(false); + // }, 5000); + // setIsPublicProfile({ [item.objectId]: isPublic[item.objectId] }); + // } else { + // setAlertMsg({ + // type: "success", + // message: "You have successfully made the template private." + // }); + // setSelectedPublicRole(""); + // } + // const updateList = props.List.map((x) => + // x.objectId === item.objectId + // ? { ...x, IsPublic: isPublic[item.objectId] } + // : x + // ); + // props.setList(updateList); + // setActLoader({}); + // } + // } catch (e) { + // console.log("error in createpublictemplate", e); + // setIsAlert(true); + // setAlertMsg({ + // type: "danger", + // message: "Something went wrong, Please try again later!" + // }); + // setTimeout(() => setIsAlert(false), 1500); + // setIsPublic((prevStates) => ({ + // ...prevStates, + // [item.objectId]: !prevStates[item.objectId] + // })); + // } + // } else { + // setIsAlert(true); + // setAlertMsg({ + // type: "danger", + // message: "You need to select a role for the public signers." + // }); + // setTimeout(() => setIsAlert(false), 1500); + // } + // }; const handleViewSigners = (item) => { setIsViewShare({ [item.objectId]: true }); }; //function to handle change template status is public or private - const handlePublicChange = async (e, item) => { - const getPlaceholder = item?.Placeholders; - //condiiton to check role is exist or not - if (getPlaceholder && getPlaceholder.length > 0) { - const checkIsSignatureExistt = getPlaceholder?.every((placeholderObj) => - placeholderObj?.placeHolder?.some((holder) => - holder?.pos?.some((posItem) => posItem?.type === "signature") - ) - ); - if (checkIsSignatureExistt) { - let extendUser = JSON.parse(localStorage.getItem("Extand_Class")); - const userName = extendUser[0]?.UserName; - setIsPublicUserName(extendUser[0]?.UserName); - //condition to check user have public url or not - if (userName) { - setIsPublic((prevStates) => ({ - ...prevStates, - [item.objectId]: e.target.checked - })); - const getPlaceholder = item?.Placeholders; - if (getPlaceholder.length === 1) { - setSelectedPublicRole(getPlaceholder[0]?.Role); - } + // const handlePublicChange = async (e, item) => { + // const getPlaceholder = item?.Placeholders; + // //condiiton to check role is exist or not + // if (getPlaceholder && getPlaceholder.length > 0) { + // const checkIsSignatureExistt = getPlaceholder?.every((placeholderObj) => + // placeholderObj?.placeHolder?.some((holder) => + // holder?.pos?.some((posItem) => posItem?.type === "signature") + // ) + // ); + // if (checkIsSignatureExistt) { + // let extendUser = JSON.parse(localStorage.getItem("Extand_Class")); + // const userName = extendUser[0]?.UserName; + // setIsPublicUserName(extendUser[0]?.UserName); + // //condition to check user have public url or not + // if (userName) { + // setIsPublic((prevStates) => ({ + // ...prevStates, + // [item.objectId]: e.target.checked + // })); + // const getPlaceholder = item?.Placeholders; + // if (getPlaceholder.length === 1) { + // setSelectedPublicRole(getPlaceholder[0]?.Role); + // } - setIsMakePublic({ [item.objectId]: true }); - } else { - setIsPublicProfile({ [item.objectId]: true }); - } - } else { - setIsAlert(true); - setAlertMsg({ - type: "danger", - message: - " Please ensure there's at least one signature widget added for all recipients." - }); - setTimeout(() => setIsAlert(false), 5000); - } - } else { - setIsAlert(true); - setAlertMsg({ - type: "danger", - message: "Please assign at least one role to make this template public." - }); - setTimeout(() => setIsAlert(false), 5000); - } - }; + // setIsMakePublic({ [item.objectId]: true }); + // } else { + // setIsPublicProfile({ [item.objectId]: true }); + // } + // } else { + // setIsAlert(true); + // setAlertMsg({ + // type: "danger", + // message: + // " Please ensure there's at least one signature widget added for all recipients." + // }); + // setTimeout(() => setIsAlert(false), 5000); + // } + // } else { + // setIsAlert(true); + // setAlertMsg({ + // type: "danger", + // message: "Please assign at least one role to make this template public." + // }); + // setTimeout(() => setIsAlert(false), 5000); + // } + // }; //function to copy public profile links - const copytoProfileLink = () => { - const url = `https://opensign-me.vercel.app/${publicUserName}`; - copytoData(url); - setIsAlert(true); - setAlertMsg({ - type: "success", - message: "Copied." - }); - setTimeout(() => setIsAlert(false), 1500); - }; + // const copytoProfileLink = () => { + // const url = `https://opensign-me.vercel.app/${publicUserName}`; + // copytoData(url); + // setIsAlert(true); + // setAlertMsg({ + // type: "success", + // message: "Copied." + // }); + // setTimeout(() => setIsAlert(false), 1500); + // }; return (
    @@ -866,11 +869,11 @@ const ReportTable = (props) => {
    )}
    - {isCelebration && ( + {/* {isCelebration && (
    - )} + )} */} {isAlert && {alertMsg.message}} {props.tourData && props.ReportName === "Templates" && ( { {props.actions?.length > 0 && ( Action )} - {props.ReportName === "Templates" && isEnableSubscription && ( + {/* {props.ReportName === "Templates" && isEnableSubscription && ( Public - )} + )} */} @@ -1364,7 +1367,7 @@ const ReportTable = (props) => { )} - {isEnableSubscription && ( + {/* {isEnableSubscription && ( {props.ReportName === "Templates" && (
    @@ -1527,7 +1530,7 @@ const ReportTable = (props) => { )} - )} + )} */} ) )}