diff --git a/src/hooks/masterHook/useMaster.js b/src/hooks/masterHook/useMaster.js index 15dc3305..f96118b8 100644 --- a/src/hooks/masterHook/useMaster.js +++ b/src/hooks/masterHook/useMaster.js @@ -11,7 +11,16 @@ import showToast from "../../services/toastService"; - +export const useMasterMenu = ()=>{ + return useQuery({ + queryKey:["MasterMenu"], + queryFn:async()=> { + debugger + const resp = await MasterRespository.getMasterMenus(); + return resp.data + } + }) +} export const useActivitiesMaster = () => { 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
{error?.message || menuError?.message}
+