Procuration - improve status filter (#3032)

parti-renaissance · Jun 20, 2024 · 8a3932d · 8a3932d
1 parent e5196d2
commit 8a3932d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 24 deletions.
diff --git 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<Record<string, boolean>>({})
   const [customFilters, setCustomFilers] = useState<IFilters>({
     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
             />
           </Grid>
 
@@ -125,10 +119,10 @@ export default function MandantTab({ done = false }: Props) {
                 <p>
                   <Typography fontWeight={fontWeight.medium}>
                     {sprintf(
-                      '%i %s %s',
+                      '%s %s %s',
                       formatToFrenchNumberString(total),
                       pluralize(total, 'Mandant'),
-                      done ? pluralize(total, 'Traité') : ''
+                      done ? pluralize(total, 'traité') : ''
                     )}
                   </Typography>
                 </p>

diff --git 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<MandateFiltersProps>) {
+function MandateFilters({ onFilter, onToggleMore, status, advanced = false }: Readonly<MandateFiltersProps>) {
   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 => (
                         <MenuItem key={el.label} value={el.value}>
                           {el.label}
                         </MenuItem>
@@ -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
@@ -110,7 +110,7 @@ export default function ProxyTab({ done }: Props) {
                 <p>
                   <Typography fontWeight={fontWeight.medium}>
                     {sprintf(
-                      '%i %s %s',
+                      '%s %s %s',
                       formatToFrenchNumberString(total),
                       pluralize(total, 'Mandataire'),
                       done ? pluralize(total, 'traité') : ''