added self Tenant Profile

This commit is contained in:
pramod mahajan 2025-08-22 15:16:51 +05:30
parent 735e766215
commit 4ab33fd5fd
11 changed files with 331 additions and 184 deletions

View File

@ -5,9 +5,12 @@ import GlobalModel from "../common/GlobalModel";
import { useTenantContext } from "../../pages/Tenant/TenantPage";
import { useTenantDetailsContext } from "../../pages/Tenant/TenantDetails";
import IconButton from "../common/IconButton";
import { hasUserPermission } from "../../utils/authUtils";
import { MANAGE_TENANTS } from "../../utils/constants";
const Profile = ({ data }) => {
const {setEditTenant} = useTenantDetailsContext()
const canUpdateTenant = hasUserPermission(MANAGE_TENANTS)
return (
<>
<div className="container-fuid">
@ -33,12 +36,12 @@ const Profile = ({ data }) => {
<i className="bx bx-globe text-primary bx-xs me-1"></i>
<span>{data?.domainName}</span>
</div>
<span
{canUpdateTenant && ( <span
className="position-absolute top-0 end-0 cursor-auto"
onClick={() => setEditTenant(true)}
>
<i className="bx bx-edit bs-sm text-primary cursor-pointer"></i>
</span>
</span>)}
</div>
</div>
</div>

View File

@ -4,7 +4,9 @@ import { useDispatch } from "react-redux";
import { setCurrentTenant } from "../../slices/globalVariablesSlice";
import { useNavigate } from "react-router-dom";
import { formatUTCToLocalTime } from "../../utils/dateUtils";
import { SUBSCRIPTION_PLAN_FREQUENCIES } from "../../utils/constants";
import { MANAGE_TENANTS, SUBSCRIPTION_PLAN_FREQUENCIES } from "../../utils/constants";
import { useHasAnyPermission } from "../../hooks/useExpense";
const SubScriptionHistory = ({ tenantId }) => {
const { data, isLoading, isError, error } = useTenantDetails(tenantId);

View File

@ -63,7 +63,7 @@ export const subscriptionSchema = z.object({
.min(1, "Team size is required and must be greater than zero"),
frequency: z
.number({ invalid_type_error: "Frequency must be a number" })
.min(1, "Frequency must be at least 1"),
.min(0, "Frequency must be at least 1"),
isTrial: z.boolean(),
autoRenew: z.boolean(),
});

View File

@ -81,7 +81,7 @@
{
"text": "Tenant",
"available": true,
"link": "/tenants/"
"link": "/tenants"
},
{
"text": "Masters",

View File

@ -55,6 +55,7 @@ export const useTenantDetails = (id) => {
const response = await TenantRepository.getTenantDetails(id);
return response.data;
},
enabled:!!id
});
};

View File

@ -0,0 +1,35 @@
import React, { useEffect, useMemo } from "react";
import { useProfile } from "../../hooks/useProfile";
import TenantDetails from "./TenantDetails";
import { hasUserPermission } from "../../utils/authUtils";
import { VIEW_TENANTS } from "../../utils/constants";
import { useNavigate } from "react-router-dom";
const SelfTenantDetails = () => {
const { profile, loading } = useProfile();
const tenantId = profile?.employeeInfo?.tenantId;
const navigate = useNavigate();
const isSelfTenantView = hasUserPermission(VIEW_TENANTS);
useEffect(() => {
if (!isSelfTenantView) {
navigate("/tenants");
}
}, [isSelfTenantView, navigate]);
if (loading || !tenantId) {
return <div>Loading...</div>;
}
return (
<TenantDetails
tenantId={tenantId}
wrapInContainer={true}
showBreadcrumb={true}
iTSelf={true}
/>
);
};
export default SelfTenantDetails;

View File

@ -0,0 +1,8 @@
import React from "react";
import TenantDetails from "./TenantDetails";
const SuperTenantDetails = () => {
return <TenantDetails wrapInContainer showBreadcrumb iTSelf={false} />;
};
export default SuperTenantDetails;

View File

@ -1,10 +1,8 @@
import React, { createContext, useContext,useState } from "react";
import React, { createContext, useContext, useState, useMemo } from "react";
import { useParams } from "react-router-dom";
import Breadcrumb from "../../components/common/Breadcrumb";
import Profile from "../../components/Tenant/Profile";
import { useTenantDetails } from "../../hooks/useTenant";
import Organization from "../../components/Tenant/Organization";
import { ComingSoonPage } from "../Misc/ComingSoonPage";
import GlobalModel from "../../components/common/GlobalModel";
import EditProfile from "../../components/Tenant/EditProfile";
@ -13,109 +11,142 @@ import SubScriptionHistory from "../../components/Tenant/SubScriptionHistory";
const TenantDetailsContext = createContext();
export const useTenantDetailsContext = () => useContext(TenantDetailsContext);
const TenantDetails = () => {
const { tenantId } = useParams();
const { data, isLoading, isError, error } = useTenantDetails(tenantId);
const TenantDetails = ({
tenantId: tenantIdProp,
wrapInContainer = true,
showBreadcrumb = true,
iTSelf = true
}) => {
const { tenantId: tenantIdFromUrl } = useParams();
const activeTenantId = tenantIdFromUrl || tenantIdProp;
const { data, isLoading, isError, error } = useTenantDetails(activeTenantId);
const [editTenant, setEditTenant] = useState(false);
const contextValues ={
setEditTenant,editTenant
}
const contextValues = useMemo(
() => ({ editTenant, setEditTenant }),
[editTenant]
);
const tabs = [
{
id: "navs-left-home",
label: "Profile",
icon: "bx bx-user-circle",
iconSize: "bx-sm",
content: <Profile data={data} />,
},
{
id: "navs-left-bill",
label: "Bills and Plan ",
icon: "bx bx-receipt",
iconSize: "bx-sm",
content: (
<div className="text-center">
<SubScriptionHistory tenantId={tenantId} />
</div>
),
},
{
id: "navs-left-messages",
label: "Messages",
icon: "bx bx-message-rounded",
iconSize: "bx-sm",
content: (
<div className="text-center">
<ComingSoonPage />
</div>
),
},
];
const tabs = useMemo(
() => [
{
id: "navs-left-home",
label: "Profile",
icon: "bx bx-user-circle",
iconSize: "bx-sm",
content: <Profile data={data} />,
},
{
id: "navs-left-bill",
label: "Bills and Plan",
icon: "bx bx-receipt",
iconSize: "bx-sm",
content: (
<div className="text-center">
<SubScriptionHistory tenantId={activeTenantId} />
</div>
),
},
{
id: "navs-left-messages",
label: "Messages",
icon: "bx bx-message-rounded",
iconSize: "bx-sm",
content: (
<div className="text-center">
<ComingSoonPage />
</div>
),
},
],
[data, activeTenantId]
);
if (!activeTenantId) return <div className="my-4">No tenant selected.</div>;
if (isLoading) return <div className="my-4">Loading...</div>;
if (isError) return <div className="my-3">{error.message}</div>;
if (isError) return <div className="my-3">{error?.message}</div>;
const Shell = ({ children }) =>
wrapInContainer ? (
<div className="container-fluid py-0">{children}</div>
) : (
<>{children}</>
);
return (
<>
<TenantDetailsContext.Provider value={contextValues}>
<div className="container-fluid py-0">
<Breadcrumb
data={[
{ label: "Home", link: "/dashboard" },
{ label: "Tenant", link: "/tenants" },
{ label: "Tenant Details", link: null },
]}
/>
<TenantDetailsContext.Provider value={contextValues}>
<Shell>
{showBreadcrumb && (
<Breadcrumb
data={
iTSelf
? [
{ label: "Home", link: "/dashboard" },
{ label: "Tenant Details", link: null },
]
: [
{ label: "Home", link: "/dashboard" },
{ label: "Tenant", link: "/tenants" },
{ label: "Tenant Details", link: null },
]
}
/>
)}
<div className="nav-align-left nav-tabs-shadow mb-6">
<ul className="nav nav-tabs py-2 page-min-h" role="tablist">
{tabs.map((tab, index) => (
<li key={tab.id} className="nav-item">
<button
type="button"
className={`nav-link d-flex align-items-center text-tiny gap-2 ${
index === 0 ? "active" : ""
}`}
role="tab"
data-bs-toggle="tab"
data-bs-target={`#${tab.id}`}
aria-controls={tab.id}
aria-selected={index === 0}
>
{tab.icon && <i className={`${tab.icon} ${tab.iconSize}`} />}
{tab.label}
</button>
</li>
))}
</ul>
<div className="nav-align-left nav-tabs-shadow mb-6">
<ul className="nav nav-tabs py-2 page-min-h" role="tablist">
{tabs.map((tab, index) => (
<li key={tab.id} className="nav-item">
<button
type="button"
className={`nav-link d-flex align-items-center text-tiny gap-2 ${
index === 0 ? "active" : ""
}`}
role="tab"
data-bs-toggle="tab"
data-bs-target={`#${tab.id}`}
aria-controls={tab.id}
aria-selected={index === 0}
>
{tab.icon && (
<i className={`${tab.icon} ${tab.iconSize}`} />
)}
{tab.label}
</button>
</li>
))}
</ul>
<div className="tab-content">
{tabs.map((tab, index) => (
<div
key={tab.id}
className={`tab-pane fade ${
index === 0 ? "show active" : ""
} text-start`}
id={tab.id}
>
{tab.content}
<div className="tab-content">
{tabs.map((tab, index) => (
<div
key={tab.id}
className={`tab-pane fade ${
index === 0 ? "show active" : ""
} text-start`}
id={tab.id}
>
{tab.content}
</div>
))}
</div>
))}
</div>
</div>
</div>
</TenantDetailsContext.Provider>
{editTenant && (
<GlobalModel size="lg" isOpen={editTenant} closeModal={()=>setEditTenant(false)}>
<EditProfile TenantId={tenantId} onClose={()=>setEditTenant(false)}/>
</div>
</Shell>
</TenantDetailsContext.Provider>
{editTenant && (
<GlobalModel
size="lg"
isOpen={editTenant}
closeModal={() => setEditTenant(false)}
>
<EditProfile
TenantId={activeTenantId}
onClose={() => setEditTenant(false)}
/>
</GlobalModel>
)}
</>
</>
);
};

View File

@ -1,70 +1,118 @@
import React, { useState, createContext, useEffect, useContext } from "react";
import React, {
useState,
createContext,
useEffect,
useContext,
useCallback,
useMemo,
} from "react";
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
// ------Components-------
import { useNavigate } from "react-router-dom";
import { useDispatch } from "react-redux";
// ------ Components -------
import Breadcrumb from "../../components/common/Breadcrumb";
import TenantsList from "../../components/Tenant/TenantsList";
import { useNavigate } from "react-router-dom";
import TenantFilterPanel from "../../components/Tenant/TenantFilterPanel";
// ------ Context & Utils -------
import { useDebounce } from "../../utils/appUtils";
import { useFab } from "../../Context/FabContext";
import { setCurrentTenant } from "../../slices/globalVariablesSlice";
import { hasUserPermission } from "../../utils/authUtils";
//---------- Schema and defaultValues----
// ------ Schema -------
import {
defaultFilterValues,
filterSchema,
} from "../../components/Tenant/TenantSchema";
import TenantFilterPanel from "../../components/Tenant/TenantFilterPanel";
import { useDispatch } from "react-redux";
import { setCurrentTenant } from "../../slices/globalVariablesSlice";
import { hasUserPermission } from "../../utils/authUtils";
import { SUPPER_TENANT, VIEW_TENANTS } from "../../utils/constants";
// This is context that wrapping all components tenant releated , but must pass inside 'TenantContext.Provider'
// ------ Constants -------
import {
MANAGE_TENANTS,
SUPPER_TENANT,
VIEW_TENANTS,
} from "../../utils/constants";
import { useProfile } from "../../hooks/useProfile";
// ---------- Context ----------
export const TenantContext = createContext();
export const useTenantContext = () => {
const context = useContext(TenantContext);
if (!context) {
throw new Error("useTenantContext must be used within an TenantProvider");
throw new Error(
"useTenantContext must be used within a TenantContext.Provider"
);
}
return context;
};
const TenantPage = () => {
const [searchText, setSearchText] = useState("");
const [isRefetching,setRefetching] = useState(false)
const [refetchFn, setRefetchFn] = useState(null);
const [filters, setFilter] = useState();
const dispatch = useDispatch()
const debouncedSearch = useDebounce(searchText, 500);
const contextValue = {
};
const dispatch = useDispatch();
const navigate = useNavigate();
const IsSupperTenant = hasUserPermission(SUPPER_TENANT)
const IsViewTenant = hasUserPermission(VIEW_TENANTS)
const { profile } = useProfile();
// ---------- State ----------
const [searchText, setSearchText] = useState("");
const [isRefetching, setIsRefetching] = useState(false);
const [refetchFn, setRefetchFn] = useState(null);
const [filters, setFilters] = useState();
// ---------- Hooks ----------
const debouncedSearch = useDebounce(searchText, 500);
const { setOffcanvasContent, setShowTrigger } = useFab();
// This Hook allow us to right-side bar for filter Tenants
const isSuperTenant = hasUserPermission(SUPPER_TENANT);
const canManageTenants = hasUserPermission(MANAGE_TENANTS);
const isSelfTenant = hasUserPermission(VIEW_TENANTS);
const methods = useForm({
resolver: zodResolver(filterSchema),
defaultValues: defaultFilterValues,
});
const { reset } = methods;
const methods = useForm({
resolver: zodResolver(filterSchema),
defaultValues: defaultFilterValues,
});
const { reset } = methods;
const handleApplyFilters = useCallback((values) => {
setFilters(values);
}, []);
const filterPanelElement = useMemo(
() => <TenantFilterPanel onApply={handleApplyFilters} />,
[handleApplyFilters]
);
console.log(isSelfTenant)
// ---------- Fab Filter Panel ----------
useEffect(() => {
if (!isSuperTenant) return;
setShowTrigger(true);
setOffcanvasContent("Tenant Filters", <TenantFilterPanel onApply={setFilter}
/>);
setOffcanvasContent("Tenant Filters", filterPanelElement);
return () => {
setShowTrigger(false);
setOffcanvasContent("", null);
};
}, []);
const handleNewTenant =()=>{
dispatch(setCurrentTenant(null))
navigate("/tenants/new-tenant")
}
}, [isSuperTenant, filterPanelElement, profile]);
// ---------- Redirect for Self Tenant ----------
useEffect(() => {
if (!isSuperTenant && isSelfTenant) {
// Delay navigation to next tick to avoid "update during render" warning
setTimeout(() => {
navigate("/tenant/self");
}, 0);
}
}, [isSuperTenant, isSelfTenant, navigate]);
// ---------- Handlers ----------
const handleNewTenant = () => {
dispatch(setCurrentTenant(null));
navigate("/tenants/new-tenant");
};
// ---------- Context Value ----------
const contextValue = {};
return (
<TenantContext.Provider value={contextValue}>
<div className="container-fluid">
@ -75,49 +123,65 @@ const handleNewTenant =()=>{
]}
/>
<div className="card d-flex p-2">
<div className="row align-items-center">
<div className="col-6 col-md-6 col-lg-3 mb-md-0">
<input
type="search"
value={searchText}
onChange={(e)=>setSearchText(e.target.value)}
className="form-control form-control-sm"
placeholder="Search Tenant"
/>
</div>
{/* Super Tenant Actions */}
{isSuperTenant && (
<div className="card d-flex p-2">
<div className="row align-items-center">
{/* Search */}
<div className="col-6 col-md-6 col-lg-3 mb-md-0">
<input
type="search"
value={searchText}
onChange={(e) => setSearchText(e.target.value)}
className="form-control form-control-sm"
placeholder="Search Tenant"
/>
</div>
<div className="col-6 col-md-6 col-lg-9 text-end cursor-pointer">
<span className="text-tiny text-muted p-1 border-0 bg-none lead mx-3 " disabled={isRefetching} onClick={() => refetchFn && refetchFn()}>
Refresh <i className={`bx bx-refresh ms-1 ${isRefetching ? "bx-spin":""}`}></i>
</span>
{/* Actions */}
<div className="col-6 col-md-6 col-lg-9 text-end">
<span
className="text-tiny text-muted p-1 border-0 bg-none lead mx-3 cursor-pointer"
disabled={isRefetching}
onClick={() => refetchFn && refetchFn()}
>
Refresh{" "}
<i
className={`bx bx-refresh ms-1 ${
isRefetching ? "bx-spin" : ""
}`}
></i>
</span>
{IsSupperTenant && (
<button
type="button"
data-bs-toggle="tooltip"
data-bs-offset="0,8"
data-bs-placement="top"
data-bs-custom-class="tooltip"
title="Add New Tenant"
className="p-1 bg-primary rounded-circle cursror-pointer"
onClick={handleNewTenant}
>
<i className="bx bx-plus fs-4 text-white"></i>
</button>
)}
type="button"
title="Add New Tenant"
className="p-1 bg-primary rounded-circle cursor-pointer"
onClick={handleNewTenant}
>
<i className="bx bx-plus fs-4 text-white"></i>
</button>
</div>
</div>
</div>
</div>
{IsViewTenant ? (<TenantsList filters={filters} searchText={debouncedSearch} setIsRefetching={setRefetching}
setRefetchFn={setRefetchFn}
/>):(
<div className="text-center my-2">
<i className="fa-solid fa-triangle-exclamation fs-5"></i>
<p>Access Denied: You don't have permission to perform this action. !</p>
</div>
) }
)}
{/* Tenant List or Access Denied */}
{isSuperTenant ? (
<TenantsList
filters={filters}
searchText={debouncedSearch}
setIsRefetching={setIsRefetching}
setRefetchFn={setRefetchFn}
/>
) : !isSelfTenant ? (
<div className="card text-center my-4 p-2">
<i className="fa-solid fa-triangle-exclamation fs-5"></i>
<p>
Access Denied: You don't have permission to perform this action!
</p>
</div>
) : null}
</div>
</TenantContext.Provider>
);

View File

@ -42,18 +42,20 @@ import TenantPage from "../pages/Tenant/TenantPage";
import CreateTenant from "../pages/Tenant/CreateTenant";
import ExpensePage from "../pages/Expense/ExpensePage";
import TenantDetails from "../pages/Tenant/TenantDetails";
import SelfTenantDetails from "../pages/Tenant/SelfTenantDetails";
import SuperTenantDetails from "../pages/Tenant/SuperTenantDetails";
const router = createBrowserRouter(
[
{
element: <AuthLayout />,
children: [
{path: "/auth/login", element: <LoginPage />},
{path: "/auth/login-otp", element: <LoginWithOtp />},
{ path: "/auth/login", element: <LoginPage /> },
{ path: "/auth/login-otp", element: <LoginWithOtp /> },
{ path: "/auth/reqest/demo", element: <RegisterPage /> },
{ path: "/auth/forgot-password", element: <ForgotPasswordPage /> },
{ path: "/reset-password", element: <ResetPasswordPage /> },
{ path: "/legal-info", element: <LegalInfoCard /> },
{ path: "/legal-info", element: <LegalInfoCard /> },
{ path: "/auth/changepassword", element: <ChangePasswordPage /> },
],
},
@ -82,9 +84,10 @@ const router = createBrowserRouter(
{ path: "/gallary", element: <ImageGallary /> },
{ path: "/expenses", element: <ExpensePage /> },
{ path: "/masters", element: <MasterPage /> },
{ path: "/tenants", element: <TenantPage /> },
{ path: "/tenants/new-tenant", element: <CreateTenant /> },
{ path: "/tenant/:tenantId", element: <TenantDetails /> },
{ path: "/tenants", element: <TenantPage /> },
{ path: "/tenants/new-tenant", element: <CreateTenant /> },
{ path: "/tenant/:tenantId", element: <SuperTenantDetails /> },
{ path: "/tenant/self", element: <SelfTenantDetails /> },
{ path: "/help/support", element: <Support /> },
{ path: "/help/docs", element: <Documentation /> },
{ path: "/help/connect", element: <Connect /> },

View File

@ -96,10 +96,10 @@ export const reference = [
{ val: "root tenant", name: "Root Tenant" },
];
export const orgSize = [
{ val: "50", name: "1-50" },
{ val: "100", name: "51-100" },
{ val: "500", name: "101-500" },
{ val: "600", name: "500+" },
{ val: "1-50", name: "1-50" },
{ val: "51-100", name: "51-100" },
{ val: "101-500", name: "101-500" },
{ val: "500+", name: "500+" },
];
export const BASE_URL = process.env.VITE_BASE_URL;