From 1e78a3870cce064b4612a809db7cdb50702642fd Mon Sep 17 00:00:00 2001 From: Akshata Katwal Date: Tue, 15 Oct 2024 15:54:26 +0530 Subject: [PATCH] Issue feat: fix production issues --- src/pages/block.tsx | 81 +++++++++++++++++++++++------------------- src/pages/district.tsx | 51 +++++++++++++------------- src/pages/logout.tsx | 30 ++++++++++++---- 3 files changed, 95 insertions(+), 67 deletions(-) diff --git a/src/pages/block.tsx b/src/pages/block.tsx index 2e064a63..fb73b396 100644 --- a/src/pages/block.tsx +++ b/src/pages/block.tsx @@ -208,18 +208,19 @@ const Block: React.FC = () => { sort: sortBy, }; - const response = await queryClient.fetchQuery({ - queryKey: [ - QueryKeys.FIELD_OPTION_READ, - reqParams.limit, - reqParams.offset, - searchKeyword || "", - CohortTypes.DISTRICT, - reqParams.sort.join(","), - ], - queryFn: () => getCohortList(reqParams), - }); - + // const response = await queryClient.fetchQuery({ + // queryKey: [ + // QueryKeys.FIELD_OPTION_READ, + // reqParams.limit, + // reqParams.offset, + // searchKeyword || "", + // CohortTypes.DISTRICT, + // reqParams.sort.join(","), + // ], + // queryFn: () => getCohortList(reqParams), + // }); + + const response= await getCohortList(reqParams) const cohortDetails = response?.results?.cohortDetails || []; const filteredDistrictData = cohortDetails @@ -277,19 +278,24 @@ const Block: React.FC = () => { const fetchBlocks = async () => { try { - const response = await queryClient.fetchQuery({ - queryKey: [ - QueryKeys.FIELD_OPTION_READ, + // const response = await queryClient.fetchQuery({ + // queryKey: [ + // QueryKeys.FIELD_OPTION_READ, + // selectedDistrict === t("COMMON.ALL") ? "" : selectedDistrict, + // "blocks", + // ], + // queryFn: () => + // getBlocksForDistricts({ + // controllingfieldfk: + // selectedDistrict === t("COMMON.ALL") ? "" : selectedDistrict, + // fieldName: "blocks", + // }), + // }); + const response = await getBlocksForDistricts({ + controllingfieldfk: selectedDistrict === t("COMMON.ALL") ? "" : selectedDistrict, - "blocks", - ], - queryFn: () => - getBlocksForDistricts({ - controllingfieldfk: - selectedDistrict === t("COMMON.ALL") ? "" : selectedDistrict, - fieldName: "blocks", - }), - }); + fieldName: "blocks", + }) const blocks = response?.result?.values || []; setBlocksOptionRead(blocks); @@ -335,19 +341,20 @@ const Block: React.FC = () => { sort: sortBy, }; - const response = await queryClient.fetchQuery({ - queryKey: [ - QueryKeys.FIELD_OPTION_READ, - reqParams.limit, - reqParams.offset, - searchKeyword || "", - stateCode, - reqParams.filters.districts, - CohortTypes.BLOCK, - reqParams.sort.join(","), - ], - queryFn: () => getCohortList(reqParams), - }); + // const response = await queryClient.fetchQuery({ + // queryKey: [ + // QueryKeys.FIELD_OPTION_READ, + // reqParams.limit, + // reqParams.offset, + // searchKeyword || "", + // stateCode, + // reqParams.filters.districts, + // CohortTypes.BLOCK, + // reqParams.sort.join(","), + // ], + // queryFn: () => getCohortList(reqParams), + // }); + const response = await getCohortList(reqParams) const cohortDetails = response?.results?.cohortDetails || []; const filteredBlockData = cohortDetails diff --git a/src/pages/district.tsx b/src/pages/district.tsx index f44720e4..b1fdf237 100644 --- a/src/pages/district.tsx +++ b/src/pages/district.tsx @@ -218,18 +218,20 @@ const District: React.FC = () => { sort: sortBy, }; - const response = await queryClient.fetchQuery({ - queryKey: [ - QueryKeys.FIELD_OPTION_READ, - reqParams.limit, - reqParams.offset, - searchKeyword || "", - stateCode, - CohortTypes.DISTRICT, - reqParams.sort.join(","), - ], - queryFn: () => getCohortList(reqParams), - }); + // const response = await queryClient.fetchQuery({ + // queryKey: [ + // QueryKeys.FIELD_OPTION_READ, + // reqParams.limit, + // reqParams.offset, + // searchKeyword || "", + // stateCode, + // CohortTypes.DISTRICT, + // reqParams.sort.join(","), + // ], + // queryFn: () => getCohortList(reqParams), + // }); + + const response = await getCohortList(reqParams) const cohortDetails = response?.results?.cohortDetails || []; @@ -302,18 +304,19 @@ const District: React.FC = () => { }, sort: sortBy, }; - const response = await queryClient.fetchQuery({ - queryKey: [ - QueryKeys.FIELD_OPTION_READ, - reqParams.limit, - reqParams.offset, - reqParams.filters.districts || "", - CohortTypes.BLOCK, - reqParams.sort.join(","), - ], - queryFn: () => getCohortList(reqParams), - }); - + // const response = await queryClient.fetchQuery({ + // queryKey: [ + // QueryKeys.FIELD_OPTION_READ, + // reqParams.limit, + // reqParams.offset, + // reqParams.filters.districts || "", + // CohortTypes.BLOCK, + // reqParams.sort.join(","), + // ], + // queryFn: () => getCohortList(reqParams), + // }); + + const response= await getCohortList(reqParams) const activeBlocks = response?.results?.cohortDetails || []; const activeBlocksCount = activeBlocks.filter( diff --git a/src/pages/logout.tsx b/src/pages/logout.tsx index 97b94dbc..ca6cd4b8 100644 --- a/src/pages/logout.tsx +++ b/src/pages/logout.tsx @@ -20,14 +20,32 @@ function Logout() { } }; userLogout(); - localStorage.removeItem("token"); - localStorage.removeItem("userId"); - localStorage.removeItem("name"); - localStorage.removeItem("tenantId"); - localStorage.removeItem("adminInfo"); - + if (typeof window !== "undefined" && window.localStorage) { + // Specify the keys you want to keep + const keysToKeep = [ + "preferredLanguage", + "mui-mode", + "mui-color-scheme-dark", + "mui-color-scheme-light", + "hasSeenTutorial", + ]; + // Retrieve the values of the keys to keep + const valuesToKeep: { [key: string]: any } = {}; + keysToKeep.forEach((key: string) => { + valuesToKeep[key] = localStorage.getItem(key); + }); + // Clear all local storage + localStorage.clear(); + // Re-add the keys to keep with their values + keysToKeep.forEach((key: string) => { + if (valuesToKeep[key] !== null) { + // Check if the key exists and has a value + localStorage.setItem(key, valuesToKeep[key]); + } + }); + } router.replace("/login"); }, []);