diff --git a/src/components/Procurations/Components/MandantTab/MandantTab.tsx b/src/components/Procurations/Components/MandantTab/MandantTab.tsx index ed0897ae6..97d652430 100644 --- a/src/components/Procurations/Components/MandantTab/MandantTab.tsx +++ b/src/components/Procurations/Components/MandantTab/MandantTab.tsx @@ -41,12 +41,7 @@ export default function MandantTab({ done = false }: Props) { const [expended, setExpended] = useState>({}) const [customFilters, setCustomFilers] = useState({ status: done - ? [ - ProcurationStatusEnum.COMPLETED, - ProcurationStatusEnum.DUPLICATE, - ProcurationStatusEnum.EXCLUDED, - ProcurationStatusEnum.MANUAL, - ] + ? [ProcurationStatusEnum.COMPLETED, ProcurationStatusEnum.DUPLICATE, ProcurationStatusEnum.EXCLUDED] : [ProcurationStatusEnum.PENDING], }) const debouncedFilters = useDebounce(customFilters, 400) @@ -113,7 +108,6 @@ export default function MandantTab({ done = false }: Props) { status={debouncedFilters.status} onToggleMore={onToggleMore} advanced={done} - isRequest /> @@ -125,10 +119,10 @@ export default function MandantTab({ done = false }: Props) {

{sprintf( - '%i %s %s', + '%s %s %s', formatToFrenchNumberString(total), pluralize(total, 'Mandant'), - done ? pluralize(total, 'Traité') : '' + done ? pluralize(total, 'traité') : '' )}

diff --git a/src/components/Procurations/Components/MandateFilters/MandateFilters.tsx b/src/components/Procurations/Components/MandateFilters/MandateFilters.tsx index 95aaf09f2..c3b0cae5e 100644 --- a/src/components/Procurations/Components/MandateFilters/MandateFilters.tsx +++ b/src/components/Procurations/Components/MandateFilters/MandateFilters.tsx @@ -10,17 +10,10 @@ interface MandateFiltersProps { onFilter: (data: { status: ProcurationStatusEnum[]; search: string }) => void onToggleMore: (newValue: boolean) => void status: ProcurationStatusEnum[] - isRequest?: boolean advanced?: boolean } -function MandateFilters({ - onFilter, - onToggleMore, - status, - isRequest = false, - advanced = false, -}: Readonly) { +function MandateFilters({ onFilter, onToggleMore, status, advanced = false }: Readonly) { const { register, handleSubmit, control } = useForm({ defaultValues: { status, @@ -35,7 +28,6 @@ function MandateFilters({ }, [moreState, onToggleMore]) const registeredSearch = register('search') - const demandStateOptions = isRequest ? requestStatuses : defaultStatuses const onSubmit = handleSubmit(onFilter) return ( @@ -74,13 +66,15 @@ function MandateFilters({ size="small" labelId="statuts-label" onChange={ev => { - onChange(ev) + onChange( + ev.target.value.length ? ev : { target: { value: defaultStatuses.map(({ value }) => value) } } + ) onSubmit() }} value={value} multiple={true} > - {demandStateOptions.map(el => ( + {defaultStatuses.map(el => ( {el.label} @@ -115,7 +109,7 @@ function MandateFilters({ const defaultStatuses: { label: string; value: ProcurationStatusEnum }[] = [ { value: ProcurationStatusEnum.COMPLETED, - label: 'Terminé', + label: 'Traité', }, { value: ProcurationStatusEnum.EXCLUDED, @@ -127,6 +121,4 @@ const defaultStatuses: { label: string; value: ProcurationStatusEnum }[] = [ }, ] -const requestStatuses = [...defaultStatuses, { value: ProcurationStatusEnum.MANUAL, label: 'Manuel' }] - export default memo(MandateFilters) diff --git a/src/components/Procurations/Components/ProxyTab/ProxyTab.tsx b/src/components/Procurations/Components/ProxyTab/ProxyTab.tsx index 44736ba78..3003043a7 100644 --- a/src/components/Procurations/Components/ProxyTab/ProxyTab.tsx +++ b/src/components/Procurations/Components/ProxyTab/ProxyTab.tsx @@ -110,7 +110,7 @@ export default function ProxyTab({ done }: Props) {

{sprintf( - '%i %s %s', + '%s %s %s', formatToFrenchNumberString(total), pluralize(total, 'Mandataire'), done ? pluralize(total, 'traité') : ''