Skip to content

Commit d85074b

Browse files
fix: username issue to get details from GetPublicUserNmae cloud function
1 parent b32c806 commit d85074b

File tree

10 files changed

+366
-193
lines changed

10 files changed

+366
-193
lines changed

apps/OpenSign/src/constant/const.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ export const modalSubmitBtnColor = "#17a2b8";
99
export const modalCancelBtnColor = "white";
1010
export const themeColor = "#47a3ad";
1111
export const iconColor = "#686968";
12-
export const isEnableSubscription = process.env.REACT_APP_ENABLE_SUBSCRIPTION;
12+
export const isEnableSubscription = false;
13+
// process.env.REACT_APP_ENABLE_SUBSCRIPTION;

apps/OpenSign/src/pages/PdfRequestFiles.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1578,7 +1578,10 @@ function PdfRequestFiles() {
15781578
handleClose={() => {
15791579
setIsCompleted((prev) => ({ ...prev, isModal: false }));
15801580
}}
1581-
reduceWidth={!isCompleted?.message}
1581+
reduceWidth={
1582+
!isCompleted?.message &&
1583+
"md:min-w-[440px] md:max-w-[400px]"
1584+
}
15821585
>
15831586
<div style={{ height: "100%", padding: 20 }}>
15841587
{isCompleted?.message ? (

apps/OpenSign/src/pages/UserProfile.js

Lines changed: 59 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useState, useEffect } from "react";
1+
import React, { useState, useEffect, useRef } from "react";
22
import { Navigate, useNavigate } from "react-router-dom";
33
import Parse from "parse";
44
import { SaveFileSize } from "../constant/saveFileSize";
@@ -28,8 +28,9 @@ function UserProfile() {
2828
const [isDisableDocId, setIsDisableDocId] = useState(false);
2929
const [isSubscribe, setIsSubscribe] = useState(false);
3030
const [publicUserName, setPublicUserName] = useState(
31-
(extendUser && extendUser?.[0]?.UserName) || ""
31+
extendUser && extendUser?.[0]?.UserName
3232
);
33+
const previousStateValueRef = useRef(publicUserName);
3334
const [company, setCompany] = useState(
3435
extendUser && extendUser?.[0]?.Company
3536
);
@@ -81,8 +82,8 @@ function UserProfile() {
8182

8283
const handleCheckPublicUserName = async () => {
8384
try {
84-
const res = await Parse.Cloud.run("getPublicUserName", {
85-
userName: publicUserName
85+
const res = await Parse.Cloud.run("getpublicusername", {
86+
username: publicUserName
8687
});
8788
if (res) {
8889
setIsLoader(false);
@@ -98,15 +99,19 @@ function UserProfile() {
9899
};
99100
const handleSubmit = async (e) => {
100101
e.preventDefault();
101-
setIsLoader(true);
102-
let phn = Phone;
103102

104-
const res = await handleCheckPublicUserName();
103+
let phn = Phone,
104+
res;
105+
106+
if (previousStateValueRef.current !== publicUserName) {
107+
res = await handleCheckPublicUserName();
108+
}
109+
105110
if (!res) {
111+
setIsLoader(true);
106112
try {
107-
const tour = Parse.Object.extend("_User");
108-
const query = new Parse.Query(tour);
109-
113+
const userQuery = Parse.Object.extend("_User");
114+
const query = new Parse.Query(userQuery);
110115
await query.get(UserProfile.objectId).then((object) => {
111116
object.set("name", name);
112117
object.set("ProfilePic", Image);
@@ -148,15 +153,26 @@ function UserProfile() {
148153
const extClass = localStorage.getItem("extended_class");
149154
const extData = JSON.parse(localStorage.getItem("Extand_Class"));
150155
const ExtUserId = extData[0].objectId;
156+
let body;
157+
if (publicUserName) {
158+
body = {
159+
Phone: obj.Phone,
160+
Name: obj.Name,
161+
HeaderDocId: isDisableDocId,
162+
JobTitle: jobTitle,
163+
Company: company,
164+
UserName: publicUserName
165+
};
166+
} else {
167+
body = {
168+
Phone: obj.Phone,
169+
Name: obj.Name,
170+
HeaderDocId: isDisableDocId,
171+
JobTitle: jobTitle,
172+
Company: company
173+
};
174+
}
151175

152-
const body = {
153-
Phone: obj.Phone,
154-
Name: obj.Name,
155-
HeaderDocId: isDisableDocId,
156-
JobTitle: jobTitle,
157-
Company: company,
158-
UserName: publicUserName
159-
};
160176
await axios.put(
161177
parseBaseUrl + "classes/" + extClass + "/" + ExtUserId,
162178
body,
@@ -267,7 +283,15 @@ function UserProfile() {
267283
alert("OTP sent on you email");
268284
};
269285
const handlePublicUrl = (e) => {
270-
setPublicUserName(e.target.value);
286+
const value = e.target.value;
287+
if (value.length > 6 && !isSubscribe) {
288+
setUserNameError("Please upgrade to allow more than 6 characters.");
289+
setTimeout(() => {
290+
setUserNameError("");
291+
}, 2000);
292+
} else {
293+
setPublicUserName(e.target.value);
294+
}
271295
};
272296
return (
273297
<React.Fragment>
@@ -291,10 +315,9 @@ function UserProfile() {
291315
</div>
292316
) : (
293317
<div className="flex justify-center items-center w-full relative">
294-
{/* <Alert type={alertMsg.type}>{alertMsg.message}</Alert> */}
295318
{userNameError && (
296319
<div
297-
className={`z-[1000] fixed top-20 transform border-[1px] text-sm border-[#f0a8a8] bg-[#f4bebe] text-[#c42121] rounded py-[.75rem] px-[1.25rem]`}
320+
className={`z-[1000] fixed top-[50%] transform border-[1px] text-sm border-[#f0a8a8] bg-[#f4bebe] text-[#c42121] rounded py-[.75rem] px-[1.25rem]`}
298321
>
299322
{userNameError}
300323
</div>
@@ -426,20 +449,22 @@ function UserProfile() {
426449
)}
427450
</span>
428451
</li>
429-
<li className="flex justify-between items-center border-t-[1px] border-gray-300 py-2 break-all">
430-
<span className="font-semibold">Public profile:</span>
431-
<div className="flex items-center">
432-
<span>opensign.me/</span>
452+
{!isEnableSubscription && (
453+
<li className="flex justify-between items-center border-t-[1px] border-gray-300 py-2 break-all">
454+
<span className="font-semibold">Public profile:</span>
455+
<div className="flex items-center">
456+
<span>opensign.me/</span>
433457

434-
<input
435-
onChange={handlePublicUrl}
436-
value={publicUserName}
437-
disabled={!editmode}
438-
placeholder="enter user name"
439-
className="border-[1px] border-gray-200 rounded-[3px]"
440-
/>
441-
</div>
442-
</li>
458+
<input
459+
onChange={handlePublicUrl}
460+
value={publicUserName}
461+
disabled={!editmode}
462+
placeholder="enter user name"
463+
className="border-[1px] border-gray-200 rounded-[3px]"
464+
/>
465+
</div>
466+
</li>
467+
)}
443468

444469
<li className="border-y-[1px] border-gray-300 break-all">
445470
<div className="flex justify-between items-center py-2">

0 commit comments

Comments
 (0)