fix the city selection for start and main page

bahnzumberg · Aug 10, 2024 · 0c24992 · 0c24992
1 parent 479839c
commit 0c24992
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/src/components/Search/CityResultList.js b/src/components/Search/CityResultList.js
@@ -82,7 +82,7 @@ export function CityResultList({
               if(!!cityOne && !!idOne ){
                 setCityInput(_city.label);
                 setCity(_city.value)
-                navigate(`tour/${idOne.idOne}/${_city.value}`);
+                navigate(`tour/${idOne}/${_city.value}`);
                 window.location.reload()
               }
 

diff --git a/src/components/Search/Search.js b/src/components/Search/Search.js
@@ -74,14 +74,17 @@ export function Search({
   const cityParam = urlSearchParams.get("city");
   // const { cityOne, idOne } = useParams();
   const [city, setCity] = useState({
-    label: cityParam || capitalize(cityOne),
+    label: capitalize(cityParam) || capitalize(cityOne),
     value: cityParam,
   });
 
   useEffect(() => {
     console.log("**************************************************");
     console.log("L74 Search/ cityOne", cityOne);
     console.log("L75 Search/ idOne", idOne);
+    console.log("L75 Search/ cityParam", cityParam);
+    console.log("L75 Search/ city", city);
+
   }, []);
 
   const [region, setRegion] = useState(null);
@@ -397,20 +400,28 @@ export function Search({
       searchParams,
       initialCity: cityInput,
       onSelect: async (city) => {
-        // console.log("L379 Search / cityOne :", cityOne)
+        console.log("L402 Search / cityParam :", cityParam)
+        console.log("L403 Search / city inside onSelect :", city)
+        console.log("L404 , Search / city.value :", city.value)
+        console.log("L405 , Search / cityOne :", cityOne)
+        console.log("L406 , Search / idOne :", idOne)
         if (!!cityOne && !!idOne && pageKey === "detail") {
           setCityInput(city.label);
           setCity(city.value);
           navigate(`tour/${idOne}/${city.value}`);
         } else if (!!city) {
+          console.log("L413 Search / else if inside onSelect :", city)
           setCityInput(city.label);
           setCity(city);
           pageKey === "start" && updateCapCity(city.label);
+          searchParams.set('city', city.value);
+          setSearchParams(searchParams)
+          window.location.reload()
         }
         hideModal();
       },
-      cityOne: { cityOne },
-      idOne: { idOne },
+      cityOne:  cityOne ,
+      idOne:  idOne ,
       setSearchParams,
       title: "",
       sourceCall: "city",
@@ -443,6 +454,8 @@ export function Search({
           setCityInput(city.label);
           setCity(city);
           pageKey === "start" && updateCapCity(city.label);
+
+
         }
         hideModal();
       },

diff --git a/src/views/Main/DetailReworked.js b/src/views/Main/DetailReworked.js
@@ -321,6 +321,7 @@ useEffect(() => {
     }else{
     tourId = !!searchParams.get("id") ? searchParams.get("id") : !!localStorage.getItem("tourId") ? localStorage.getItem("tourId") : null; // currently we only use localStorage for tourId
   }
+  console.log("L324 tourId :", tourId)
     if (!!tourId) {
       setIsTourLoading(true);
 
@@ -809,7 +810,7 @@ useEffect(() => {
               }}
             >
               <Box sx={{ width: "100%" }}>
-                <SearchContainer pageKey="detail" goto={"/suche"} idOne={idOne} cityOne={cityOne} />
+                <SearchContainer pageKey="detail" goto={"/suche"} idOne={idOne? idOne : null} cityOne={cityOne? cityOne : null} />
               </Box>
             </Box> 
           </Box>