Skip to content

fix: afficher le dernier intermediaire avant ETG sur la FEI #433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tangimds wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: afficher le dernier intermediaire avant ETG sur la FEI #433

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51ebac0
Update CardFiche.tsx
tangimds Jun 4, 2026
f3a9e6f
Update CardFiche.tsx
tangimds Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 59 additions & 20 deletions app-local-first-react-router/src/components/CardFiche.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,12 @@ import { Checkbox } from '@codegouvfr/react-dsfr/Checkbox';
import { useMemo, useState, useRef, useEffect } from 'react';
import useZustandStore from '@app/zustand/store';
import { useIsCircuitCourt } from '@app/utils/circuit-court';
import { CarcasseType } from '@prisma/client';
import { CarcasseType, EntityTypes, FeiOwnerRole } from '@prisma/client';
import { abbreviations, formatCountCarcasseByEspece } from '@app/utils/count-carcasses';
import { filterCarcassesIntermediairesForCarcasse } from '@app/utils/get-carcasses-intermediaires';
import {
filterCarcassesIntermediairesForCarcasse,
filterFeiIntermediaires,
} from '@app/utils/get-carcasses-intermediaires';
import { useMyCarcassesForFei } from '@app/utils/filter-my-carcasses';
import { useCarcassesForFei } from '@app/utils/get-carcasses-for-fei';

Expand Down Expand Up @@ -38,6 +41,23 @@ const statusColors: Record<FeiStepSimpleStatus, { bg: string; text: string }> =
},
};

function resolveOwnerName(
id: string | null | undefined,
entities: Record<string, { nom_d_usage?: string | null; raison_sociale?: string | null }>,
usersById: Record<string, { prenom?: string | null; nom_de_famille?: string | null }>
): string | null {
if (!id) return null;
const entity = entities[id];
if (entity?.nom_d_usage) return entity.nom_d_usage;
if (entity?.raison_sociale) return entity.raison_sociale;
const u = usersById[id];
if (u) {
const name = `${u.prenom ?? ''} ${u.nom_de_famille ?? ''}`.trim();
if (name) return name;
}
return null;
}

const maxDetailedLines = 2;
export default function CardFiche({
fei,
Expand All @@ -55,6 +75,27 @@ export default function CardFiche({
const myCarcasses = useMyCarcassesForFei(fei.numero);
const feiCarcasses = useCarcassesForFei(fei.numero);
const carcassesIntermediaireById = useZustandStore((state) => state.carcassesIntermediaireById);
const entities = useZustandStore((state) => state.entities);
const usersById = useZustandStore((state) => state.users);

// Ligne « Chasse » : le dernier owner avant l'arrivée chez le destinataire = le collecteur
// s'il y en a eu un, sinon le premier détenteur.
// On ne retient que les intermediaires portés par une vraie entité COLLECTEUR_PRO :
// l'ETG qui fait son propre transport crée aussi un intermediaire de rôle COLLECTEUR_PRO,
// mais porté par l'entité ETG elle-même (voir etg-current-owner-confirm.tsx).
const [chasseName, chasseRole] = useMemo<
[string | null, typeof FeiOwnerRole.COLLECTEUR_PRO | typeof FeiOwnerRole.PREMIER_DETENTEUR]
>(() => {
const collecteur = filterFeiIntermediaires(carcassesIntermediaireById, fei.numero).find(
(i) =>
i.intermediaire_role === FeiOwnerRole.COLLECTEUR_PRO &&
entities[i.intermediaire_entity_id!]?.type === EntityTypes.COLLECTEUR_PRO
);
const id = collecteur?.intermediaire_entity_id || collecteur?.intermediaire_user_id;
const collecteurName = resolveOwnerName(id, entities, usersById);
if (collecteurName) return [collecteurName, FeiOwnerRole.COLLECTEUR_PRO];
return [fei.premier_detenteur_name_cache, FeiOwnerRole.PREMIER_DETENTEUR];
}, [carcassesIntermediaireById, fei.numero, fei.premier_detenteur_name_cache, entities, usersById]);

// Close menu when clicking outside
useEffect(() => {
Expand Down Expand Up @@ -243,19 +284,11 @@ export default function CardFiche({
</p>
</div>
<div className="flex shrink basis-1/2 flex-col gap-y-1">
<ChasseIcon />
{chasseRole === FeiOwnerRole.COLLECTEUR_PRO ? <TransportIcon /> : <ChasseIcon />}
<p
className={[
'line-clamp-2 text-sm',
fei.premier_detenteur_name_cache ? 'text-black' : 'text-neutral-400',
].join(' ')}
className={['line-clamp-2 text-sm', chasseName ? 'text-black' : 'text-neutral-400'].join(' ')}
>
{/* {user?.roles.includes(UserRoles.SVI) ? (
<>{fei.latest_intermediaire_name_cache || 'À renseigner'}</>
) : (
<>{fei.premier_detenteur_name_cache || 'À renseigner'}</>
)} */}
<>{fei.premier_detenteur_name_cache || 'À renseigner'}</>
{chasseName || 'À renseigner'}
</p>
</div>
</div>
Expand Down Expand Up @@ -420,10 +453,16 @@ function RefusIcon() {
);
}

// function TransportIcon() {
// return (
// <svg width="20" height="20" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
// <path d="M8.96456 18C8.72194 19.6961 7.26324 21 5.5 21C3.73676 21 2.27806 19.6961 2.03544 18H1V6C1 5.44772 1.44772 5 2 5H16C16.5523 5 17 5.44772 17 6V8H20L23 12.0557V18H20.9646C20.7219 19.6961 19.2632 21 17.5 21C15.7368 21 14.2781 19.6961 14.0354 18H8.96456ZM15 7H3V15.0505C3.63526 14.4022 4.52066 14 5.5 14C6.8962 14 8.10145 14.8175 8.66318 16H14.3368C14.5045 15.647 14.7296 15.3264 15 15.0505V7ZM17 13H21V12.715L18.9917 10H17V13ZM17.5 19C18.1531 19 18.7087 18.5826 18.9146 18C18.9699 17.8436 19 17.6753 19 17.5C19 16.6716 18.3284 16 17.5 16C16.6716 16 16 16.6716 16 17.5C16 17.6753 16.0301 17.8436 16.0854 18C16.2913 18.5826 16.8469 19 17.5 19ZM7 17.5C7 16.6716 6.32843 16 5.5 16C4.67157 16 4 16.6716 4 17.5C4 17.6753 4.03008 17.8436 4.08535 18C4.29127 18.5826 4.84689 19 5.5 19C6.15311 19 6.70873 18.5826 6.91465 18C6.96992 17.8436 7 17.6753 7 17.5Z"></path>
// </svg>
// );
// }
function TransportIcon() {
return (
<svg
width="15"
height="15"
viewBox="0 0 24 24"
fill="currentColor"
xmlns="http://www.w3.org/2000/svg"
>
<path d="M8.96456 18C8.72194 19.6961 7.26324 21 5.5 21C3.73676 21 2.27806 19.6961 2.03544 18H1V6C1 5.44772 1.44772 5 2 5H16C16.5523 5 17 5.44772 17 6V8H20L23 12.0557V18H20.9646C20.7219 19.6961 19.2632 21 17.5 21C15.7368 21 14.2781 19.6961 14.0354 18H8.96456ZM15 7H3V15.0505C3.63526 14.4022 4.52066 14 5.5 14C6.8962 14 8.10145 14.8175 8.66318 16H14.3368C14.5045 15.647 14.7296 15.3264 15 15.0505V7ZM17 13H21V12.715L18.9917 10H17V13ZM17.5 19C18.1531 19 18.7087 18.5826 18.9146 18C18.9699 17.8436 19 17.6753 19 17.5C19 16.6716 18.3284 16 17.5 16C16.6716 16 16 16.6716 16 17.5C16 17.6753 16.0301 17.8436 16.0854 18C16.2913 18.5826 16.8469 19 17.5 19ZM7 17.5C7 16.6716 6.32843 16 5.5 16C4.67157 16 4 16.6716 4 17.5C4 17.6753 4.03008 17.8436 4.08535 18C4.29127 18.5826 4.84689 19 5.5 19C6.15311 19 6.70873 18.5826 6.91465 18C6.96992 17.8436 7 17.6753 7 17.5Z" />
</svg>
);
}
Loading