diff --git a/src/components/Procurations/Components/MandantTab/Components/MandatePersonCard/Components/MandatePersonCardButtonGroup.tsx b/src/components/Procurations/Components/MandantTab/Components/MandatePersonCard/Components/MandatePersonCardButtonGroup.tsx index b514c2a7e..682aadfa7 100644 --- a/src/components/Procurations/Components/MandantTab/Components/MandatePersonCard/Components/MandatePersonCardButtonGroup.tsx +++ b/src/components/Procurations/Components/MandantTab/Components/MandatePersonCard/Components/MandatePersonCardButtonGroup.tsx @@ -24,7 +24,7 @@ export default function MandatePersonCardButtonGroup( fullWidth={props.fullWidth} disabled={props.isProcessing} > - Sélectionner + Sélectionner {props.extraText} ) case MandatePersonCardType.MATCH_MANDANT: diff --git a/src/components/Procurations/Components/MandantTab/Components/MandatePersonCard/MandatePersonCard.tsx b/src/components/Procurations/Components/MandantTab/Components/MandatePersonCard/MandatePersonCard.tsx index eb4458ec5..8695f5ca9 100644 --- a/src/components/Procurations/Components/MandantTab/Components/MandatePersonCard/MandatePersonCard.tsx +++ b/src/components/Procurations/Components/MandantTab/Components/MandatePersonCard/MandatePersonCard.tsx @@ -95,13 +95,6 @@ export default function MandatePersonCard(props: MandatePersonCardProps) { - {!props.hideActions && props.type !== MandatePersonCardType.FIND && ( - - {/* @ts-expect-error wkejfhkej */} - - - )} - {linkedPeople?.map(x => ( <> @@ -110,8 +103,8 @@ export default function MandatePersonCard(props: MandatePersonCardProps) { - {props.type === MandatePersonCardType.FIND ? ( - + {props.type === MandatePersonCardType.FIND || props.roundId === x.round.uuid ? ( + {x.proxy.length < 1 && ( <> props.onPersonView?.(el.uuid, x.round.uuid)} + onPersonView={() => + props.onPersonView?.( + MandatePersonCardType.MATCH_MANDANT === props.type ? props.uuid! : el.uuid, + x.round.uuid + ) + } /> {/*@ts-expect-error fefwf */} {el.matched_at && ( @@ -172,6 +170,9 @@ export default function MandatePersonCard(props: MandatePersonCardProps) { )} + + + ))} diff --git a/src/components/Procurations/Pages/MandateMatchPage.tsx b/src/components/Procurations/Pages/MandateMatchPage.tsx index c5bce3703..4450a5921 100644 --- a/src/components/Procurations/Pages/MandateMatchPage.tsx +++ b/src/components/Procurations/Pages/MandateMatchPage.tsx @@ -120,7 +120,13 @@ export default function MandateMatchPage() { )} - + ))} @@ -157,21 +163,27 @@ const getSectionName = (type: MatchingLevelEnum) => { } } -const MandateInfo = memo((data: ProcurationDetailsModel) => ( - -)) +const MandateInfo = memo((data: ProcurationDetailsModel) => { + const navigate = useNavigate() + return ( + navigate(`${paths.procurations}/request/${id}/${round}/edit`)} + hideStateActions + inFrenchSoil={data.from_france} + /> + ) +}) MandateInfo.displayName = 'MandateInfo' const Proxy = memo( @@ -180,30 +192,37 @@ const Proxy = memo( setExpended, expended, onSelect, + roundId, }: { el: AvailableProxyModel setExpended: (id: string) => void onSelect: () => void expended: boolean - }) => ( - - ) + roundId: string | undefined + }) => { + const navigate = useNavigate() + return ( + navigate(`${paths.procurations}/request/${id}/${round}/edit`)} + linkedPeople={el.request_slots ?? el.proxy_slots ?? undefined} + uuid={el.uuid} + /> + ) + } ) Proxy.displayName = 'Proxy'