@autobusal/routes-search 1.0.0 → 1.1.0

package/RoutesSearch.tsx

@@ -5,10 +5,10 @@ import { FaArrowUp, FaHistory } from 'react-icons/fa';
 import { AiOutlineSearch } from 'react-icons/ai';
 import { Button, Autocomplete, Calendar, Passengers } from '@autobusal/common';
 import { Display, createDate } from '@autobusal/utilities';
+import { getCities } from './utilities';
 import { Options, Columns, Column, Item, Title, Action } from './styles';
-import { AutocompleteData } from '@autobusal/common/Autocomplete/types';
 import { RoutesSearchForm } from './types';
-import { GetSuggestions } from './services';
+import { useGetSuggestions } from './services';
 
 interface Props {
   type: 'departure' | 'return'
@@ -28,7 +28,7 @@ const RoutesSearch = ({ type, from, to, departure, _return, adultsNo, childrenNo
 
   const { register, handleSubmit, formState: { errors }, setValue } = useForm<RoutesSearchForm>();
 
-  const { data } = GetSuggestions();
+  const { data: CitiesData } = useGetSuggestions();
 
   const onClick = (type: ('departure' | 'return')): void => {
     setSelected(type);
@@ -45,6 +45,16 @@ const RoutesSearch = ({ type, from, to, departure, _return, adultsNo, childrenNo
     data.babies = Number(data.babies);
     data.children = Number(data.children);
 
+    // add the locations
+    const from = data.from.split(':');
+    data.from = from[0];
+    data.stop_from = from[1];
+
+    // add the to locations
+    const to = data.to.split(':');
+    data.to = to[0];
+    data.stop_to = to[1];
+
     if (data.adults == 0) {
       alert(t('routes_search.errors.adults'));
     } else if (data.adults + data.children > 5) {
@@ -58,10 +68,7 @@ const RoutesSearch = ({ type, from, to, departure, _return, adultsNo, childrenNo
     }
   };
 
-  const cities: AutocompleteData[] = data.map(city => ({
-    name: `${ city.name }, ${ city.country?.name ?? '' }`,
-    value: city.slug
-  }));
+  const cities = getCities(CitiesData, t);
 
   return (
     <form onSubmit={ handleSubmit(onSubmit) }>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autobusal/routes-search",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "type": "module",
   "main": "index.ts"
 }

package/services.ts

@@ -2,7 +2,7 @@ import { useSuspenseQuery, UseSuspenseQueryResult } from '@tanstack/react-query'
 import { apiClient } from '@autobusal/providers';
 import { CityData } from '@autobusal/providers/types/locations';
 
-export const GetSuggestions = (): UseSuspenseQueryResult<CityData[]> => (
+export const useGetSuggestions = (): UseSuspenseQueryResult<CityData[]> => (
   useSuspenseQuery({
     queryKey: ['search-suggestions'],
     queryFn: async () => (

package/types.ts

@@ -7,4 +7,6 @@ export interface RoutesSearchForm {
   adults: number
   children: number
   babies: number
+  stop_from?: string
+  stop_to?: string
 }

package/utilities.ts

@@ -0,0 +1,23 @@
+import { TFunction } from 'i18next';
+import { AutocompleteData } from '@autobusal/common/Autocomplete/types';
+import { CityData } from '@autobusal/providers/types/locations';
+
+export const getCities = (cities: CityData[], t: TFunction<'common'>): AutocompleteData[] => {
+  const data: AutocompleteData[] = [];
+
+  cities.forEach(city => {
+    data.push({
+      name: `${ city.name }, ${ city.country?.name ?? '' } (${ t('all_stations', { ns: 'common' }) })`,
+      value: `${ city.slug }`
+    });
+
+    city.stops?.forEach(stop => {
+      data.push({
+        name: `${ city.name }, ${ city.country?.name ?? '' } (${ stop.name })`,
+        value: `${ city.slug }:${ stop.id }`
+      });
+    });
+  });
+
+  return data;
+};