diff --git a/src/pages/master/MasterPage.jsx b/src/pages/master/MasterPage.jsx index f0f61f6b..75081221 100644 --- a/src/pages/master/MasterPage.jsx +++ b/src/pages/master/MasterPage.jsx @@ -4,27 +4,39 @@ import MasterModal from "../../components/master/MasterModal"; import { mastersList } from "../../data/masters"; import { useDispatch, useSelector } from "react-redux"; import { changeMaster } from "../../slices/localVariablesSlice"; -import useMaster, { useMasterMenu } 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"; import { MANAGE_MASTER } from "../../utils/constants"; import { useQueryClient } from "@tanstack/react-query"; - +import GlobalModel from "../../components/common/GlobalModel"; const MasterPage = () => { - const {data,isLoading,isError,error:menuError} = useMasterMenu() - const [modalConfig, setModalConfig] = useState({ modalType: "", item: null, masterType: null }); - const [searchTerm, setSearchTerm] = useState(''); + const { data, isLoading, isError, error: menuError } = useMasterMenu(); + const [modalConfig, setModalConfig] = useState({ + modalType: "", + item: null, + masterType: null, + }); + const [searchTerm, setSearchTerm] = useState(""); const [filteredResults, setFilteredResults] = useState([]); const [isCreateModalOpen, setIsCreateModalOpen] = useState(false); const hasMasterPermission = useHasUserPermission(MANAGE_MASTER); const dispatch = useDispatch(); - const selectedMaster = useSelector((store) => store.localVariables.selectedMaster); + const selectedMaster = useSelector( + (store) => store.localVariables.selectedMaster + ); const queryClient = useQueryClient(); - const { data: masterData = [], loading, error, RecallApi,isError:isMasterError } = useMaster(); + const { + data: masterData = [], + loading, + error, + RecallApi, + isError: isMasterError, + } = useMaster(); const openModal = () => setIsCreateModalOpen(true); @@ -33,17 +45,21 @@ const MasterPage = () => { setModalConfig(null); // Clean up Bootstrap modal manually - const modalEl = document.getElementById('master-modal'); - modalEl?.classList.remove('show'); - if (modalEl) modalEl.style.display = 'none'; + const modalEl = document.getElementById("master-modal"); + modalEl?.classList.remove("show"); + if (modalEl) modalEl.style.display = "none"; - document.body.classList.remove('modal-open'); - document.body.style.overflow = 'auto'; + document.body.classList.remove("modal-open"); + document.body.style.overflow = "auto"; - document.querySelectorAll('.modal-backdrop').forEach((el) => el.remove()); + document.querySelectorAll(".modal-backdrop").forEach((el) => el.remove()); }; - const handleModalData = (modalType, item, masterType = selectedMaster) => { + const handleModalData = ( + modalType, + item = null, + masterType = selectedMaster + ) => { setModalConfig({ modalType, item, masterType }); }; @@ -54,15 +70,17 @@ const MasterPage = () => { if (!masterData?.length) return; const results = masterData.filter((item) => - Object.values(item).some( - (field) => field?.toString().toLowerCase().includes(value) + Object.values(item).some((field) => + field?.toString().toLowerCase().includes(value) ) ); setFilteredResults(results); }; const displayData = useMemo(() => { if (searchTerm) return filteredResults; - return queryClient.getQueryData(["masterData", selectedMaster]) || masterData; + return ( + queryClient.getQueryData(["masterData", selectedMaster]) || masterData + ); }, [searchTerm, filteredResults, selectedMaster, masterData]); const columns = useMemo(() => { @@ -84,15 +102,22 @@ const MasterPage = () => { }; }, []); - if(isError || isMasterError) return
{error?.message || menuError?.message}
-{error?.message || menuError?.message}
+