-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1038 from MTES-MCT/feat-filter-by-epci
Filtre par EPCI
- Loading branch information
Showing
49 changed files
with
1,513 additions
and
1,012 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,7 @@ | ||
| # dependencies | ||
| /node_modules | ||
| /frontend/node_modules | ||
| /.pnp | ||
| .pnp.js | ||
|
|
||
| # testing | ||
| /coverage | ||
|
|
||
| # production | ||
| /build | ||
| /frontend/build | ||
|
|
||
| # misc | ||
| .DS_Store | ||
| .env.local | ||
| .env.development.local | ||
| .env.test.local | ||
| .env.production.local | ||
|
|
||
| npm-debug.log* | ||
| yarn-debug.log* | ||
| yarn-error.log* | ||
| /.env | ||
| /.idea/ | ||
| /frontend/.env | ||
| /dist/ | ||
|
|
||
| # specific files | ||
| /server/routers | ||
| build/ | ||
| dist/ | ||
| frontend/src/components/_dsfr/ | ||
| frontend/jest.polyfills.js | ||
| node_modules/ | ||
| public/ | ||
| tools/ |
109 changes: 53 additions & 56 deletions
109
frontend/src/components/EstablishmentSearchableSelect/EstablishmentSearchableSelect.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,71 +1,68 @@ | ||
| import { useEffect, useState } from 'react'; | ||
| import { SearchableSelect } from '../_dsfr'; | ||
| import { useAvailableEstablishments } from '../../hooks/useAvailableEstablishments'; | ||
| import _ from 'lodash'; | ||
| import { SelectOption } from '../../models/SelectOption'; | ||
| import { establishmentService } from '../../services/establishment.service'; | ||
| import { useState } from 'react'; | ||
| import { match, Pattern } from 'ts-pattern'; | ||
|
|
||
| import { EstablishmentDTO } from '@zerologementvacant/models'; | ||
| import { useLazyFindEstablishmentsQuery } from '../../services/establishment.service'; | ||
| import SearchableSelectNext from '../SearchableSelectNext/SearchableSelectNext'; | ||
| import { fr } from '@codegouvfr/react-dsfr'; | ||
|
|
||
| interface Props { | ||
| onChange(establishmentId?: string): void; | ||
| initialEstablishmentOption?: { value: string; label: string }; | ||
| className?: string; | ||
| value?: EstablishmentDTO | null; | ||
| onChange?(establishment: EstablishmentDTO | null): void; | ||
| } | ||
|
|
||
| const EstablishmentSearchableSelect = ({ | ||
| onChange, | ||
| initialEstablishmentOption | ||
| }: Props) => { | ||
| const { availableEstablishmentOptions } = useAvailableEstablishments(); | ||
| const [establishmentOptions, setEstablishmentOptions] = useState< | ||
| SelectOption[] | ||
| >([]); | ||
| const [selected, setSelected] = useState(initialEstablishmentOption?.value); | ||
|
|
||
| const addOption = (o1: SelectOption[], o2?: SelectOption) => | ||
| _.unionWith(o1, o2 ? [o2] : [], (s1, s2) => s1.value === s2.value); | ||
| function EstablishmentSearchableSelect(props: Props) { | ||
| const [internalValue, setInternalValue] = useState<EstablishmentDTO | null>( | ||
| null | ||
| ); | ||
| const [value, onChange] = | ||
| props.value !== undefined | ||
| ? [props.value, props.onChange] | ||
| : [internalValue, setInternalValue]; | ||
|
|
||
| useEffect(() => { | ||
| setEstablishmentOptions( | ||
| addOption(availableEstablishmentOptions, initialEstablishmentOption) | ||
| ); | ||
| }, [availableEstablishmentOptions, initialEstablishmentOption]); | ||
| const [findEstablishments, { data: establishments, isFetching }] = | ||
| useLazyFindEstablishmentsQuery(); | ||
|
|
||
| const quickSearch = (query: string) => { | ||
| if (query.length) { | ||
| establishmentService | ||
| .quickSearch(query) | ||
| .then((_) => | ||
| setEstablishmentOptions( | ||
| _.map((establishment) => ({ | ||
| value: establishment.id, | ||
| label: establishment.name | ||
| })) | ||
| ) | ||
| ) | ||
| .catch((err) => console.log('error', err)); | ||
| } else { | ||
| setSelected(initialEstablishmentOption?.value); | ||
| setEstablishmentOptions( | ||
| addOption(availableEstablishmentOptions, initialEstablishmentOption) | ||
| ); | ||
| async function search(query: string | undefined): Promise<void> { | ||
| if (query) { | ||
| await findEstablishments({ query, available: true }).unwrap(); | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| return ( | ||
| <SearchableSelect | ||
| className="fr-my-0 fr-mr-2w" | ||
| selected={selected} | ||
| options={establishmentOptions} | ||
| onChange={(value: any) => { | ||
| setSelected(value); | ||
| if (value.length) { | ||
| onChange(value); | ||
| <SearchableSelectNext | ||
| className={props.className} | ||
| debounce={250} | ||
| search={search} | ||
| autocompleteProps={{ | ||
| autoHighlight: true, | ||
| clearIcon: null, | ||
| freeSolo: true, | ||
| getOptionKey: (option) => | ||
| typeof option === 'string' ? option : option.id, | ||
| getOptionLabel: (option) => | ||
| typeof option === 'string' ? option : option.name, | ||
| isOptionEqualToValue: (option, value) => option.id === value.id, | ||
| options: establishments ?? [], | ||
| loading: isFetching, | ||
| openOnFocus: true, | ||
| value: value, | ||
| onChange: (_, establishment) => { | ||
| match(establishment) | ||
| .with(Pattern.string, () => {}) | ||
| .otherwise((establishment) => { | ||
| onChange?.(establishment); | ||
| }); | ||
| } | ||
| }} | ||
| inputProps={{ | ||
| classes: { | ||
| nativeInputOrTextArea: fr.cx('fr-my-0') | ||
| } | ||
| }} | ||
| placeholder="Rechercher un établissement" | ||
| required={true} | ||
| onTextChange={(q: string) => quickSearch(q)} | ||
| /> | ||
| ); | ||
| }; | ||
| } | ||
|
|
||
| export default EstablishmentSearchableSelect; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.