Merge pull request #368 from AkshataKatwal16/relese-changes

Issue feat:Master data update
tekdi · Nov 30, 2024 · 129a60f · 129a60f
2 parents bfad3ae + 016e3dd
commit 129a60f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/pages/block.tsx b/src/pages/block.tsx
@@ -188,7 +188,7 @@ const setIsArchived = useSubmittedButtonStore(
       const districts = data?.result?.values || [];
       setDistrictsOptionRead(districts);
 
-      const districtNameArray = districts.map((item: any) => item.label);
+      const districtNameArray = districts.map((item: any) => item.label?.toLowerCase());
       setDistrictNameArr(districtNameArray);
 
       const districtCodeArray = districts.map((item: any) => item.value);
@@ -262,7 +262,7 @@ const setIsArchived = useSubmittedButtonStore(
           }
         )
         .filter((district: { label: any }) =>
-          districtNameArr.includes(district.label)
+          districtNameArr.includes(district.label?.toLowerCase())
         );
       if (isFirstVisit) {
         if (
@@ -321,7 +321,7 @@ const setIsArchived = useSubmittedButtonStore(
       const blocks = response?.result?.values || [];
       setBlocksOptionRead(blocks);
 
-      const blockNameArray = blocks.map((item: any) => item.label.toLowerCase());
+      const blockNameArray = blocks.map((item: any) => item.label?.toLowerCase());
       setBlockNameArr(blockNameArray);
 
       const blockCodeArray = blocks.map((item: any) => item.value);
@@ -412,7 +412,7 @@ const setIsArchived = useSubmittedButtonStore(
             };
           }
         )
-        .filter((block: { name: string }) => blockNameArr.includes(block.name));
+        .filter((block: { name: string }) => blockNameArr.includes(block.name?.toLocaleLowerCase()));
 
       setBlockData(filteredBlockData);
       setShowAllBlocks(filteredBlockData);

diff --git a/src/pages/district.tsx b/src/pages/district.tsx
@@ -146,7 +146,7 @@ const District: React.FC = () => {
       const districts = data?.result?.values || [];
       setDistrictsOptionRead(districts);
 
-      const districtNameArray = districts.map((item: any) => item.label.toLowerCase());
+      const districtNameArray = districts.map((item: any) => item.label?.toLowerCase());
       setDistrictNameArr(districtNameArray);
 
       const districtCodeArray = districts.map((item: any) => item.value);
@@ -252,7 +252,7 @@ const District: React.FC = () => {
 
             const matchingDistrict = districtsOptionRead.find(
               (district: { label: string }) =>
-                district.label.toLowerCase() === transformedName.toLowerCase()
+                district.label?.toLowerCase() === transformedName?.toLowerCase()
             );
 
             return {
@@ -267,7 +267,7 @@ const District: React.FC = () => {
           }
         )
         .filter((district: { label: any }) =>
-          districtNameArr.includes(district.label)
+          districtNameArr.includes(district?.label?.toLowerCase())
         );
 
       setDistrictData(filteredDistrictData);