diff --git a/apps/OpenSign/src/App.js b/apps/OpenSign/src/App.js index 5154e248b..40b6801b6 100644 --- a/apps/OpenSign/src/App.js +++ b/apps/OpenSign/src/App.js @@ -18,9 +18,8 @@ import LazyPage from "./primitives/LazyPage"; import { isEnableSubscription } from "./constant/const"; import SSOVerify from "./pages/SSOVerify"; import Loader from "./primitives/Loader"; -import DepartmentList from "./pages/DepartmentList"; +import TeamList from "./pages/TeamList"; import UserList from "./pages/UserList"; -import AddDepartment from "./components/AddDepartment"; const DebugPdf = lazy(() => import("./pages/DebugPdf")); const ForgetPassword = lazy(() => import("./pages/ForgetPassword")); const GuestLogin = lazy(() => import("./pages/GuestLogin")); @@ -123,11 +122,8 @@ function App() { )} }> - } /> - } /> - + } /> } /> - } diff --git a/apps/OpenSign/src/components/AddDepartment.js b/apps/OpenSign/src/components/AddDepartment.js index b9de1d4b3..6af89e6f0 100644 --- a/apps/OpenSign/src/components/AddDepartment.js +++ b/apps/OpenSign/src/components/AddDepartment.js @@ -56,7 +56,7 @@ const AddDepartment = (props) => { objectId: x.objectId })); } else { - const AllUser = departmentList.find((x) => x.objectId === "All User"); + const AllUser = departmentList.find((x) => x.objectId === "All Users"); updatedAncestors = [ AllUser, { @@ -107,7 +107,7 @@ const AddDepartment = (props) => { const ParentId = departmentList.find( (x) => x.objectId === formdata.department ); - props.handleDepartmentInfo({ + props.handleTeamInfo({ objectId: newdepartmentRes.id, Name: formdata.name, ParentId: ParentId, @@ -115,7 +115,7 @@ const AddDepartment = (props) => { IsActive: true }); } else { - props.handleDepartmentInfo({ + props.handleTeamInfo({ objectId: newdepartmentRes.id, Name: formdata.name, ParentId: "", @@ -197,7 +197,7 @@ const AddDepartment = (props) => { htmlFor="phone" className="block text-xs text-gray-700 font-semibold" > - Department + Parent Team handleChange(e)} // required @@ -369,7 +370,7 @@ const AddUser = (props) => { htmlFor="phone" className="block text-xs text-gray-700 font-semibold" > - Department + Team { {isActiveModal[item.objectId] && (
- Are you sure you want to disable this - department? + Are you sure you want to disable this team?

@@ -299,7 +296,7 @@ const DepartmentList = () => {
- {departmentList.length > recordperPage && ( + {teamList.length > recordperPage && ( ))} - {departmentList.length > recordperPage && ( + {teamList.length > recordperPage && ( )}
- {departmentList?.length <= 0 && ( + {teamList?.length <= 0 && (
{
)} @@ -358,11 +355,11 @@ const DepartmentList = () => { )} {!isSubscribe && isEnableSubscription && !isLoader && (
- +
)}
); }; -export default DepartmentList; +export default TeamList; diff --git a/apps/OpenSign/src/pages/UserList.js b/apps/OpenSign/src/pages/UserList.js index 1f0d5df68..7c38bec57 100644 --- a/apps/OpenSign/src/pages/UserList.js +++ b/apps/OpenSign/src/pages/UserList.js @@ -10,15 +10,7 @@ import AddUser from "../components/AddUser"; import SubscribeCard from "../primitives/SubscribeCard"; import { isEnableSubscription } from "../constant/const"; import { checkIsSubscribedTeam } from "../constant/Utils"; -const heading = [ - "Sr.No", - "Name", - "Email", - "Phone", - "Role", - "Department", - "Is-Active" -]; +const heading = ["Sr.No", "Name", "Email", "Phone", "Role", "Team", "Active"]; // const actions = []; const UserList = () => { const [userList, setUserList] = useState([]); @@ -165,7 +157,7 @@ const UserList = () => { }); } catch (err) { setIsAlert({ type: "danger", msg: "something went wrong." }); - console.log("err in disable department", err); + console.log("err in disable team", err); } finally { setIsActLoader({}); setTimeout(() => setIsAlert({ type: "success", msg: "" }), 1500); @@ -196,9 +188,9 @@ const UserList = () => { )}
- User list{" "} + Users{" "} - +
handleFormModal()}> @@ -385,7 +377,7 @@ const UserList = () => { )} {!isSubscribe && isEnableSubscription && !isLoader && (
- +
)}
diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.js index 847bed726..46f832210 100644 --- a/apps/OpenSign/src/primitives/GetReportDisplay.js +++ b/apps/OpenSign/src/primitives/GetReportDisplay.js @@ -1379,7 +1379,7 @@ const ReportTable = (props) => { )} {isOption[item.objectId] && act.action === "option" && ( -
    +
      {act.subaction?.map((subact) => (
    • { options={departmentList} value={selectedDepartments} onChange={onChange} - closeMenuOnSelect={false} + closeMenuOnSelect required={true} noOptionsMessage={() => "Departments not found" @@ -1469,7 +1469,10 @@ const ReportTable = (props) => { > ✕
- + )} diff --git a/apps/OpenSign/src/primitives/SubscribeCard.js b/apps/OpenSign/src/primitives/SubscribeCard.js index 78f21001c..b0d3537f4 100644 --- a/apps/OpenSign/src/primitives/SubscribeCard.js +++ b/apps/OpenSign/src/primitives/SubscribeCard.js @@ -1,13 +1,16 @@ import React from "react"; import { useNavigate } from "react-router-dom"; -const SubscribeCard = ({ plan }) => { +const SubscribeCard = ({ plan, price }) => { const navigate = useNavigate(); return (

Upgrade to {plan ? plan : "PRO"} Plan

-

$29.99/month: Sign 100 docs using API. Only $0.15/doc after that.

+

+ ${price ? price : "29.99"}/month: Sign 100 docs using API. Only + $0.15/doc after that. +