Merge pull request #899 from betagouv/supprimer_villes_test_page_reseau

Test d'adresse uniquement sur la fiche réseau, pas de villes
betagouv · Oct 17, 2024 · 4f3b30d · 4f3b30d
2 parents 30fa918 + da171b1
commit 4f3b30d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/src/components/Network/EligibilityTestBox.tsx b/src/components/Network/EligibilityTestBox.tsx
@@ -133,7 +133,7 @@ const EligibilityTestBox = ({ networkId }: EligibilityTestBoxProps) => {
           Testez l'éligibilité d'une adresse pour ce réseau.
         </Text>
 
-        <AddressAutocomplete placeholder="Tapez ici votre adresse" onAddressSelected={onAddressSelected} />
+        <AddressAutocomplete placeholder="Tapez ici votre adresse" onAddressSelected={onAddressSelected} excludeCities />
 
         <Box display="flex" alignItems="center" justifyContent="end">
           {formState === 'eligibilitySubmissionError' && (

diff --git a/src/components/addressAutocomplete/AddressAutocomplete.tsx b/src/components/addressAutocomplete/AddressAutocomplete.tsx
@@ -24,6 +24,7 @@ type AddressProps = {
   popoverClassName?: string;
   onAddressSelected: (address: string, geoAddress?: SuggestionItem) => any;
   onChange?: (e: string) => void;
+  excludeCities?: boolean;
 };
 
 const findAddressInSuggestions = (address: string, suggestions: SuggestionItem[]): SuggestionItem | undefined => {
@@ -41,6 +42,7 @@ const AddressAutocomplete = ({
   centred,
   onAddressSelected,
   onChange,
+  excludeCities = false,
 }: AddressProps) => {
   const router = useRouter();
   const [address, setAddress] = useState('');
@@ -50,6 +52,7 @@ const AddressAutocomplete = ({
     debounceTime,
     limit: 5,
     minCharactersLength,
+    excludeCities,
   });
 
   const handleSelect = useCallback(

diff --git a/src/components/addressAutocomplete/useSuggestions.tsx b/src/components/addressAutocomplete/useSuggestions.tsx
@@ -12,14 +12,15 @@ enum Status {
   Error = 'error',
 }
 type ValueOf<Obj> = Obj[keyof Obj];
-type configProps = {
+type UseSuggestionsProps = {
   limit?: number;
   autocomplete?: boolean;
   debounceTime?: number;
   minCharactersLength?: number;
+  excludeCities?: boolean;
 };
 
-const useSuggestions = ({ limit = 5, debounceTime = 300, minCharactersLength = 3 }: configProps) => {
+const useSuggestions = ({ limit = 5, debounceTime = 300, minCharactersLength = 3, excludeCities }: UseSuggestionsProps) => {
   const [suggestions, setSuggestions] = useState<SuggestionItem[]>([]);
   const [status, setStatus] = useState<ValueOf<Status>>(Status.Idle);
   const isMounted = useIsMounted();
@@ -36,7 +37,10 @@ const useSuggestions = ({ limit = 5, debounceTime = 300, minCharactersLength = 3
         limit: limit.toString(),
       });
 
-      setSuggestions(fetchedSuggestions.features);
+      const features = excludeCities
+        ? fetchedSuggestions.features.filter((feature) => feature.properties.type !== 'municipality')
+        : fetchedSuggestions.features;
+      setSuggestions(features);
       setStatus(Status.Success);
     } catch (e) {
       setStatus(Status.Error);

diff --git a/src/types/Suggestions.d.ts b/src/types/Suggestions.d.ts
@@ -21,7 +21,7 @@ export interface SuggestionItem {
     score: number;
     housenumber: string;
     id: string;
-    type: string;
+    type: 'housenumber' | 'street' | 'locality' | 'municipality';
     name: string;
     postcode: string;
     citycode: string;