{error}
}
+ {isError && {error.message}
}
{loading && !data && Loading...
}
{data && data.length > 0 && (
| + Status + | ++ Active + | ++ In-Progress + | ++ On Hold + | ++ In-Active + | ++ Completed + | +
| + Projects + | ++ {data?.activeProjects} + | ++ {data?.inProgressProjects} + | ++ {data?.onHoldProjects} + | ++ {data?.inActiveProjects} + | ++ {data?.completedProjects} + | +
+
+
+
+ Activite Employees:
+ {data?.activeEmployees}
+
+
+
+
+ In-Active Employee:
+ {data?.inActiveEmployees}
+
+
+
+ );
+};
+
+export default SegmentedControl;
diff --git a/src/components/Tenant/SubScription.jsx b/src/components/Tenant/SubScription.jsx
new file mode 100644
index 00000000..c2f629ca
--- /dev/null
+++ b/src/components/Tenant/SubScription.jsx
@@ -0,0 +1,252 @@
+import React, { useState, useEffect } from "react";
+import {
+ useAddSubscription,
+ useSubscriptionPlan,
+ useUpgradeSubscription,
+} from "../../hooks/useTenant";
+import SegmentedControl from "./SegmentedControl";
+import { useFormContext } from "react-hook-form";
+import { CONSTANT_TEXT } from "../../utils/constants";
+import Label from "../common/Label";
+import { useSelector } from "react-redux";
+import { useNavigate } from "react-router-dom";
+
+const SubScription = ({ onSubmitSubScription, onNext }) => {
+ const [frequency, setFrequency] = useState(3);
+ const [selectedPlanId, setSelectedPlanId] = useState(null);
+ const selectedTenant = useSelector(
+ (store) => store.globalVariables.currentTenant
+ );
+ const naviget = useNavigate();
+ const {
+ data: plans = [],
+ isError,
+ isLoading,
+ error: subscriptionGettingError,
+ } = useSubscriptionPlan(frequency);
+
+ const {
+ register,
+ setValue,
+ getValues,
+ trigger,
+ formState: { errors },
+ } = useFormContext();
+
+ const {
+ mutate: AddSubScription,
+ isPending,
+ error,
+ } = useAddSubscription(() => {
+ naviget("/tenants");
+ });
+ const { mutate: updgradeSubscription, isPending: upgrading } =
+ useUpgradeSubscription(() => {
+ naviget("/tenants");
+ });
+ const handleSubscriptionSubmit = async () => {
+ const isValid = await trigger([
+ "planId",
+ "currencyId",
+ "maxUsers",
+ "frequency",
+ "isTrial",
+ "autoRenew",
+ ]);
+
+ if (isValid) {
+ const payload = getValues();
+ // onSubmitSubScription(payload);
+ let subscriptionPayload = null;
+
+ if (selectedTenant?.operationMode === 1) {
+ subscriptionPayload = {
+ planId: payload.planId,
+ currencyId: payload.currencyId,
+ maxUsers: payload.maxUsers,
+ tenantId: selectedTenant?.data?.id,
+ };
+ updgradeSubscription(subscriptionPayload);
+ } else {
+ subscriptionPayload = {
+ ...payload,
+ tenantId: selectedTenant?.data?.id,
+ };
+ AddSubScription(subscriptionPayload);
+ }
+ }
+ };
+
+ const handlePlanSelection = (plan) => {
+ setSelectedPlanId(plan.id);
+ setValue("planId", plan.id);
+ setValue("currencyId", plan.currency?.id);
+ setValue("frequency", frequency);
+ };
+
+ const selectedPlan = plans.find((p) => p.id === selectedPlanId);
+ if (isLoading) return
+
+
+
+
+
+
+ Loading....
;
+ if (isError)
+ return (
+ {subscriptionGettingError?.message}
+ );
+ return (
+
+
+ );
+};
+
+export default SubScription;
diff --git a/src/components/Tenant/SubScriptionHistory.jsx b/src/components/Tenant/SubScriptionHistory.jsx
new file mode 100644
index 00000000..a587a84e
--- /dev/null
+++ b/src/components/Tenant/SubScriptionHistory.jsx
@@ -0,0 +1,219 @@
+import React, { useEffect } from "react";
+import { useTenantDetails } from "../../hooks/useTenant";
+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";
+
+const SubScriptionHistory = ({ tenantId }) => {
+ const { data, isLoading, isError, error } = useTenantDetails(tenantId);
+ const dispatch = useDispatch();
+ const navigate = useNavigate();
+
+ useEffect(() => {
+ if (data) {
+ dispatch(setCurrentTenant({ operationMode: 1, data }));
+ } else {
+ dispatch(setCurrentTenant({ operationMode: 0, data: null }));
+ }
+ }, [data, dispatch]);
+
+ const handleUpgradePlan = () => {
+ navigate("/tenants/new-tenant");
+ };
+
+ if (isLoading) return
+ {plans.map((plan) => {
+ const isSelected = plan.id === selectedPlanId;
+
+ return (
+
+ )}
+
+
+ );
+ })}
+
+ {/* Form Inputs */}
+ handlePlanSelection(plan)}
+ >
+
+
+
+
+
+
+
+
+
+ + {plan.planName} +
+{plan.description}
++ {plan.currency?.symbol} {plan.price} +
+ +-
+
- + + Storage {plan.maxStorage} MB + +
- + + Trial Days {plan.trialDays} + +
+
+
+
+
+
+ {plan?.features &&
+ Object.entries(plan?.features?.modules || {})
+ .filter(([key]) => key !== "id")
+ .map(([key, mod]) => (
+
+ Features
+
+
+
+ {mod.name}
+
+ ))}
+
+
+
+ {Object.keys(errors).length > 0 && (
+
+
+ {
+ if (["e", "E", "+", "-", "."].includes(e.key)) {
+ e.preventDefault();
+ }
+ }}
+ />
+
+
+
+
+
+
+
+
+
+ {CONSTANT_TEXT.RenewsubscriptionLabel}
+
+
+ {Object.entries(errors).map(([key, error]) => (
+
+ )}
+
+
+ {error?.message}
+
+ ))}
+
+
+
+ Loading...
;
+ if (isError) return {error}
;
+
+ const plan = data?.currentPlan;
+ const features = data?.currentPlanFeatures;
+ const subscriptionHistory = data?.subscriptionHistery;
+
+ if (!plan) {
+ return (
+
+
+
+ );
+ }
+
+ // Format dates
+ const end = plan?.endDate ? new Date(plan.endDate) : null;
+ const today = new Date();
+
+ const daysLeft = end
+ ? Math.max(0, Math.ceil((end - today) / (1000 * 60 * 60 * 24)))
+ : 0;
+
+ // Render logic for subscription history table
+ const renderSubscriptionHistory = () => {
+ if (!subscriptionHistory || subscriptionHistory.length === 0) {
+ return (
+
+ Add your new subscription
+
+
+ No subscription history found
+
+ );
+ }
+
+ const sortedHistory = subscriptionHistory
+ .slice()
+ .sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt));
+
+ return (
+ <>
+ {/* Table for larger screens */}
+
+
+
+
+
+
+ {/* Card-based view for smaller screens */}
+
+
+ );
+ };
+
+ return (
+ | Date | +Type | +Amount | +Plan Name | +Action | +
|---|---|---|---|---|
| {formatUTCToLocalTime(item?.createdAt)} | +{SUBSCRIPTION_PLAN_FREQUENCIES[item.frequency] || "N/A"} | ++ {item.currency?.symbol || "₹"} {item.price} + | +{item.planName} | +
+
+
+
+
+
+
+
+ |
+
+
+ );
+};
+
+export default SubScriptionHistory;
\ No newline at end of file
diff --git a/src/components/Tenant/TenanatSkeleton.jsx b/src/components/Tenant/TenanatSkeleton.jsx
new file mode 100644
index 00000000..9d48529e
--- /dev/null
+++ b/src/components/Tenant/TenanatSkeleton.jsx
@@ -0,0 +1,97 @@
+import React from "react";
+
+const SkeletonCell = ({ width = "100%", height = 20, style = {} }) => (
+
+);
+
+export const TenantTableSkeleton = ({ columns, rows = 5 }) => {
+ return (
+
+ {/* Left Card: Active Subscription */}
+
+
+
+
+ {/* Right Card: Subscription History */}
+
+
+
+
+
+ Active Subscription
+ + {plan.planName || "N/A"} +
+ {plan.description && ( +{plan.description}
+ )} + +
+
+
+ + {plan.currency?.symbol || "₹"} {plan.price} +
+ + {SUBSCRIPTION_PLAN_FREQUENCIES[plan.frequency] || ""} + +
+
+
+ {/* Features list */}
+
+ Activated Since:{" "}
+ {plan.startDate ? formatUTCToLocalTime(plan.startDate) : "N/A"} (
+ {daysLeft} days left)
+
+
+ Ends on:{" "}
+ {plan.endDate ? formatUTCToLocalTime(plan.endDate) : "N/A"}
+
+
+
+
+ Features
+
+ {features?.modules &&
+ Object.entries(features.modules).map(([key, mod]) => {
+ if (!mod?.name) return null;
+ return (
+
+
+
+ {mod.name}
+
+ );
+ })}
+
+
+
+
+
+
+
+
+
+ {renderSubscriptionHistory()}
+
+ History
+
+
+
+ );
+};
diff --git a/src/components/Tenant/TenantFilterPanel.jsx b/src/components/Tenant/TenantFilterPanel.jsx
new file mode 100644
index 00000000..97be13b5
--- /dev/null
+++ b/src/components/Tenant/TenantFilterPanel.jsx
@@ -0,0 +1,116 @@
+import { zodResolver } from "@hookform/resolvers/zod";
+import React, { useState,useCallback } from "react";
+import { FormProvider, useForm, useFormContext } from "react-hook-form";
+import { defaultFilterValues, filterSchema } from "./TenantSchema";
+import Label from "../common/Label";
+import SelectMultiple from "../common/SelectMultiple";
+import { useIndustries } from "../../hooks/useTenant";
+import { reference, TENANT_STATUS } from "../../utils/constants";
+import { DateRangePicker1 } from "../common/DateRangePicker";
+import moment from "moment";
+
+const TenantFilterPanel = ({onApply}) => {
+const [resetKey, setResetKey] = useState(0);
+
+ const methods = useForm({
+ resolver: zodResolver(filterSchema),
+ defaultValues: defaultFilterValues,
+ });
+
+ const { handleSubmit, reset } = methods;
+ const { data: industries = [], isLoading } = useIndustries();
+
+ const handleClosePanel = useCallback(() => {
+ document.querySelector(".offcanvas.show .btn-close")?.click();
+ }, []);
+
+ const onSubmit = useCallback(
+ (formData) => {
+ onApply({
+ ...formData,
+ startDate: moment.utc(formData.startDate, "DD-MM-YYYY").toISOString(),
+ endDate: moment.utc(formData.endDate, "DD-MM-YYYY").toISOString(),
+ });
+ handleClosePanel();
+ },
+ [onApply, handleClosePanel]
+ );
+
+ const onClear = useCallback(() => {
+ reset(defaultFilterValues);
+ setResetKey((prev) => prev + 1); // triggers DateRangePicker reset
+ onApply(defaultFilterValues);
+ }, [onApply, reset]);
+
+ if (isLoading) {
+ return
+
+
+
+
+ |
+ {col.label}
+ |
+ ))}
+
|---|
|
+ {/* Icon + text skeleton for first few columns */}
+ {col.key === "name" && (
+
+
+
+ )}
+ {col.key === "domainName" && (
+
+
+
+ )}
+ {col.key === "contactName" && (
+
+
+
+ )}
+ {col.key === "contactNumber" && (
+ |
+ ))}
+
Loading...
;
+ }
+
+ return (
+
+
+ );
+};
+
+export default TenantForm;
diff --git a/src/components/Tenant/TenantSchema.js b/src/components/Tenant/TenantSchema.js
new file mode 100644
index 00000000..208f7c01
--- /dev/null
+++ b/src/components/Tenant/TenantSchema.js
@@ -0,0 +1,155 @@
+import { z } from "zod";
+
+export const newTenantSchema = z.object({
+ firstName: z
+ .string().trim()
+ .min(1, { message: "First Name is required!" })
+ .regex(/^[A-Za-z]+$/, { message: "First Name should contain only letters!" }),
+ lastName: z
+ .string().trim()
+ .min(1, { message: "Last Name is required!" })
+ .regex(/^[A-Za-z]+$/, { message: "Last Name should contain only letters!" }),
+ email: z.string().trim().email("Invalid email address"),
+ description: z.string().trim().optional(),
+ domainName: z.string().trim().nonempty("Domain name is required"),
+ billingAddress: z.string().trim().nonempty("Billing address is required"),
+ taxId: z.string().trim().nonempty("Tax ID is required"),
+ logoImage: z.string().trim().optional(),
+ organizationName: z.string().trim().nonempty("Organization name is required"),
+ officeNumber: z.string().trim().nonempty("Office number is required"),
+ contactNumber: z.string().trim()
+ .nonempty("Contact number is required")
+ .regex(/^\+?[1-9]\d{7,14}$/, "Enter a valid contact number"),
+ onBoardingDate: z.preprocess((val) => {
+ if (typeof val === "string" && val.includes("-")) {
+ const [day, month, year] = val.split("-");
+ return new Date(`${year}-${month}-${day}`);
+ }
+ return val;
+}, z.date({
+ required_error: "Onboarding date is required",
+ invalid_type_error: "Invalid date format",
+})),
+ organizationSize: z.string().nonempty("Organization size is required"),
+ industryId: z.string().uuid("Invalid industry ID"),
+ reference: z.string().nonempty("Reference is required"),
+});
+
+export const tenantDefaultValues = {
+ firstName: "",
+ lastName: "",
+ email: "",
+ description: "",
+ domainName: "",
+ billingAddress: "",
+ taxId: "",
+ logoImage: "",
+ organizationName: "",
+ officeNumber: "",
+ contactNumber: "",
+ onBoardingDate: new Date(), // or `null` if you want it empty
+ organizationSize: "",
+ industryId: "", // should be a valid UUID if pre-filled
+ reference: "",
+};
+
+
+
+export const getSubscriptionSchema = (minUsers) =>
+ z.object({
+ planId: z.string().min(1, { message: "Please select Plan" }),
+ currencyId: z.string().uuid("Invalid currency"),
+ maxUsers: z
+ .number({ invalid_type_error: "Must be a number" })
+ .min(minUsers, { message: `Team size must be greater than or equal to ${minUsers}` }),
+ frequency: z
+ .number({ invalid_type_error: "Frequency must be a number" })
+ .min(0, "Please select any one Frequency"),
+ isTrial: z.boolean(),
+ autoRenew: z.boolean(),
+ });
+
+export const subscriptionDefaultValues = {
+ // tenantId: "",
+ planId: "",
+ currencyId: "",
+ maxUsers: 1,
+ frequency: 1,
+ isTrial: false,
+ autoRenew: false,
+};
+
+export const filterSchema = z.object({
+ industryIds: z.array(z.string()).optional(),
+ // createdByIds: z.array(z.string()).optional(),
+ tenantStatusIds: z.array(z.string()).optional(),
+ references: z.array(z.string()).optional(),
+ startDate: z.string().optional(),
+ endDate: z.string().optional(),
+});
+export const defaultFilterValues = {
+ industryIds: [],
+ // createdByIds: [],
+ tenantStatusIds: [],
+ references: [],
+ startDate:null,
+ endDate:null,
+};
+
+export const getStepFields = (stepIndex) => {
+ const stepFieldMap = {
+ 0: [
+ "firstName",
+ "lastName",
+ "email",
+ "contactNumber",
+ "billingAddress",
+ ],
+ 1: [
+ "organizationName",
+ "officeNumber",
+ "domainName",
+ "description",
+ "onBoardingDate",
+ "organizationSize",
+ "taxId",
+ "industryId",
+ "reference",
+ "logoImage",
+ ],
+ 2: [
+ "tenantId",
+ "planId",
+ "currencyId",
+ "maxUsers",
+ "frequency",
+ "isTrial",
+ "autoRenew",
+ ],
+ };
+
+ return stepFieldMap[stepIndex] || [];
+};
+
+export const EditTenant = z.object({
+ firstName: z
+ .string().trim()
+ .min(1, { message: "First Name is required!" })
+ .regex(/^[A-Za-z]+$/, { message: "First Name should contain only letters!" }),
+lastName: z
+ .string().trim()
+ .min(1, { message: "Last Name is required!" })
+ .regex(/^[A-Za-z]+$/, { message: "Last Name should contain only letters!" }),
+ description: z.string().trim().optional(),
+ domainName: z.string().trim().min(1, { message: "Domain Name is required!" }),
+ billingAddress: z.string().trim().min(1, { message: "Billing Address is required!" }),
+ taxId: z.string().trim().min(1, { message: "Tax ID is required!" }),
+ logoImage: z.string().optional(),
+ officeNumber: z.string().trim().min(1, { message: "Office Number is required!" }),
+ contactNumber: z.string().trim()
+ .nonempty("Contact number is required")
+ .regex(/^\+?[1-9]\d{7,14}$/, "Enter a valid contact number"),
+ organizationSize: z.string().min(1, { message: "Organization Size is required!" }),
+ industryId: z.string().min(1,{ message: "Invalid Industry ID!" }),
+ reference: z.string().optional(),
+});
diff --git a/src/components/Tenant/TenantsList.jsx b/src/components/Tenant/TenantsList.jsx
new file mode 100644
index 00000000..4788d7a2
--- /dev/null
+++ b/src/components/Tenant/TenantsList.jsx
@@ -0,0 +1,194 @@
+import React, { useEffect, useState } from "react";
+import { useTenants } from "../../hooks/useTenant";
+import { ITEMS_PER_PAGE } from "../../utils/constants";
+import { getTenantStatus } from "../../utils/dateUtils";
+import IconButton from "../common/IconButton";
+import Pagination from "../common/Pagination";
+import { TenantTableSkeleton } from "./TenanatSkeleton";
+import { useTenantContext } from "../../pages/Tenant/TenantPage";
+import { useNavigate } from "react-router-dom";
+
+const TenantsList = ({
+ filters,
+ searchText,
+ setIsRefetching,
+ setRefetchFn,
+}) => {
+ const [currentPage, setCurrentPage] = useState(1);
+ const navigate = useNavigate();
+ const {
+ data,
+ isLoading,
+ isError,
+ isInitialLoading,
+ error,
+ refetch,
+ isFetching,
+ } = useTenants(currentPage, filters, searchText);
+
+ const { setRefetching } = useTenantContext();
+
+ const paginate = (page) => {
+ if (page >= 1 && page <= (data?.totalPages ?? 1)) {
+ setCurrentPage(page);
+ }
+ };
+
+ // Pass the refetch function to parent when component mounts
+ useEffect(() => {
+ setRefetchFn(() => refetch); // store in parent
+ }, [setRefetchFn, refetch]);
+
+ // Sync fetching status with parent
+ useEffect(() => {
+ setIsRefetching(isFetching);
+ }, [isFetching, setIsRefetching]);
+
+ const TenantColumns = [
+ {
+ key: "name",
+ label: "Organization",
+ getValue: (t) => (
+
+ {newTenantConfig
+ .filter((step) => step.name.toLowerCase() !== "congratulation")
+ .map((step, index) => {
+ const isActive = activeTab === index;
+ const isCompleted = completedTabs.includes(index);
+
+ return (
+
+
+ );
+ })}
+
+
+
+
+
+ {index < newTenantConfig.length - 1 && (
+
+ )}
+
+ {isSubscriptionTab ? (
+
+
+
+ ) : (
+
+
+
+ )}
+
+ navigate(`/tenant/${t.id}`)}
+ >
+ {t.logoImage ? (
+ 
+ ) : (
+
+ ),
+ align: "text-start",
+ },
+ {
+ key: "domainName",
+ label: "Domain",
+ getValue: (t) => (
+
+ ),
+ align: "text-start",
+ },
+ {
+ key: "contactName",
+ label: "Contact Person",
+ getValue: (t) => (
+
+
+ {t.contactName || "N/A"}
+
+ ),
+ align: "text-start",
+ },
+ {
+ key: "contactNumber",
+ label: "Contact",
+ getValue: (t) => t.contactNumber || "N/A",
+ isAlwaysVisible: true,
+ },
+ {
+ key: "status",
+ label: "Status",
+ align: "text-center",
+ getValue: (t) => (
+
+ {t.tenantStatus?.name || "Unknown"}
+
+ ),
+ },
+ ];
+ if (isInitialLoading)
+ return
+
+ );
+ return (
+ <>
+
+
+
+ {error.message}
+
+
+
+ );
+};
+
+export default TenantsList;
diff --git a/src/components/common/DateRangePicker.jsx b/src/components/common/DateRangePicker.jsx
index b82bdfac..9b7505fe 100644
--- a/src/components/common/DateRangePicker.jsx
+++ b/src/components/common/DateRangePicker.jsx
@@ -76,7 +76,8 @@ export const DateRangePicker1 = ({
placeholder = "Select date range",
className = "",
allowText = false,
- resetSignal, // <- NEW prop
+ resetSignal,
+ defaultRange = true,
...rest
}) => {
const inputRef = useRef(null);
@@ -124,10 +125,9 @@ export const DateRangePicker1 = ({
...rest,
});
- // Apply default if empty
const currentStart = getValues(startField);
const currentEnd = getValues(endField);
- if (!currentStart && !currentEnd) {
+ if (defaultRange && !currentStart && !currentEnd) {
applyDefaultDates();
} else if (currentStart && currentEnd) {
instance.setDate([
@@ -139,12 +139,11 @@ export const DateRangePicker1 = ({
return () => instance.destroy();
}, []);
- // Reapply default range on resetSignal change
useEffect(() => {
- if (resetSignal !== undefined) {
+ if (defaultRange && resetSignal !== undefined) {
applyDefaultDates();
}
- }, [resetSignal]);
+ }, [resetSignal, defaultRange]);
const start = getValues(startField);
const end = getValues(endField);
@@ -173,3 +172,4 @@ export const DateRangePicker1 = ({
);
};
+
diff --git a/src/components/common/IconButton.jsx b/src/components/common/IconButton.jsx
index 362c1db9..616d8cd6 100644
--- a/src/components/common/IconButton.jsx
+++ b/src/components/common/IconButton.jsx
@@ -15,7 +15,7 @@ const IconButton = ({
iconClass, // icon class string like 'bx bx-user'
color = "primary",
onClick,
- size = 20,
+ size = 5,
radius=null,
style = {},
...rest
@@ -31,7 +31,7 @@ const IconButton = ({
style={{
backgroundColor,
color: iconColor,
- padding: "0.4rem",
+ padding: "0.3rem",
margin:'0rem 0.2rem',
...style,
}}
diff --git a/src/components/common/Label.jsx b/src/components/common/Label.jsx
new file mode 100644
index 00000000..030c22d6
--- /dev/null
+++ b/src/components/common/Label.jsx
@@ -0,0 +1,12 @@
+import React from "react";
+
+const Label = ({ htmlFor, children, required = false, className = "" }) => {
+ return (
+
+ );
+};
+
+export default Label;
diff --git a/src/components/common/Loader.jsx b/src/components/common/Loader.jsx
index c34e0069..07078edb 100644
--- a/src/components/common/Loader.jsx
+++ b/src/components/common/Loader.jsx
@@ -2,37 +2,20 @@ import React from "react";
const Loader = () => {
return (
-
+
+
+
+ {data?.data?.length > 0 && (
+
+ |
+ {col.label}
+ |
+ ))}
+
|---|
| + {col.customRender + ? col.customRender(tenant) + : col.getValue(tenant)} + | + ))} +
| + No Tenants Found + | +
-
- }
-
- {isModalOpenComment && (
- setIsModalOpenComment(false)}
- >
+ {/* --- Modals --- */}
+ {modal.type === "report" && (
+
+
+ )}
+ {modal.type === "comments" && (
+
{
+ if (isSubTask) openModal("subtask", modal.data.task);
+ else closeModal();
+ }}
+ closeModal={closeModal}
/>
)}
-
- {IsSubTaskNeeded && (
-
-
+
)}
- Loading...
+
+ );
return (
<>
- {isModalOpen &&
+
);
};
export default Loader;
+
diff --git a/src/data/menuData.json b/src/data/menuData.json
index 494f45dd..75809c9b 100644
--- a/src/data/menuData.json
+++ b/src/data/menuData.json
@@ -66,7 +66,6 @@
"available": true,
"link": "/expenses"
},
-
{
"text": "Image Gallary",
"icon": "bx bx-images",
@@ -80,9 +79,9 @@
"link": "",
"submenu": [
{
- "text": "Users",
+ "text": "Tenant",
"available": true,
- "link": "/employees/"
+ "link": "/tenants"
},
{
"text": "Masters",
diff --git a/src/hooks/masterHook/useMaster.js b/src/hooks/masterHook/useMaster.js
index 15dc3305..fcbb821d 100644
--- a/src/hooks/masterHook/useMaster.js
+++ b/src/hooks/masterHook/useMaster.js
@@ -11,7 +11,15 @@ import showToast from "../../services/toastService";
-
+export const useMasterMenu = ()=>{
+ return useQuery({
+ queryKey:["MasterMenu"],
+ queryFn:async()=> {
+ const resp = await MasterRespository.getMasterMenus();
+ return resp.data
+ }
+ })
+}
export const useActivitiesMaster = () =>
{
diff --git a/src/hooks/useProfile.js b/src/hooks/useProfile.js
index d9efefd1..d1619ed6 100644
--- a/src/hooks/useProfile.js
+++ b/src/hooks/useProfile.js
@@ -99,3 +99,13 @@ export const useProfile = () => {
refetch,
};
};
+
+
+export const useSidBarMenu = ()=>{
+ const userLogged = useSelector((store)=>store.globalVariables.loginUser);
+ return useQuery({
+ queryKey:["AppMenu"],
+ queryFn:async()=> await AuthRepository.appmenu(),
+ enabled: !!userLogged
+ })
+}
\ No newline at end of file
diff --git a/src/hooks/useProjects.js b/src/hooks/useProjects.js
index 554af77e..3a887d60 100644
--- a/src/hooks/useProjects.js
+++ b/src/hooks/useProjects.js
@@ -175,6 +175,7 @@ export const useProjectInfra = (projectId) => {
} = useQuery({
queryKey: ["ProjectInfra", projectId],
queryFn: async () => {
+ if(!projectId) return null;
const res = await ProjectRepository.getProjectInfraByproject(projectId);
return res.data;
},
diff --git a/src/hooks/useTenant.js b/src/hooks/useTenant.js
new file mode 100644
index 00000000..7e2b9ecf
--- /dev/null
+++ b/src/hooks/useTenant.js
@@ -0,0 +1,177 @@
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { TenantRepository } from "../repositories/TenantRepository";
+import { MarketRepository } from "../repositories/MarketRepository";
+import showToast from "../services/toastService";
+import { useDispatch } from "react-redux";
+import { setCurrentTenant } from "../slices/globalVariablesSlice";
+import { ITEMS_PER_PAGE } from "../utils/constants";
+import moment from "moment";
+
+const cleanFilter = (filter) => {
+ const cleaned = { ...filter };
+
+ ["industryIds", "references"].forEach((key) => {
+ if (Array.isArray(cleaned[key]) && cleaned[key].length === 0) {
+ delete cleaned[key];
+ }
+ });
+
+
+ return cleaned;
+};
+
+export const useTenants = (pageNumber, filter, searchString = "") => {
+ return useQuery({
+ queryKey: ["Tenants", pageNumber, filter, searchString],
+ queryFn: async () => {
+ const cleanedFilter = cleanFilter(filter);
+ const response = await TenantRepository.getTenantList(
+ ITEMS_PER_PAGE,
+ pageNumber,
+ cleanedFilter,
+ searchString
+ );
+ return response.data;
+ },
+ keepPreviousData: true,
+ });
+};
+
+export const useTenantDetails = (id) => {
+ return useQuery({
+ queryKey: ["Tenant", id],
+ queryFn: async () => {
+ const response = await TenantRepository.getTenantDetails(id);
+ return response.data;
+ },
+ enabled:!!id
+ });
+};
+
+export const useIndustries = () => {
+ return useQuery({
+ queryKey: ["Industries"],
+ queryFn: async () => {
+ const res = await MarketRepository.getIndustries();
+ return res.data;
+ },
+ });
+};
+
+export const useSubscriptionPlan = (freq) => {
+ return useQuery({
+ queryKey: ["SubscriptionPlan", freq],
+ queryFn: async () => {
+ const res = await TenantRepository.getSubscriptionPlan(freq);
+ return res.data;
+ },
+ });
+};
+
+// ------------Mutation---------------------
+
+export const useCreateTenant = (onSuccessCallback) => {
+ const dispatch = useDispatch();
+ return useMutation({
+ mutationFn: async (tenantPayload) => {
+ const res = await TenantRepository.createTenant(tenantPayload);
+ return res.data;
+ },
+ onSuccess: (data, variables) => {
+ showToast("Tenant Created SuccessFully", "success");
+ // dispatch(setCurrentTenant({operationMode:0,data:data}))
+ let operationMode = 0; // default = new tenant, needs subscription
+ if (data?.subscriptionHistery?.length > 0) {
+ operationMode = 1; // tenant already has a subscription
+ } else if (data && !data.subscriptionHistery) {
+ operationMode = 2; // tenant exists but subscription not added yet
+ }
+
+ dispatch(setCurrentTenant({ operationMode, data }));
+
+ if (onSuccessCallback) onSuccessCallback();
+ },
+ onError: (error) => {
+ showToast(
+ error.response.message ||
+ error?.response?.data?.errors ||
+ `Something went wrong`,
+ "error"
+ );
+ },
+ });
+};
+export const useUpdateTenantDetails = (onSuccessCallback) => {
+ const queryClient = useQueryClient();
+
+ return useMutation({
+ mutationFn: async ({ id, tenantPayload }) =>
+ TenantRepository.updateTenantDetails(id, tenantPayload),
+ onSuccess: (_, variables) => {
+ const { id } = variables.tenantPayload;
+ queryClient.invalidateQueries({ queryKey: ["Tenant", id] });
+ queryClient.invalidateQueries({ queryKey: ["Tenants"] });
+ if (onSuccessCallback) onSuccessCallback();
+ },
+ onError: (error) => {
+ showToast(
+ error.response.message || error.message || `Something went wrong`,
+ "error"
+ );
+ },
+ });
+};
+
+export const useAddSubscription = (onSuccessCallback) => {
+ const queryClient = useQueryClient();
+ return useMutation({
+ mutationFn: async (subscriptionPayload) => {
+ const res = await TenantRepository.addSubscription(subscriptionPayload);
+ return res.data;
+ },
+ onSuccess: (data, variables) => {
+ const { tenantId } = variables;
+ showToast("Tenant Plan Added SuccessFully", "success");
+ queryClient.invalidateQueries({ queryKey: ["Tenant", tenantId] });
+ if (onSuccessCallback) onSuccessCallback();
+ },
+ onError: (error) => {
+ showToast(
+ error.response.message || error.message || `Something went wrong`,
+ "error"
+ );
+ },
+ });
+};
+
+export const useUpgradeSubscription = (onSuccessCallback) => {
+ const queryClient = useQueryClient();
+
+ return useMutation({
+ mutationFn: async (subscriptionPayload) => {
+ const res = await TenantRepository.upgradeSubscription(
+ subscriptionPayload
+ );
+ return res.data;
+ },
+ onSuccess: (data, variables) => {
+ const { tenantId } = variables;
+ showToast("Tenant Plan Upgraded Successfully", "success");
+
+ // Refetch tenant details
+ queryClient.invalidateQueries({ queryKey: ["Tenant", tenantId] });
+ queryClient.invalidateQueries({ queryKey: ["Tenants"] });
+
+ if (onSuccessCallback) onSuccessCallback();
+ },
+ onError: (error) => {
+ showToast(
+ error?.response?.message ||
+ error?.response?.data?.errors ||
+ error.message ||
+ "Something went wrong",
+ "error"
+ );
+ },
+ });
+};
diff --git a/src/pages/Activities/DailyTask.jsx b/src/pages/Activities/DailyTask.jsx
index fe34c26a..1837f6fa 100644
--- a/src/pages/Activities/DailyTask.jsx
+++ b/src/pages/Activities/DailyTask.jsx
@@ -1,31 +1,28 @@
-import React, { useEffect, useState, useRef } from "react";
-import { useDispatch, useSelector } from "react-redux";
-import Breadcrumb from "../../components/common/Breadcrumb";
+import React, { useEffect, useMemo, useRef, useState } from "react";
+import { useDispatch } from "react-redux";
import { useTaskList } from "../../hooks/useTasks";
-import { useProjectName, useProjects } from "../../hooks/useProjects";
+import { useProjectName } from "../../hooks/useProjects";
import { setProjectId } from "../../slices/localVariablesSlice";
-import { ReportTask } from "../../components/Activities/ReportTask";
-import ReportTaskComments from "../../components/Activities/ReportTaskComments";
+import Breadcrumb from "../../components/common/Breadcrumb";
import DateRangePicker from "../../components/common/DateRangePicker";
-import { useSearchParams } from "react-router-dom";
-import moment from "moment";
-import FilterIcon from "../../components/common/FilterIcon";
+import FilterIcon from "../../components/common/FilterIcon";
import GlobalModel from "../../components/common/GlobalModel";
-import AssignTask from "../../components/Project/AssignTask";
+import ReportTask from "../../components/Activities/ReportTask";
+import ReportTaskComments from "../../components/Activities/ReportTaskComments";
import SubTask from "../../components/Activities/SubTask";
-import {formatNumber} from "../../utils/dateUtils";
+import { formatNumber, formatUTCToLocalTime } from "../../utils/dateUtils";
import { useHasUserPermission } from "../../hooks/useHasUserPermission";
import { APPROVE_TASK, ASSIGN_REPORT_TASK } from "../../utils/constants";
import { useSelectedproject } from "../../slices/apiDataManager";
+import moment from "moment";
+import Loader from "../../components/common/Loader";
const DailyTask = () => {
- // const selectedProject = useSelector(
- // (store) => store.localVariables.projectId
- // );
+ const dispatch = useDispatch();
const selectedProject = useSelectedproject();
- const dispatch = useDispatch()
- const { projectNames, loading: projectLoading, fetchData } = useProjectName();
-
+ const { projectNames } = useProjectName();
+ const ApprovedTaskRights = useHasUserPermission(APPROVE_TASK);
+ const ReportTaskRights = useHasUserPermission(ASSIGN_REPORT_TASK);
const [filters, setFilters] = useState({
selectedBuilding: "",
@@ -33,427 +30,201 @@ const DailyTask = () => {
selectedActivities: [],
});
-
-
const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" });
- const ApprovedTaskRights = useHasUserPermission(APPROVE_TASK)
- const ReportTaskRights = useHasUserPermission(ASSIGN_REPORT_TASK)
- const {
- TaskList,
- loading: task_loading,
- error: task_error,
- refetch,
- } = useTaskList(
- selectedProject || null,
- dateRange?.startDate || null,
+ const { TaskList, loading: taskLoading } = useTaskList(
+ selectedProject || null,
+ dateRange?.startDate || null,
dateRange?.endDate || null
- );
-
+ );
+
+ // Ensure project is set
useEffect(() => {
- if(selectedProject == null){
- dispatch(setProjectId(projectNames[0]?.id));
- }
- },[])
- const [TaskLists, setTaskLists] = useState([]);
- const [dates, setDates] = useState([]);
- const popoverRefs = useRef([]);
-
- useEffect(() => {
- if (TaskList) {
- let filteredTasks = TaskList;
-
- if (filters.selectedBuilding) {
- filteredTasks = filteredTasks.filter(
- (task) =>
- task?.workItem?.workArea?.floor?.building?.name ===
- filters.selectedBuilding
- );
- }
-
- if (filters.selectedFloors.length > 0) {
- filteredTasks = filteredTasks?.filter((task) =>
- filters.selectedFloors?.includes(
- task?.workItem?.workArea?.floor?.floorName
- )
- );
- }
-
- if (filters.selectedActivities.length > 0) {
- filteredTasks = filteredTasks.filter((task) =>
- filters.selectedActivities.includes(
- task?.workItem?.activityMaster?.activityName
- )
- );
- }
- setTaskLists(filteredTasks);
- } else {
- setTaskLists([]);
+ if (!selectedProject && projectNames.length > 0) {
+ dispatch(setProjectId(projectNames[0].id));
}
- }, [
- TaskList,
- filters?.selectedBuilding,
- filters?.selectedFloors,
- filters?.selectedActivities,
- ]);
+ }, [selectedProject, projectNames, dispatch]);
- useEffect(() => {
- const AssignmentDates = [
- ...new Set(TaskLists.map((task) => task.assignmentDate.split("T")[0])),
- ].sort((a, b) => new Date(b) - new Date(a));
- setDates(AssignmentDates);
- }, [TaskLists]);
+ // Memoized filtering
+ const filteredTasks = useMemo(() => {
+ if (!TaskList) return [];
+ return TaskList.filter((task) => {
+ const { selectedBuilding, selectedFloors, selectedActivities } = filters;
- const [selectedTask, selectTask] = useState(null);
- const [comments, setComment] = useState({ task: null, isActionAllow: false });
+ if (selectedBuilding && task?.workItem?.workArea?.floor?.building?.name !== selectedBuilding) return false;
+ if (selectedFloors.length > 0 && !selectedFloors.includes(task?.workItem?.workArea?.floor?.floorName)) return false;
+ if (selectedActivities.length > 0 && !selectedActivities.includes(task?.workItem?.activityMaster?.activityName)) return false;
- const [isModalOpen, setIsModalOpen] = useState(false);
- const [isModalOpenComment, setIsModalOpenComment] = useState(false);
-
- const openModal = () => setIsModalOpen(true);
- const closeModal = () => setIsModalOpen(false);
-
- const openComment = () => setIsModalOpenComment(true);
- const closeCommentModal = () => setIsModalOpenComment(false);
- const [IsSubTaskNeeded, setIsSubTaskNeeded] = useState(false);
- const [SubTaskData, setSubTaskData] = useState();
- const handletask = (task) => {
- selectTask(task);
- openModal();
- };
-
- useEffect(() => {
- popoverRefs.current.forEach((el) => {
- if (el) {
- new bootstrap.Popover(el, {
- trigger: "focus",
- placement: "left",
- html: true,
- content: el.getAttribute("data-bs-content"),
- });
- }
+ return true;
});
- }, [dates, TaskLists]);
+ }, [TaskList, filters]);
+ // Memoized dates
+ const groupedTasks = useMemo(() => {
+ const groups = {};
+ filteredTasks.forEach((task) => {
+ const date = task.assignmentDate.split("T")[0];
+ if (!groups[date]) groups[date] = [];
+ groups[date].push(task);
+ });
+ return Object.keys(groups)
+ .sort((a, b) => new Date(b) - new Date(a))
+ .map((date) => ({ date, tasks: groups[date] }));
+ }, [filteredTasks]);
- const handlecloseModal = () =>
- {
- setIsModalOpen( false )
- // refetch();
- }
+ // --- Modal State
+ const [modal, setModal] = useState({ type: null, data: null });
- const handleCloseAction = (IsSubTask) => {
- if (IsSubTask) {
- setIsSubTaskNeeded(true);
- setIsModalOpenComment(false);
- } else {
- // refetch();
- setIsModalOpenComment(false);
- }
- };
- const hanleCloseSubTask = () => {
- setIsSubTaskNeeded(false);
- setComment( null );
- // refetch();
- };
+ const openModal = (type, data = null) => setModal({ type, data });
+ const closeModal = () => setModal({ type: null, data: null });
+ // --- Render helpers
+ const renderTeamMembers = (task, refIndex) => (
+
+
+
+
+
+
- {/*
- Loading...
-
-
-
- Loading...
-
-
- Loading...
-
-
- Loading...
-
-
- Loading...
-
-
- Loading...
-
*/}
-
- Loading...
-
- {/*
- Loading...
-
*/}
+ ${task.teamMembers
+ .map(
+ (m) => `
+
+ `}
+ >
+ {task.teamMembers.slice(0, 3).map((m) => (
+
+
`
+ )
+ .join("")}
+
+
+ ${m?.firstName?.charAt(0) || ""}${m?.lastName?.charAt(0) || ""}
+
+
+ ${m.firstName} ${m.lastName}
+
+
+ {m?.firstName.slice(0, 1)}
+
+
+ ))}
+ {task.teamMembers.length > 3 && (
+
+ +{task.teamMembers.length - 3}
+
+ )}
+
-
+
-
-
diff --git a/src/pages/Activities/TaskPlannng.jsx b/src/pages/Activities/TaskPlannng.jsx
index 4ced1b42..ed51490c 100644
--- a/src/pages/Activities/TaskPlannng.jsx
+++ b/src/pages/Activities/TaskPlannng.jsx
@@ -1,4 +1,4 @@
-import React,{useEffect} from "react";
+import React,{useEffect,useRef} from "react";
import Breadcrumb from "../../components/common/Breadcrumb";
import InfraPlanning from "../../components/Activities/InfraPlanning";
import { useProjectName } from "../../hooks/useProjects";
@@ -6,33 +6,34 @@ import { useDispatch, useSelector } from "react-redux";
import { setProjectId } from "../../slices/localVariablesSlice";
import { useSelectedproject } from "../../slices/apiDataManager";
-
const TaskPlannng = () => {
- // const selectedProject = useSelector(
- // (store) => store.localVariables.projectId
- // );
const selectedProject = useSelectedproject();
+ const dispatch = useDispatch();
+ const { projectNames, loading: projectLoading } = useProjectName();
+
+ const initialized = useRef(false);
- const dispatch = useDispatch()
- const { projectNames, loading: projectLoading, fetchData } = useProjectName();
useEffect(() => {
- if(selectedProject == null){
- dispatch(setProjectId(projectNames[0]?.id));
- }
- },[])
+ if (!initialized.current && projectNames.length > 0 && !selectedProject?.id) {
+ dispatch(setProjectId(projectNames[0].id));
+ initialized.current = true;
+ }
+ }, [projectNames, selectedProject, dispatch]);
return (
- <>
-
-
+ {!selectedProject && (Please Select Project
)}
+ {/* --- Filters --- */}
+
+
+
+ {/* --- Table --- */}
| Activity | -Assigned | +Assigned | Completed | Assign On | Team | Actions |
|---|---|---|---|---|---|---|
|
- {" "}
-
-
+
- Loading...
-
- Loading Tasks... - |
||||||
|
-
- {" "}
-
- No Reports Found - |
- ||||||
| - {" "} - - {moment(date).format("DD-MM-YYYY")} - + {!taskLoading && groupedTasks.length === 0 && ( + | ||||||
| No Reports Found | +||||||
| {formatUTCToLocalTime(date)} | +||||||
|
+ {task.workItem.activityMaster?.activityName || "No Activity Name"}
+
+ {task.workItem.workArea?.floor?.building?.name} › {task.workItem.workArea?.floor?.floorName} › {task.workItem.workArea?.areaName}
+
+ |
+ {formatNumber(task.plannedTask)} / {formatNumber(task.workItem.plannedWork - task.workItem.completedWork)} | +{task.completedTask} | +{formatUTCToLocalTime(task.assignmentDate)} | +{renderTeamMembers(task, idx)} | +
+
+ {ReportTaskRights && !task.reportedDate && (
+
+ )}
+ {ApprovedTaskRights && task.reportedDate && !task.approvedBy && (
+
+ )}
+
+
|
|
|
-
- {task.workItem.activityMaster
- .activityName || "No Activity Name"}
-
-
-
-
- |
- - {formatNumber(task.plannedTask)} / {formatNumber(task.workItem.plannedWork - task.workItem.completedWork)} - | -{task.completedTask} | -- {moment(task.assignmentDate).format( - "DD-MM-YYYY" - )} - | -
-
- (popoverRefs.current[refIndex] = el)
- }
- tabIndex="0"
- className="d-flex align-items-center avatar-group justify-content-center"
- data-bs-toggle="popover"
- data-bs-trigger="focus"
- data-bs-placement="left"
- data-bs-html="true"
- data-bs-content={`
-
-
- ${task.teamMembers
- .map(
- (member) => `
-
- `}
- >
- {task.teamMembers
- .slice(0, 3)
- .map((member) => (
-
-
- `
- )
- .join("")}
-
-
- ${
- member?.firstName?.charAt(
- 0
- ) || ""
- }${
- member?.lastName?.charAt(0) || ""
- }
-
-
- ${member.firstName} ${
- member.lastName
- }
-
-
- {member?.firstName.slice(0, 1)}
-
-
- ))}
- {task.teamMembers.length > 3 && (
-
-
- + {task.teamMembers.length - 3}
-
-
- )}
- |
-
-
- { ReportTaskRights &&
-
- }
- {(ApprovedTaskRights && task.reportedDate ) && (
-
- )}
-
-
-
- |
-
-
-
+
+
);
};
diff --git a/src/pages/Expense/ExpensePage.jsx b/src/pages/Expense/ExpensePage.jsx
index a8be4e72..c214a893 100644
--- a/src/pages/Expense/ExpensePage.jsx
+++ b/src/pages/Expense/ExpensePage.jsx
@@ -80,21 +80,23 @@ const ExpensePage = () => {
};
useEffect(() => {
- setShowTrigger(true);
- setOffcanvasContent(
- "Expense Filters",
- Please Select Project
+ )}
+
- setManageExpenseModal({ IsOpen: null, expenseId: null })}
+ closeModal={() =>
+ setManageExpenseModal({ IsOpen: null, expenseId: null })
+ }
>
setManageExpenseModal({ IsOpen: null, expenseId: null })}
+ closeModal={() =>
+ setManageExpenseModal({ IsOpen: null, expenseId: null })
+ }
/>
)}
diff --git a/src/pages/Tenant/CreateTenant.jsx b/src/pages/Tenant/CreateTenant.jsx
new file mode 100644
index 00000000..7e005328
--- /dev/null
+++ b/src/pages/Tenant/CreateTenant.jsx
@@ -0,0 +1,20 @@
+import React from 'react'
+import Breadcrumb from '../../components/common/Breadcrumb'
+import TenantForm from '../../components/Tenant/TenantForm'
+
+const CreateTenant = () => {
+ return (
+
+
+ {showBreadcrumb && (
+
+
+
+ {editTenant && (
+ setEditTenant(false)}
+ >
+ setEditTenant(false)}
+ />
+
+ )}
+
+ );
+};
+
+export default TenantDetails;
diff --git a/src/pages/Tenant/TenantPage.jsx b/src/pages/Tenant/TenantPage.jsx
new file mode 100644
index 00000000..f93163d9
--- /dev/null
+++ b/src/pages/Tenant/TenantPage.jsx
@@ -0,0 +1,189 @@
+import React, {
+ useState,
+ createContext,
+ useEffect,
+ useContext,
+ useCallback,
+ useMemo,
+} from "react";
+import { useForm } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+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 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 -------
+import {
+ defaultFilterValues,
+ filterSchema,
+} from "../../components/Tenant/TenantSchema";
+
+// ------ 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 a TenantContext.Provider"
+ );
+ }
+ return context;
+};
+
+const TenantPage = () => {
+ const dispatch = useDispatch();
+ const navigate = useNavigate();
+ 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();
+
+ 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 handleApplyFilters = useCallback((values) => {
+ setFilters(values);
+ }, []);
+
+ const filterPanelElement = useMemo(
+ () =>
+
+ );
+};
+
+export default TenantPage;
diff --git a/src/pages/master/MasterPage.jsx b/src/pages/master/MasterPage.jsx
index 7904e6af..72710679 100644
--- a/src/pages/master/MasterPage.jsx
+++ b/src/pages/master/MasterPage.jsx
@@ -4,7 +4,7 @@ import MasterModal from "../../components/master/MasterModal";
import { mastersList } from "../../data/masters";
import { useDispatch, useSelector } from "react-redux";
import { changeMaster } from "../../slices/localVariablesSlice";
-import useMaster from "../../hooks/masterHook/useMaster"
+import useMaster, { useMasterMenu } from "../../hooks/masterHook/useMaster"
import MasterTable from "./MasterTable";
import { getCachedData } from "../../slices/apiDataManager";
import { useHasUserPermission } from "../../hooks/useHasUserPermission";
@@ -13,6 +13,7 @@ import { useQueryClient } from "@tanstack/react-query";
const MasterPage = () => {
+ const {data,isLoading,isError,error:menuError} = useMasterMenu()
const [modalConfig, setModalConfig] = useState({ modalType: "", item: null, masterType: null });
const [searchTerm, setSearchTerm] = useState('');
const [filteredResults, setFilteredResults] = useState([]);
@@ -23,7 +24,7 @@ const MasterPage = () => {
const selectedMaster = useSelector((store) => store.localVariables.selectedMaster);
const queryClient = useQueryClient();
- const { data: masterData = [], loading, error, RecallApi } = useMaster();
+ const { data: masterData = [], loading, error, RecallApi,isError:isMasterError } = useMaster();
const openModal = () => setIsCreateModalOpen(true);
@@ -83,7 +84,10 @@ const MasterPage = () => {
};
}, []);
-
+ if(isError || isMasterError) return
);
diff --git a/src/repositories/AuthRepository.jsx b/src/repositories/AuthRepository.jsx
index 4df8c89d..fba24745 100644
--- a/src/repositories/AuthRepository.jsx
+++ b/src/repositories/AuthRepository.jsx
@@ -15,6 +15,8 @@ const AuthRepository = {
logout: (data) => api.post("/api/auth/logout", data),
profile: () => api.get("/api/user/profile"),
changepassword: (data) => api.post("/api/auth/change-password", data),
+ appmenu:()=>api.get('/api/appmenu/get/menu')
+
};
export default AuthRepository;
diff --git a/src/repositories/MastersRepository.jsx b/src/repositories/MastersRepository.jsx
index 6f3fb89b..cfb9a890 100644
--- a/src/repositories/MastersRepository.jsx
+++ b/src/repositories/MastersRepository.jsx
@@ -18,6 +18,8 @@ export const RolesRepository = {
};
export const MasterRespository = {
+ getMasterMenus:()=>api.get("/api/AppMenu/get/master-list"),
+
getRoles: () => api.get("/api/roles"),
createRole: (data) => api.post("/api/roles", data),
updateRoles: (id, data) => api.put(`/api/roles/${id}`, data),
diff --git a/src/repositories/TenantRepository.jsx b/src/repositories/TenantRepository.jsx
new file mode 100644
index 00000000..59995cca
--- /dev/null
+++ b/src/repositories/TenantRepository.jsx
@@ -0,0 +1,20 @@
+import { api } from "../utils/axiosClient";
+
+export const TenantRepository = {
+ getTenantList: ( pageSize, pageNumber, filter,searchString) => {
+ const payloadJsonString = JSON.stringify(filter);
+
+ return api.get(`/api/Tenant/list?pageSize=${pageSize}&pageNumber=${pageNumber}&filter=${payloadJsonString}&searchString=${searchString}`);
+},
+
+ getTenantDetails:(id)=>api.get(`/api/Tenant/details/${id}`),
+
+ getSubscriptionPlan: (freq) =>
+ api.get(`/api/Tenant/list/subscription-plan?frequency=${freq}`),
+
+ createTenant: (data) => api.post("/api/Tenant/create", data),
+ updateTenantDetails :(id,data)=> api.put(`/api/Tenant/edit/${id}`,data),
+
+ addSubscription: (data) => api.post("/api/Tenant/add-subscription", data),
+ upgradeSubscription :(data)=> api.put("/api/Tenant/update-subscription",data)
+};
diff --git a/src/router/AppRoutes.jsx b/src/router/AppRoutes.jsx
index d89191d8..0e269a6f 100644
--- a/src/router/AppRoutes.jsx
+++ b/src/router/AppRoutes.jsx
@@ -38,19 +38,24 @@ import LegalInfoCard from "../pages/TermsAndConditions/LegalInfoCard";
import ProtectedRoute from "./ProtectedRoute";
import Directory from "../pages/Directory/Directory";
import LoginWithOtp from "../pages/authentication/LoginWithOtp";
+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:
-
{
type="button"
className="p-1 me-1 m-sm-0 bg-primary rounded-circle"
title="Add New Expense"
- onClick={() => setManageExpenseModal({ IsOpen: true, expenseId: null })}
+ onClick={() =>
+ setManageExpenseModal({
+ IsOpen: true,
+ expenseId: null,
+ })
+ }
>
@@ -142,12 +150,18 @@ const ExpensePage = () => {
-
)}
@@ -156,12 +170,16 @@ const ExpensePage = () => {
Access Denied: You don't have permission to perform this action!
++ Access Denied: You don't have permission to perform this action ! +
+
+ )
+}
+
+export default CreateTenant
\ No newline at end of file
diff --git a/src/pages/Tenant/SelfTenantDetails.jsx b/src/pages/Tenant/SelfTenantDetails.jsx
new file mode 100644
index 00000000..5375bcc3
--- /dev/null
+++ b/src/pages/Tenant/SelfTenantDetails.jsx
@@ -0,0 +1,36 @@
+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";
+import Loader from "../../components/common/Loader";
+
+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
+
+ ),
+ },
+ {
+ id: "navs-left-messages",
+ label: "Messages",
+ icon: "bx bx-message-rounded",
+ iconSize: "bx-sm",
+ content: (
+
+
+ ),
+ },
+ ];
+
+ return ManageTenant
+ ? allTabs
+ : [allTabs[0], allTabs[allTabs.length - 1]];
+ }, [data, activeTenantId, ManageTenant, ModifyTenant]);
+ if (!activeTenantId) return No tenant selected.
;
+ if (isLoading)
+ return (
+
+
+ );
+ if (isError)
+ return (
+
+ {error.status === 403 ? (
+
+ );
+
+ const Shell = ({ children }) =>
+ wrapInContainer ? (
+
+
+
+ ) : (
+ + Access Denied: You don't have permission to perform this action! +
+
+
+
+ )}
+ {error.message}
+{children}
+ ) : (
+ <>{children}
+ );
+
+ return (
+ <>
+
+
+ -
+ {tabs.map((tab, index) => (
+
- + + + ))} +
+ {tabs.map((tab, index) => (
+
+
+ {tab.content}
+
+ ))}
+
+
+
+
+ )}
+
+ {/* Tenant List or Access Denied */}
+ {isSuperTenant ? (
+
+ {/* Search */}
+
+
+ setSearchText(e.target.value)}
+ className="form-control form-control-sm"
+ placeholder="Search Tenant"
+ />
+
+
+ {/* Actions */}
+
+ refetchFn && refetchFn()}
+ >
+ Refresh{" "}
+
+
+
+
+
+
+
+
+ ) : null}
+ + Access Denied: You don't have permission to perform this action! +
+
+
return (
<>
{isCreateModalOpen && (
@@ -121,8 +125,8 @@ const MasterPage = () => {
className="form-select form-select-sm"
value={selectedMaster}
>
-
- {mastersList.map((item) => (
+ {isLoading && ()}
+ {(!isLoading && data) && data?.map((item) => (
))}
@@ -154,7 +158,6 @@ const MasterPage = () => {
Oops, an error occurred
+{error?.message || menuError?.message}
+