round img of doctors && fix remove 'nobat724' value in city data for all pages && handle send req for filter clinics && filter list clinic for first time on load page && add component loading and handle it in page clinics

components/home/search/modal/index.js

@@ -3,11 +3,10 @@
 import { useState, useEffect } from "react";
 import { Modal, Box } from "@mui/material";
 import { styleDefault } from "@/mui";
-import { addLabelToList } from "@/helper";
 
 // Data
-import statesData from "@/data/state.json";
-import citiesData from "@/data/city.json";
+import states from "@/data/state.json";
+import cities from "@/data/city.json";
 import Content from "./Content";
 import { useRouter } from "next/navigation";
 
@@ -17,14 +16,11 @@ function ModalSearchCity({
   setOpen,
   children,
   selected,
-  handleSearch,
   setSelected,
+  handleSearch,
 }) {
-  const provinceSelected = selected.province;
+  const provinceSelected = selected?.province?.name;
   const router = useRouter();
-
-  const states = addLabelToList(statesData);
-  const cities = addLabelToList(citiesData);
   const [filteredCities, setFilteredCities] = useState([]);
 
   const handleClose = () => setOpen(false);
@@ -32,7 +28,7 @@ function ModalSearchCity({
   useEffect(() => {
     if (provinceSelected) {
       const selectedState = states.find(
-        (state) => state.label === provinceSelected
+        (state) => state.name === provinceSelected
       );
       if (selectedState) {
         const stateId = selectedState.id;
@@ -46,15 +42,17 @@ function ModalSearchCity({
     }
   }, [provinceSelected]);
 
-  const updateData = (event, name) => {
+  const updateData = (name, event) => {
     const searchParams = new URLSearchParams(window.location.search);
 
     if (name === "province") {
       setSelected({ ...selected, province: event, city: "" });
-      searchParams.set("state", event);
+      searchParams.set("state", event?.name);
+      searchParams.set("city", selected.city?.name);
     } else {
       setSelected({ ...selected, [name]: event });
-      searchParams.set("city", event);
+      searchParams.set("city", event?.name);
+      searchParams.set("state", selected.province?.name);
     }
     router.push(`?${searchParams.toString()}`);
   };