diff --git a/src/components/Dashboard/MenuAccessControl.js b/src/components/Dashboard/MenuAccessControl.js index 46008d7..8e187de 100644 --- a/src/components/Dashboard/MenuAccessControl.js +++ b/src/components/Dashboard/MenuAccessControl.js @@ -20,6 +20,7 @@ import { BsJournals } from "react-icons/bs"; import Spinner from '../../UIComponants/Spinner'; import { getByUsrGrpId } from "APIServices/MenuAccessControlAPI"; import { toast } from "react-toastify"; +import {getToken } from "../../utils/tokenService" function MenuAccessControl({ selected, Sync }) { const [loading, setLoading] = useState(true); @@ -116,7 +117,8 @@ function MenuAccessControl({ selected, Sync }) { useEffect(() => { const apiUrl = `${process.env.REACT_APP_API_URL}/api/getAllUsrGrp`; - const token = localStorage.getItem("authToken"); + // const token = localStorage.getItem("CurrentUser"); + const token = getToken() const fetchMenuItems = async () => { try { const response = await fetch(apiUrl, { @@ -186,6 +188,21 @@ function MenuAccessControl({ selected, Sync }) { return; } console.log("Data fetched successfully:", data); + + // Transform the data to match the table structure + const transformedData = data.map(item => ({ + menuId: item.menuItemId.menuItemId, + menuItemName: item.main_menu_action_name || item.menuItemDesc, + view: item.mvisible === "true", + create: item.mcreate === "true", + edit: item.medit === "true", + delete: item.mdelete === "true", + query: item.mquery === "true", + export: item.mexport === "true", + isActive: item.status === "Enable" + })); + + setSlicedMenus(transformedData); setAlldata(data); toast.success("Data fetched successfully!"); } catch (error) { @@ -281,9 +298,9 @@ function MenuAccessControl({ selected, Sync }) { setToggle(!toggle); }; - slicedMenus = menuItems + const filteredMenus = slicedMenus .filter((item) => - item.menuName && item.menuName.toLowerCase().includes(searchQuery.toLowerCase()) + item.menuItemName && item.menuItemName.toLowerCase().includes(searchQuery.toLowerCase()) ) .slice((currentPage - 1) * recordsPerPage, currentPage * recordsPerPage); return (