Merge pull request #663 from cultuurnet/bugfix/III-5432

cultuurnet · Mar 20, 2023 · 0a431eb · 0a431eb
2 parents aed71b7 + 34c7867
commit 0a431eb
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/src/hooks/api/places.ts b/src/hooks/api/places.ts
@@ -117,6 +117,7 @@ type GetPlacesByQueryArguments = {
   name: string;
   terms: Array<Values<typeof EventTypes>>;
   zip?: string;
+  addressLocality?: string;
   addressCountry?: Country;
 };
 
@@ -125,16 +126,18 @@ const getPlacesByQuery = async ({
   name,
   terms,
   zip,
+  addressLocality,
   addressCountry,
 }: Headers & GetPlacesByQueryArguments) => {
   const termsString = terms.reduce(
     (acc, currentTerm) => `${acc}terms.id:${currentTerm}`,
     '',
   );
-  const postalCodeString = zip ? `address.\\*postalCode:${zip}` : '';
-  const queryArguments = [termsString, postalCodeString].filter(
-    (argument) => !!argument,
-  );
+  const queryArguments = [
+    termsString,
+    zip ? `address.\\*postalCode:${zip}` : '',
+    addressLocality ? `address.\\*.addressLocality:${addressLocality}` : '',
+  ].filter((argument) => !!argument);
 
   const res = await fetchFromApi({
     path: '/places/',
@@ -164,7 +167,13 @@ const getPlacesByQuery = async ({
 };
 
 const useGetPlacesByQuery = (
-  { name, terms, zip, addressCountry }: GetPlacesByQueryArguments,
+  {
+    name,
+    terms,
+    zip,
+    addressLocality,
+    addressCountry,
+  }: GetPlacesByQueryArguments,
   configuration = {},
 ) =>
   useAuthenticatedQuery<Place[]>({
@@ -175,6 +184,7 @@ const useGetPlacesByQuery = (
       terms,
       zip,
       addressCountry,
+      addressLocality,
     },
     enabled: !!name || terms.length,
     ...configuration,

diff --git a/src/pages/steps/PlaceStep.tsx b/src/pages/steps/PlaceStep.tsx
@@ -68,6 +68,7 @@ const PlaceStep = ({
       name: searchInput,
       terms,
       zip: municipality?.zip,
+      addressLocality: municipality?.name,
       addressCountry: country,
     },
     { enabled: !!searchInput },

diff --git a/src/utils/fetchFromApi.ts b/src/utils/fetchFromApi.ts
@@ -44,7 +44,12 @@ const fetchFromApi = async ({
 
   try {
     url = new URL(`${publicRuntimeConfig.apiUrl}${path}`);
-    url.search = new URLSearchParams(omit(searchParams, 'queryKey')).toString();
+    searchParams = omit(searchParams, 'queryKey');
+    if (typeof searchParams?.q !== 'undefined' && !searchParams?.q) {
+      searchParams = omit(searchParams, 'q');
+    }
+
+    url.search = new URLSearchParams(searchParams).toString();
   } catch (e) {
     if (!silentError) {
       throw new FetchError(400, e?.message ?? 'Unknown error');