diff --git a/apps/OpenSign/package-lock.json b/apps/OpenSign/package-lock.json index fd8283e31..c9de1b9a3 100644 --- a/apps/OpenSign/package-lock.json +++ b/apps/OpenSign/package-lock.json @@ -22,6 +22,7 @@ "radix-ui": "^1.0.1", "react": "^18.2.0", "react-bootstrap": "^2.10.2", + "react-cookie": "^7.1.4", "react-datepicker": "^6.4.0", "react-dnd": "^16.0.1", "react-dnd-html5-backend": "^16.0.1", @@ -6054,6 +6055,11 @@ "@types/node": "*" } }, + "node_modules/@types/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==" + }, "node_modules/@types/eslint": { "version": "8.44.4", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.4.tgz", @@ -6108,11 +6114,9 @@ } }, "node_modules/@types/hoist-non-react-statics": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.3.tgz", - "integrity": "sha512-Wny3a2UXn5FEA1l7gc6BbpoV5mD1XijZqgkp4TRgDCDL5r3B5ieOFGUX5h3n78Tr1MEG7BfvoM8qeztdvNU0fw==", - "optional": true, - "peer": true, + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz", + "integrity": "sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==", "dependencies": { "@types/react": "*", "hoist-non-react-statics": "^3.3.0" @@ -19354,6 +19358,19 @@ "react": "^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0" } }, + "node_modules/react-cookie": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/react-cookie/-/react-cookie-7.1.4.tgz", + "integrity": "sha512-wDxxa/HYaSXSMlyWJvJ5uZTzIVtQTPf1gMksFgwAz/2/W3lCtY8r4OChCXMPE7wax0PAdMY97UkNJedGv7KnDw==", + "dependencies": { + "@types/hoist-non-react-statics": "^3.3.5", + "hoist-non-react-statics": "^3.3.2", + "universal-cookie": "^7.0.0" + }, + "peerDependencies": { + "react": ">= 16.3.0" + } + }, "node_modules/react-datepicker": { "version": "6.4.0", "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-6.4.0.tgz", @@ -22701,6 +22718,23 @@ "node": ">=8" } }, + "node_modules/universal-cookie": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/universal-cookie/-/universal-cookie-7.1.4.tgz", + "integrity": "sha512-Q+DVJsdykStWRMtXr2Pdj3EF98qZHUH/fXv/gwFz/unyToy1Ek1w5GsWt53Pf38tT8Gbcy5QNsj61Xe9TggP4g==", + "dependencies": { + "@types/cookie": "^0.6.0", + "cookie": "^0.6.0" + } + }, + "node_modules/universal-cookie/node_modules/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/universalify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", diff --git a/apps/OpenSign/package.json b/apps/OpenSign/package.json index c225dc77e..a90a5ea44 100644 --- a/apps/OpenSign/package.json +++ b/apps/OpenSign/package.json @@ -17,6 +17,7 @@ "radix-ui": "^1.0.1", "react": "^18.2.0", "react-bootstrap": "^2.10.2", + "react-cookie": "^7.1.4", "react-datepicker": "^6.4.0", "react-dnd": "^16.0.1", "react-dnd-html5-backend": "^16.0.1", diff --git a/apps/OpenSign/src/components/Header.js b/apps/OpenSign/src/components/Header.js index f1516d6ba..eb8416b6d 100644 --- a/apps/OpenSign/src/components/Header.js +++ b/apps/OpenSign/src/components/Header.js @@ -4,18 +4,20 @@ import FullScreenButton from "./FullScreenButton"; import { useNavigate } from "react-router-dom"; import Parse from "parse"; import { useWindowSize } from "../hook/useWindowSize"; -import { checkIsSubscribed, openInNewTab } from "../constant/Utils"; +import { checkIsSubscribed, getAppLogo, openInNewTab } from "../constant/Utils"; import { isEnableSubscription } from "../constant/const"; const Header = ({ showSidebar }) => { const navigate = useNavigate(); const { width } = useWindowSize(); - let applogo = localStorage.getItem("appLogo") || ""; let username = localStorage.getItem("username"); const image = localStorage.getItem("profileImg") || dp; const [isOpen, setIsOpen] = useState(false); const [isSubscribe, setIsSubscribe] = useState(true); - const [isPro, setIsPro]= useState(false) + const [isPro, setIsPro] = useState(false); + const [applogo, setAppLogo] = useState( + localStorage.getItem("appLogo") || " " + ); const toggleDropdown = () => { setIsOpen(!isOpen); @@ -26,11 +28,18 @@ const Header = ({ showSidebar }) => { }, []); async function checkSubscription() { if (isEnableSubscription) { + const applogo = await getAppLogo(); + if (applogo) { + setAppLogo(applogo); + } else { + setAppLogo(localStorage.getItem("appLogo") || ""); + } const getIsSubscribe = await checkIsSubscribed(); - setIsPro(getIsSubscribe) + setIsPro(getIsSubscribe); setIsSubscribe(getIsSubscribe); } } + const closeDropdown = () => { setIsOpen(false); Parse.User.logOut(); diff --git a/apps/OpenSign/src/components/opensigndrive/DriveBody.js b/apps/OpenSign/src/components/opensigndrive/DriveBody.js index b8c2bdd56..213d3eac4 100644 --- a/apps/OpenSign/src/components/opensigndrive/DriveBody.js +++ b/apps/OpenSign/src/components/opensigndrive/DriveBody.js @@ -70,6 +70,7 @@ function DriveBody(props) { return item; }); props.setPdfData(updatedData); + props.sortingData(null, null, updatedData); await axios .put( `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem( @@ -214,8 +215,8 @@ function DriveBody(props) { ? true : false : selecFolderId - ? false - : true; + ? false + : true; if (!checkExist) { if (moveFolderId) { updateData = { diff --git a/apps/OpenSign/src/components/pdf/Placeholder.js b/apps/OpenSign/src/components/pdf/Placeholder.js index 29ee1eca4..0ecc29a5f 100644 --- a/apps/OpenSign/src/components/pdf/Placeholder.js +++ b/apps/OpenSign/src/components/pdf/Placeholder.js @@ -542,7 +542,15 @@ function Placeholder(props) { data-tut={props.pos.key === props.unSignedWidgetId ? "IsSigned" : ""} key={props.pos.key} lockAspectRatio={ - props.pos.type !== textWidget && + // props.pos.type !== textWidget + ![ + textWidget, + "email", + "name", + "company", + "job title", + textInputWidget + ].includes(props.pos.type) && (props.pos.Width ? props.pos.Width / props.pos.Height : defaultWidthHeight(props.pos.type).width / diff --git a/apps/OpenSign/src/components/pdf/PlaceholderType.js b/apps/OpenSign/src/components/pdf/PlaceholderType.js index 58bdd0f14..918fdc129 100644 --- a/apps/OpenSign/src/components/pdf/PlaceholderType.js +++ b/apps/OpenSign/src/components/pdf/PlaceholderType.js @@ -135,7 +135,7 @@ function PlaceholderType(props) { } } // eslint-disable-next-line react-hooks/exhaustive-deps - }, [props.pos]); + }, [props.pos?.options?.defaultValue]); const ExampleCustomInput = forwardRef(({ value, onClick }, ref) => (