Merge branch 'dev-rohit' of http://git.wdipl.com/Siddhesh.More/SSA-Admin-Panel into testing

src/Contexts/GlobalStateContext.tsx

@@ -7,6 +7,8 @@ export interface GlobalStateContextType {
   setIsAuthenticate: Dispatch<SetStateAction<boolean>>;
   isBarLoading: boolean;
   setIsBarLoading: Dispatch<SetStateAction<boolean>>;
+  userAccess: string[];
+  setUserAccess: Dispatch<SetStateAction<string[]>>;
 }
 // Create the context with a default value of `undefined`
 const GlobalStateContext = createContext<GlobalStateContextType | undefined>(undefined);

src/Contexts/GlobalStateProvider.tsx

@@ -6,6 +6,10 @@ import GlobalStateContext from "./GlobalStateContext";
 const GlobalStateProvider = ({ children }: { children: ReactNode }) => {
   const [isAuthenticate, setIsAuthenticate] = useState<boolean>(true);
   const [isBarLoading, setIsBarLoading] = useState<boolean>(false); // ✅ Fixed typo
+  const [userAccess, setUserAccess] = useState<string[]>(() => {
+    const stored = sessionStorage.getItem('userAccess');
+    return stored ? JSON.parse(stored) : [];
+  });
 
  
 
@@ -15,6 +19,8 @@ const GlobalStateProvider = ({ children }: { children: ReactNode }) => {
       setIsAuthenticate,
       isBarLoading,
       setIsBarLoading, // ✅ Fixed typo
+      userAccess,
+      setUserAccess
     }}>
       {children}
     </GlobalStateContext.Provider>

src/Layouts/DefaultLayout.tsx

@@ -25,9 +25,13 @@ const DefaultLayout: FC<{ children: React.ReactNode }> = ({ children }) => {
   if (!context) {
     throw new Error('App must be used within a GlobalStateProvider');
   }
-  const { setIsAuthenticate, isBarLoading } = context;
+  const { setIsAuthenticate, isBarLoading, userAccess } = context;
   const [logOutAdmin] = useLogOutMutation()
 
+  const filteredNav = nav.filter(item =>
+    userAccess.includes('*') || !item.resourceTitle || userAccess.includes(item.resourceTitle)
+  );
+
 
   // Logout function
   const handleLogout = async () => {
@@ -57,7 +61,7 @@ const DefaultLayout: FC<{ children: React.ReactNode }> = ({ children }) => {
             <Image w={55} src={logo} />
           </HStack>
           <VStack w={'100%'} p={2} pt={0}>
-            {nav?.map(({ title, path, Icon, type, children, initPath }, index) => type === 'single' ?
+            {filteredNav?.map(({ title, path, Icon, type, children, initPath }, index) => type === 'single' ?
               <NavLink className="link" key={index} to={path || ''} style={{ cursor: 'pointer', borderRadius: '8px', padding: '6px', width: '100%', display: 'flex', alignItems: 'center', gap: 6, border: '1px solid #ffffff', backgroundColor: '#fff', color: '#000', boxShadow: 'rgba(99, 99, 99, 0.2) 0px 2px 8px 0px' }} ><Icon style={{ fontSize: '20px' }} /> <Text fontSize={'xs'} w={'100%'}>{title}</Text></NavLink> :
               <AccordionRoot border={location?.pathname.startsWith(initPath ?? path) ? "1px solid #02A0A0" : '1px'} key={index} bg={'#fff'} rounded={'lg'} collapsible>
                 <AccordionItem rounded={'lg'} bg={'#fff'} boxShadow={'rgba(99, 99, 99, 0.2) 0px 2px 8px 0px'} borderBottom={'none'} p={0} key={index} value={title}>

src/Pages/Login.tsx

@@ -34,7 +34,7 @@ const Login = () => {
   if (!context) {
     throw new Error("App must be used within a GlobalStateProvider");
   }
-  const { setIsAuthenticate } = context;
+  const { setIsAuthenticate, setUserAccess } = context;
   const {
     register,
     handleSubmit,
@@ -43,10 +43,10 @@ const Login = () => {
 
   const onSubmit = handleSubmit(async (data) => {
     setIsLoading(true);
-    // Encode Basic Auth Credentials
+
-    const username = import.meta.env.VITE_USER_NAME || ""; // Replace with actual username
+    const username = import.meta.env.VITE_USER_NAME || "";
-    const password = import.meta.env.VITE_PASSWORD || ""; // Replace with actual password
+    const password = import.meta.env.VITE_PASSWORD || "";
-    const basicAuth = `${username}:${password}`; // Encode to Base64
+    const basicAuth = `${username}:${password}`;
 
     try {
       const res = await axios.post(
@@ -62,35 +62,36 @@ const Login = () => {
           },
         }
       );
-      console.log("============", res);
 
+      const loginData = res.data?.data;
+      const { principal_type_xid, role_permission } = loginData;
+
+      const isAdmin = principal_type_xid === 1;
+
+      const allowedTitles = isAdmin
+        ? ['*']
+        : role_permission?.get_resource_action_link
+          ?.filter((link: unknown) => (link as any).is_active)
+          .map((link: unknown) => (link as any).app_resource.app_resource_title) ?? [];
+
+      setIsAuthenticate(true);
+      setUserAccess(allowedTitles);
+      dispatch(setToken(String(loginData["access-token"])));
+      sessionStorage.setItem('userAccess', JSON.stringify(allowedTitles));
+      navigate("/dashboard");
+      setIsLoading(false);
 
-      if (res.data) {
-        setIsAuthenticate(true);
-        console.log("====================================");
-        console.log(res.data?.data);
-        console.log("====================================");
-        navigate("/dashboard");
-        dispatch(setToken(String(res.data?.data["access-token"])));
-      } else {
-        console.log("====================================");
-        console.log(res);
-        console.log("====================================");
-      }
     } catch (error: any) {
-      console.log('error', error.response.data.message);
+      console.log('error', error?.response?.data?.message);
-
+      toaster.create({
-      if (error) {
+        title: "Error",
-        toaster.create({
+        description: error?.response?.data?.message || "Login failed",
-          title: error?.response?.data?.message,
+        type: "error",
-          // title: "Something Went Wrong",
+      });
-          type: "info",
+      setIsLoading(false);
-        })
-        // console.log("Login failed", error?.response?.data?.message);
-        setIsLoading(false);
-      }
     }
   });
+  // console.log("User Access in Context:", userAccess);
 
   return (
 

src/Pages/ManageCMS/FAQ/FAQ.tsx

@@ -85,9 +85,21 @@ const FAQ = () => {
 
     try {
       await faqToggle({ id: agencyId, is_active: newStatus }).unwrap();
-      refetch()
+      toaster.create({
+        title: "Success",
+        description: "Status updated successfully",
+        type: "success",
+      });
+      setTimeout(() => {
+        refetch();
+      }, 500);
     } catch (error) {
       console.error("Error updating privacy policy:", error);
+      toaster.create({
+        title: "Error",
+        description: "Someting went wrong.",
+        type: "error",
+      });
       setLocalData((prevData) =>
         prevData.map((agency) =>
           agency.id === agencyId ? { ...agency, is_active: currentStatus } : agency
@@ -160,7 +172,7 @@ const FAQ = () => {
                 handleDeleteFaq(selectedFaqId);
               }
             }}
-          /> 
+          />
           <Box>
             <Switch
               colorPalette={'teal'}

src/Pages/ManagePost/ManagePost.tsx

@@ -175,10 +175,9 @@ const ManagePost = () => {
     ),
     Description: (
       <Text>
-        {`${translation?.content}`.slice(
+        {translation?.content?.length > 30
-          0,
+          ? `${translation.content.slice(0, 30)}...`
-          30
+          : translation?.content}
-        ) + "..."}
       </Text>
     ),
     "Publish Data": formatAPIDate(agency.created_at),

src/Pages/ManageUsers/RegisterUsers/RegisterUsers.tsx

@@ -18,11 +18,13 @@ import SearchComponent from "../../../components/SearchComponent";
 import AlertDailog from "../../../components/AlertDailog";
 import { toaster } from "../../../components/ui/toaster";
 import Delete from "../../../components/ActionIcons/Delete";
+import { delay } from "../../../components/Utils";
 // import Delete from "../../../components/ActionIcons/Delete";
 
 const tableHeadRow = [
   "Sr. No",
   "First Name",
+  "Last Name",
   "Mobile Number",
   "Gender",
   "DOB",
@@ -105,9 +107,20 @@ const RegisterUsers = () => {
 
     try {
       await userToggle({ id: agencyId, is_active: newStatus }).unwrap();
+      toaster.create({
+        title: "Success",
+        description: "Status updated successfully",
+        type: "success",
+      });
+      await delay(500);
       refetch()
     } catch (error) {
       console.error("Error updating privacy policy:", error);
+      toaster.create({
+        title: "Error",
+        description: "Someting went wrong.",
+        type: "error",
+      });
       setLocalData((prevData) =>
         prevData.map((agency) =>
           agency.id === agencyId ? { ...agency, is_active: currentStatus } : agency
@@ -142,6 +155,7 @@ const RegisterUsers = () => {
   const managepost = filteredData?.flatMap((agency: UserData, index: number) => ({
     "Sr. No": (currentPage - 1) * (data?.data.per_page ?? 0) + index + 1,
     "First Name": agency.first_name,
+    "Last Name": agency.last_name,
     "Mobile Number": agency.phone_number,
     "Gender": agency.gender,
     "DOB": agency.date_of_birth ? new Date(agency.date_of_birth).toLocaleDateString('en-GB').replace(/\//g, '-') : 'N/A',

src/Pages/MasterModule/AgencyMaster/AgencyMaster.tsx

@@ -9,6 +9,8 @@ import { useAgencyMasterToggleMutation, useGetAgencyMasterQuery } from "../../..
 import { useEffect, useState } from "react";
 import SearchComponent from "../../../components/SearchComponent";
 import { useDebounce } from "../../../components/Hooks/useDebounce";
+import { toaster, Toaster } from "../../../components/ui/toaster";
+import { delay } from "../../../components/Utils";
 
 // table data
 
@@ -65,6 +67,12 @@ const AgencyMaster = () => {
     );
     try {
       await agencyMasterToggle({ id: agencyId, is_active: newStatus }).unwrap();
+      toaster.create({
+        title: "Success",
+        description: "Status updated successfully",
+        type: "success",
+      });
+      await delay(500);
       refetch()
     } catch (error) {
       console.error("Error updating privacy policy:", error);
@@ -73,6 +81,11 @@ const AgencyMaster = () => {
           agency.id === agencyId ? { ...agency, is_active: currentStatus } : agency
         )
       );
+      toaster.create({
+        title: "Error",
+        description: "Please try again later",
+        type: "error",
+      });
     }
   };
 
@@ -120,7 +133,7 @@ const AgencyMaster = () => {
               size={"xs"}
               onChange={() => handleToggle(agency.id.toString(), Number(agency.is_active))}
               checked={Boolean(Number(agency.is_active))}
-              // disabled={isOnlyActive}
+            // disabled={isOnlyActive}
             />
           </Box>
         </HStack>
@@ -199,6 +212,7 @@ const AgencyMaster = () => {
           isError={isError}
         />
       </Box>
+      <Toaster />
     </MainFrame>
   )
 }

src/Pages/MasterModule/Country/Country.tsx

@@ -8,6 +8,8 @@ import { CountryData, useCountryToggleMutation, useGetCountryMasterQuery } from
 import { useEffect, useState } from "react";
 import SearchComponent from "../../../components/SearchComponent";
 import { useDebounce } from "../../../components/Hooks/useDebounce";
+import { toaster, Toaster } from "../../../components/ui/toaster";
+import { delay } from "../../../components/Utils";
 
 
 
@@ -79,9 +81,20 @@ const Country = () => {
 
     try {
       await countryToggle({ id: agencyId, is_active: newStatus }).unwrap();
+      toaster.create({
+        title: "Success",
+        description: "Status updated successfully",
+        type: "success",
+      });
+      await delay(500);
       refetch()
     } catch (error) {
       console.error("Error updating privacy policy:", error);
+      toaster.create({
+        title: "Error",
+        description: "Please try again later.",
+        type: "error",
+      });
       setLocalData((prevData) =>
         prevData.map((agency) =>
           agency.id === agencyId ? { ...agency, is_active: currentStatus } : agency
@@ -107,7 +120,7 @@ const Country = () => {
       </HStack>
     ),
   }))
-  
+
 
   return (
 
@@ -173,6 +186,7 @@ const Country = () => {
           isError={isError}
         />
       </Box>
+      <Toaster />
     </MainFrame>
   )
 }

src/Pages/MasterModule/DepartmentMaster/DepartmentMasterList.tsx

@@ -10,6 +10,8 @@ import { useDepartmentToggleMutation, useGetDepartmentMasterQuery } from "../../
 import AddDepartmentMaster from "./AddDepartmentMaster";
 import EditDepartmentMaster from "./EditDepartmentMaster";
 import { useDebounce } from "../../../components/Hooks/useDebounce";
+import { Toaster, toaster } from "../../../components/ui/toaster";
+import { delay } from "../../../components/Utils";
 
 
 // table data
@@ -58,9 +60,20 @@ const DepartmentMasterList = () => {
         );
         try {
             await departmentToggle({ id: agencyId, is_active: newStatus }).unwrap();
+            toaster.create({
+                title: "Success",
+                description: "Status updated successfully",
+                type: "success",
+            });
+            await delay(500);
             refetch()
         } catch (error) {
             console.error("Error updating privacy policy:", error);
+            toaster.create({
+                title: "Error",
+                description: "Someting went wrong.",
+                type: "error",
+            });
             setLocalData((prevData) =>
                 prevData.map((agency) =>
                     agency.id === agencyId ? { ...agency, is_active: currentStatus } : agency
@@ -142,6 +155,7 @@ const DepartmentMasterList = () => {
                     isError={isError}
                 />
             </Box>
+            <Toaster />
         </MainFrame>
     )
 }

src/Pages/MasterModule/IndustryMaster/IndustryMasterList.tsx

@@ -10,6 +10,8 @@ import EditIndustryMaster from "./EditIndustryMaster";
 import AddIndustryMaster from "./AddIndustryMaster";
 import SearchComponent from "../../../components/SearchComponent";
 import { useDebounce } from "../../../components/Hooks/useDebounce";
+import { Toaster, toaster } from "../../../components/ui/toaster";
+import { delay } from "../../../components/Utils";
 
 
 // table data
@@ -61,7 +63,7 @@ const IndustryMasterList = () => {
     const handleSearchChange = (value: string) => {
         setSearchTerm(value);
         setCurrentPage(1);
-      };
+    };
 
     const handlePageChange = (page: number) => {
         setCurrentPage(page);
@@ -76,9 +78,20 @@ const IndustryMasterList = () => {
         );
         try {
             await industryMasterToggle({ id: agencyId, is_active: newStatus }).unwrap();
+            toaster.create({
+                title: "Success",
+                description: "Status updated successfully",
+                type: "success",
+            });
+            await delay(500);
             refetch()
         } catch (error) {
             console.error("Error updating privacy policy:", error);
+            toaster.create({
+                    title: "Error",
+                    description: "Someting went wrong.",
+                    type: "error",
+                  });
             setLocalData((prevData) =>
                 prevData.map((agency) =>
                     agency.id === agencyId ? { ...agency, is_active: currentStatus } : agency
@@ -160,6 +173,7 @@ const IndustryMasterList = () => {
                     isError={isError}
                 />
             </Box>
+            <Toaster />
         </MainFrame>
     )
 }

src/Pages/MasterModule/JobStatus/JobStatus.tsx

@@ -7,8 +7,9 @@ import EditJobStatusModel from "./EditJobStatusModel";
 import { useGetJobStatusQuery, useJobStatusToggleMutation } from "../../../Redux/Service/job.status";
 import { useEffect, useState } from "react";
 import SearchComponent from "../../../components/SearchComponent";
-import { toaster } from "../../../components/ui/toaster";
+import { toaster, Toaster } from "../../../components/ui/toaster";
 import { useDebounce } from "../../../components/Hooks/useDebounce";
+import { delay } from "../../../components/Utils";
 
 
 
@@ -70,6 +71,12 @@ const JobStatus = () => {
     );
     try {
       await jobStatusToggle({ id: agencyId, is_active: newStatus }).unwrap();
+      toaster.create({
+        title: "Success",
+        description: "Status updated successfully",
+        type: "success",
+      });
+      await delay(500);
       refetch()
     } catch (error) {
       console.error("Error updating:", error);
@@ -154,6 +161,7 @@ const JobStatus = () => {
           isError={isError}
         />
       </Box>
+      <Toaster />
     </MainFrame>
   )
 }

src/Pages/MasterModule/JobType/JobType.tsx

@@ -9,6 +9,8 @@ import EditJobeModel from "./EditJobModel";
 import { JobTypeData, useGetJobTypeQuery, useJobTypeToggleMutation } from "../../../Redux/Service/job.type.service";
 import { useEffect, useState } from "react";
 import SearchComponent from "../../../components/SearchComponent";
+import { toaster, Toaster } from "../../../components/ui/toaster";
+import { delay } from "../../../components/Utils";
 
 
 
@@ -70,6 +72,12 @@ const JobType = () => {
     );
     try {
       await jobTypeToggle({ id: agencyId, is_active: newStatus }).unwrap();
+      toaster.create({
+        title: "Success",
+        description: "Status updated successfully",
+        type: "success",
+      });
+      await delay(500);
       refetch()
     } catch (error) {
       console.error("Error updating privacy policy:", error);
@@ -78,6 +86,11 @@ const JobType = () => {
           agency.id === agencyId ? { ...agency, is_active: currentStatus } : agency
         )
       );
+      toaster.create({
+        title: "Error",
+        description: "Please try again later",
+        type: "error",
+      });
     }
   };
 
@@ -144,6 +157,7 @@ const JobType = () => {
           onPageChange={handlePageChange}
         />
       </Box>
+      <Toaster />
     </MainFrame>
   )
 }

src/Pages/MasterModule/TemplateMaster/TemplateMaster.tsx

@@ -9,6 +9,8 @@ import EditTemplateModel from "./EditTemplateModel";
 import { Template, useGetTemplateMasterQuery, useTemplateMasterToggleMutation } from "../../../Redux/Service/template.master.service";
 import { useEffect, useState } from "react";
 import SearchComponent from "../../../components/SearchComponent";
+import { toaster, Toaster } from "../../../components/ui/toaster";
+import { delay } from "../../../components/Utils";
 
 const APIURL = import.meta.env.VITE_IMG_TEMPLATES
 
@@ -72,6 +74,12 @@ const TemplateMaster = () => {
     );
     try {
       await templateMasterToggle({ id: agencyId, is_active: newStatus }).unwrap();
+      toaster.create({
+        title: "Success",
+        description: "Status updated successfully",
+        type: "success",
+      });
+      await delay(500);
       refetch()
     } catch (error) {
       console.error("Error updating privacy policy:", error);
@@ -80,6 +88,11 @@ const TemplateMaster = () => {
           agency.id === agencyId ? { ...agency, is_active: currentStatus } : agency
         )
       );
+      toaster.create({
+        title: "Error",
+        description: "Please try again later",
+        type: "error",
+      });
     }
   };
 
@@ -124,7 +137,8 @@ const TemplateMaster = () => {
           </Box>
         </HStack>
       )
-  }});
+    }
+  });
 
   return (
 
@@ -182,6 +196,7 @@ const TemplateMaster = () => {
           onPageChange={handlePageChange}
         />
       </Box>
+      <Toaster />
     </MainFrame>
   )
 }

src/Pages/MasterModule/WorkspaceMode/WorkspaceMode.tsx

@@ -63,12 +63,17 @@ const WorkspaceMode = () => {
     );
     try {
       await workspaceToggle({ id: agencyId, is_active: newStatus }).unwrap();
+      toaster.create({
+        title: "Success",
+        description: "Status updated successfully",
+        type: "success",
+      });
       refetch()
     } catch (error) {
       console.error("Error updating privacy policy:", error);
       toaster.create({
         title: "Error",
-        description: "Someting went wrong.",
+        description: "Please try again later.",
         type: "error",
       });
       setLocalData((prevData) =>
@@ -133,7 +138,7 @@ const WorkspaceMode = () => {
               }}
             />
             {/* <Button bgColor={'#EEEEEE'} pl={3} pr={3}><IoMdAdd /> <Text>Add</Text></Button> */}
-            <WorkAddModel refetch={refetch}/>
+            <WorkAddModel refetch={refetch} />
           </HStack>
         </HStack>
         <DataTable

src/Pages/SetNewPassword.tsx

@@ -123,7 +123,7 @@ const SetNewPassword = () => {
                     height={"fit-content"}
                     mr={2}
                   >
-                    {showOldPassword ? <LuEye /> : <LuEyeOff />}
+                    {showOldPassword ? <LuEyeOff /> : <LuEye />}
                   </IconButton>
                 }
               >
@@ -158,7 +158,7 @@ const SetNewPassword = () => {
                     color={"#000"}
                     mr={2}
                   >
-                    {showNewPassword ? <LuEye /> : <LuEyeOff />}
+                    {showNewPassword ? <LuEyeOff /> : <LuEye />}
                   </IconButton>
                 }
               >

src/Routes/Nav.ts

@@ -1,5 +1,5 @@
-import { LuBriefcaseBusiness} from "react-icons/lu";
+import { LuBriefcaseBusiness } from "react-icons/lu";
-import { MdHeadsetMic, MdOutlineDashboard} from "react-icons/md";
+import { MdHeadsetMic, MdOutlineDashboard } from "react-icons/md";
 import { GoDotFill } from "react-icons/go";
 import { HiOutlinePencilSquare } from "react-icons/hi2";
 import { BiUser, BiUserPin } from "react-icons/bi";
@@ -8,146 +8,156 @@ import { BsBoxes, BsPersonBadge } from "react-icons/bs";
 import { AiOutlineFileText } from "react-icons/ai";
 
 export const nav = [
-    
+
-        {
+  {
-          title: "Dashboard",
+    title: "Dashboard",
-          path: "/",
+    path: "/",
-          Icon: MdOutlineDashboard,
+    Icon: MdOutlineDashboard,
-          type:'single'
+    type: 'single',
-        },
+    resourceTitle: 'Dashboard'
-        {
+  },
-          title: "Manage Users",
+  {
-          initPath: "/manage-users",
+    title: "Manage Users",
-          Icon: BiUserPin,
+    initPath: "/manage-users",
-          type:'multiple',
+    Icon: BiUserPin,
-          children: [
+    type: 'multiple',
-            {
+    resourceTitle: 'Manage Users',
-              title: "Register Users",
+    children: [
-              path: "/manage-users/register-users",
+      {
-              Icon: GoDotFill,
+        title: "Register Users",
-            },
+        path: "/manage-users/register-users",
-            {
+        Icon: GoDotFill,
-              title: "Deactivated Accounts",
+      },
-              path: "/manage-users/deactivated-accounts",
+      {
-              Icon: GoDotFill,
+        title: "Deactivated Accounts",
-            },
+        path: "/manage-users/deactivated-accounts",
-          ],
+        Icon: GoDotFill,
-        },
+      },
-        {
+    ],
-          title: "Manage Post",
+  },
-          path: "/manage-post",
+  {
-          Icon: HiOutlinePencilSquare,
+    title: "Manage Post",
-          type:'single'
+    path: "/manage-post",
-        },
+    Icon: HiOutlinePencilSquare,
-        {
+    type: 'single',
-          title: "Manage Sub-Admin",
+    resourceTitle: 'Manage Post'
-          path: "/sub-admin",
+  },
-          Icon: BiUser,
+  {
-          type:'single'
+    title: "Manage Sub-Admin",
-        },
+    path: "/sub-admin",
-        {
+    Icon: BiUser,
-          title: "Manage Jobs",
+    type: 'single',
-          path: "/manage-jobs",
+    resourceTitle: 'Manage Subadmin'
-          Icon: LuBriefcaseBusiness,
+  },
-          type:'single'
+  {
-        },
+    title: "Manage Jobs",
-        {
+    path: "/manage-jobs",
-          title: "Manage Groups",
+    Icon: LuBriefcaseBusiness,
-          path: "/manage-groups",
+    type: 'single',
-          Icon: PiUsersThree,
+    resourceTitle: 'Manage Jobs'
-          type:'single'
+  },
-        },
+  {
-        {
+    title: "Manage Groups",
-          title: "Manage Contact Us",
+    path: "/manage-groups",
-          path: "/manage-contact",
+    Icon: PiUsersThree,
-          Icon: MdHeadsetMic  ,
+    type: 'single',
-          type:'single'
+    resourceTitle: 'Manage Groups'
-        },
+  },
-        {
+  {
-          title: "Manage CMS",
+    title: "Manage Contact Us",
-          initPath: "/manage-cms",
+    path: "/manage-contact",
-          Icon: AiOutlineFileText,
+    Icon: MdHeadsetMic,
-          type:'multiple',
+    type: 'single',
-          children: [
+    resourceTitle: 'Manage Contact Us'
-            {
+  },
-              title: "FAQs",
+  {
-              path: "/manage-cms/faq",
+    title: "Manage CMS",
-              Icon: GoDotFill,
+    initPath: "/manage-cms",
-            },
+    Icon: AiOutlineFileText,
-            {
+    type: 'multiple',
-              title: "About Us",
+    resourceTitle: 'Manage CMS',
-              path: "/manage-cms/about-us",
+    children: [
-              Icon: GoDotFill,
+      {
-            },
+        title: "FAQs",
-            {
+        path: "/manage-cms/faq",
-              title: "Privacy Policy",
+        Icon: GoDotFill,
-              path: "/manage-cms/privacy-policy",
+      },
-              Icon: GoDotFill,
+      {
-            },
+        title: "About Us",
-            {
+        path: "/manage-cms/about-us",
-              title: "Terms And Conditions",
+        Icon: GoDotFill,
-              path: "/manage-cms/terms-conditions",
+      },
-              Icon: GoDotFill,
+      {
-            },
+        title: "Privacy Policy",
-            // {
+        path: "/manage-cms/privacy-policy",
-            //   title: "Privacy",
+        Icon: GoDotFill,
-            //   path: "/manage-cms/privacy",
+      },
-            //   Icon: GoDotFill,
+      {
-            // },
+        title: "Terms And Conditions",
-          ],
+        path: "/manage-cms/terms-conditions",
-        },
+        Icon: GoDotFill,
-        {
+      },
-          title: "My Profile",
+      // {
-          path: "/profile",
+      //   title: "Privacy",
-          Icon: BsPersonBadge,
+      //   path: "/manage-cms/privacy",
-          type:'single'
+      //   Icon: GoDotFill,
-        },
+      // },
-        {
+    ],
-          title: "Master Module",
+  },
-          initPath: "/master-module",
+  {
-          Icon: BsBoxes,
+    title: "My Profile",
-          type:'multiple',
+    path: "/profile",
-          children: [
+    Icon: BsPersonBadge,
-            {
+    type: 'single',
-              title: "Agency Master",
+    resourceTitle: 'My Profile'
-              path: "/master-module/agency-master",
+  },
-              Icon: GoDotFill,
+  {
-            },
+    title: "Master Module",
-            {
+    initPath: "/master-module",
-              title: "Template Master",
+    Icon: BsBoxes,
-              path: "/master-module/template-master",
+    type: 'multiple',
-              Icon: GoDotFill,
+    resourceTitle: 'Master Module',
-            },
+    children: [
-            {
+      {
-              title: "Job Type",
+        title: "Agency Master",
-              path: "/master-module/job-type",
+        path: "/master-module/agency-master",
-              Icon: GoDotFill,
+        Icon: GoDotFill,
-            },
+      },
-            {
+      {
-              title: "Workspace Mode",
+        title: "Template Master",
-              path: "/master-module/workspace-mode",
+        path: "/master-module/template-master",
-              Icon: GoDotFill,
+        Icon: GoDotFill,
-            },
+      },
-            {
+      {
-              title: "Country",
+        title: "Job Type",
-              path: "/master-module/country",
+        path: "/master-module/job-type",
-              Icon: GoDotFill,
+        Icon: GoDotFill,
-            },
+      },
-            {
+      {
-              title: "Job Status",
+        title: "Workspace Mode",
-              path: "/master-module/job-status",
+        path: "/master-module/workspace-mode",
-              Icon: GoDotFill,
+        Icon: GoDotFill,
-            },
+      },
-            {
+      {
-              title: "Industry Master",
+        title: "Country",
-              path: "/master-module/industry-master",
+        path: "/master-module/country",
-              Icon: GoDotFill,
+        Icon: GoDotFill,
-            },
+      },
-            {
+      {
-              title: "Department Master",
+        title: "Job Status",
-              path: "/master-module/department-master",
+        path: "/master-module/job-status",
-              Icon: GoDotFill,
+        Icon: GoDotFill,
-            },
+      },
-          ],
+      {
-        },
+        title: "Industry Master",
-  ];
+        path: "/master-module/industry-master",
+        Icon: GoDotFill,
+      },
+      {
+        title: "Department Master",
+        path: "/master-module/department-master",
+        Icon: GoDotFill,
+      },
+    ],
+  },
+];

src/components/DataTable.tsx

@@ -135,23 +135,29 @@ const DataTable: React.FC<TableProps> = ({
                   key={index}
                   bg={index % 2 === 0 ? "#fff" : "#007F3310"}
                 >
-                  {tableHeadRow.map((heading, colIndex) => (
+                  {tableHeadRow.map((heading, colIndex) => {
-                    <Table.Cell
+                    const cellContent = item[heading];
-                      px={4}
+                    const words = typeof cellContent === 'string'
-                      p={2}
+                      ? cellContent.split(" ")
-                      key={`${index}-${colIndex}`}
+                      : cellContent?.toString().split(" ") || [];
-                      fontSize={"xs"}
+
-                      fontWeight={500}
+                    const truncated = words.length > 15
-                      border={"none"}
+                      ? `${words.slice(0, 15).join(" ")}...`
-                    >
+                      : cellContent;
-                      {(() => {
+
-                        const words = item[heading]?.toString().split(" ") || [];
+                    return (
-                        return words.length > 5
+                      <Table.Cell
-                          ? `${words.slice(0, 5).join(" ")}...`
+                        px={4}
-                          : item[heading];
+                        p={2}
-                      })()}
+                        key={`${index}-${colIndex}`}
-                    </Table.Cell>
+                        fontSize="xs"
-                  ))}
+                        fontWeight={500}
+                        border="none"
+                      >
+                        {truncated}
+                      </Table.Cell>
+                    );
+                  })}
                 </Table.Row>
               ))}
             </Table.Body>

src/components/Utils.ts

@@ -0,0 +1,3 @@
+
+
+export const delay = (ms: number) => new Promise(res => setTimeout(res, ms));