fix: teams are not visible in add user form, after upgrade subscription some menu are not visible

This commit is contained in:
prafull-opensignlabs
2024-07-08 19:06:37 +05:30
parent 5fc1a58bdb
commit 954dbb3375
6 changed files with 50 additions and 44 deletions
+1
View File
@@ -107,6 +107,7 @@ const AddTeam = (props) => {
objectId: localUser.OrganizationId.objectId
});
}
newTeam.set("IsActive", true);
const newTeamRes = await newTeam.save();
if (updatedAncestors.length > 0) {
const ParentId = teamList.find((x) => x.objectId === formdata.team);
+1 -1
View File
@@ -44,7 +44,7 @@ const AddUser = (props) => {
className: "contracts_Organizations",
objectId: extUser.OrganizationId.objectId
});
team.equalTo("IsActive", true);
team.notEqualTo("IsActive", false);
const teamRes = await team.find();
if (teamRes.length > 0) {
const _teamRes = JSON.parse(JSON.stringify(teamRes));
+1 -1
View File
@@ -45,7 +45,7 @@ function GenerateToken() {
};
const res = await axios.post(url, {}, { headers: headers });
if (res) {
SetApiToken(res.data.result.result);
SetApiToken(res.data?.result?.result);
}
setIsLoader(false);
} catch (err) {
+13
View File
@@ -70,6 +70,19 @@ const PgSignUp = () => {
});
if (res) {
localStorage.removeItem("userDetails");
try {
const extUser = await Parse.Cloud.run("getUserDetails", {
email: userDetails.email
});
const userRole = extUser?.get("UserRole");
const _currentRole = userRole;
const _role = _currentRole.replace("contracts_", "");
localStorage.setItem("_user_role", _role);
const extInfo_stringify = JSON.stringify([extUser]);
localStorage.setItem("Extand_Class", extInfo_stringify);
} catch (err) {
console.log("Err in fetching extuser", err);
}
navigate(
"/" + userSettings[0].pageType + "/" + userSettings[0].pageId
);
+33 -41
View File
@@ -1,5 +1,5 @@
import React, { useState, useEffect } from "react";
import { NavLink, useNavigate } from "react-router-dom";
import { useNavigate } from "react-router-dom";
import checkmark from "../assets/images/checkmark.png";
import plansArr from "../json/plansArr";
import Title from "../components/Title";
@@ -61,25 +61,33 @@ const PlanSubscriptions = () => {
// eslint-disable-next-line
}, []);
const handleFreePlan = async () => {
setIsLoader(true);
try {
const params = { userId: Parse.User.current().id };
const res = await Parse.Cloud.run("freesubscription", params);
if (res.status === "success" && res.result === "already subscribed!") {
setIsLoader(false);
alert("You have already subscribed to plan!");
} else if (res.status === "success") {
setIsLoader(false);
navigate("/");
} else if (res.status === "error") {
setIsLoader(false);
alert(res.result);
const handleFreePlan = async (item) => {
if (item.url) {
const url = yearlyVisible ? item.yearlyUrl + details : item.url + details;
if (user) {
localStorage.setItem("userDetails", JSON.stringify(user));
}
openInNewTab(url, item?.target);
} else {
setIsLoader(true);
try {
const params = { userId: Parse.User.current().id };
const res = await Parse.Cloud.run("freesubscription", params);
if (res.status === "success" && res.result === "already subscribed!") {
setIsLoader(false);
alert("You have already subscribed to plan!");
} else if (res.status === "success") {
setIsLoader(false);
navigate("/");
} else if (res.status === "error") {
setIsLoader(false);
alert(res.result);
}
} catch (err) {
setIsLoader(false);
console.log("err in free subscribe", err.message);
alert("Somenthing went wrong, please try again later!");
}
} catch (err) {
setIsLoader(false);
console.log("err in free subscribe", err.message);
alert("Somenthing went wrong, please try again later!");
}
};
return (
@@ -173,28 +181,12 @@ const PlanSubscriptions = () => {
</div>
</div>
</div>
{item.url ? (
<NavLink
to={
item.btnText === "Subscribe"
? yearlyVisible
? item.yearlyUrl + details
: item.url + details
: item.url
}
className="bg-[#002862] w-full text-white py-2 rounded uppercase hover:no-underline hover:text-white cursor-pointer"
target={item.target}
>
{item.btnText}
</NavLink>
) : (
<button
className="bg-[#002862] w-full text-white py-2 rounded uppercase hover:text-white cursor-pointer"
onClick={() => handleFreePlan()}
>
{item.btnText}
</button>
)}
<button
className="bg-[#002862] w-full text-white py-2 rounded uppercase hover:text-white cursor-pointer"
onClick={() => handleFreePlan(item)}
>
{item.btnText}
</button>
</div>
<hr className="w-full bg-gray-300 h-[0.5px]" />
<ul className="mx-1 p-3 text-left break-words text-sm list-none">
@@ -152,7 +152,7 @@ const ReportTable = (props) => {
className: "contracts_Organizations",
objectId: extUser.OrganizationId.objectId
});
team.equalTo("IsActive", true);
team.notEqualTo("IsActive", false);
const teamtRes = await team.find();
if (teamtRes.length > 0) {
const _teamRes = JSON.parse(JSON.stringify(teamtRes));