diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/Indicateurs/table/cell-annee-list.tsx b/app.territoiresentransitions.react/src/app/pages/collectivite/Indicateurs/table/cell-annee-list.tsx index d24c5047ee..385176cc26 100644 --- a/app.territoiresentransitions.react/src/app/pages/collectivite/Indicateurs/table/cell-annee-list.tsx +++ b/app.territoiresentransitions.react/src/app/pages/collectivite/Indicateurs/table/cell-annee-list.tsx @@ -4,8 +4,7 @@ import classNames from 'classnames'; import { useState } from 'react'; import { SourceType } from '../types'; import { ConfirmDelete } from './confirm-delete'; -import { PreparedData } from './prepare-data'; -import { IndicateurSourceValeur } from './use-indicateur-valeurs'; +import { PreparedData, PreparedValue } from './prepare-data'; type CellAnneeListProps = { confidentiel?: boolean; @@ -13,7 +12,7 @@ type CellAnneeListProps = { definition: IndicateurDefinition; readonly?: boolean; type: SourceType; - onDelete: (valeur: IndicateurSourceValeur) => void; + onDelete: (valeur: PreparedValue) => void; }; /** Affiche les cellules des années dans l'en-tête du tableau */ @@ -26,9 +25,7 @@ export const CellAnneeList = ({ onDelete, }: CellAnneeListProps) => { const { annees, anneeModePrive, valeursExistantes } = data; - const [toBeDeleted, setToBeDeleted] = useState( - null - ); + const [toBeDeleted, setToBeDeleted] = useState(null); return annees?.map((annee) => { const valeur = valeursExistantes.find((v) => v.annee === annee); @@ -72,7 +69,6 @@ export const CellAnneeList = ({ {toBeDeleted && ( { diff --git a/app.territoiresentransitions.react/src/app/pages/collectivite/Indicateurs/table/confirm-delete.tsx b/app.territoiresentransitions.react/src/app/pages/collectivite/Indicateurs/table/confirm-delete.tsx index ba5803d28e..14a4b1c766 100644 --- a/app.territoiresentransitions.react/src/app/pages/collectivite/Indicateurs/table/confirm-delete.tsx +++ b/app.territoiresentransitions.react/src/app/pages/collectivite/Indicateurs/table/confirm-delete.tsx @@ -11,22 +11,26 @@ import { } from '@/ui'; import { useState } from 'react'; import { CellValue } from './cell-value'; -import { IndicateurSourceValeur } from './use-indicateur-valeurs'; +import { PreparedValue } from './prepare-data'; type ConfirmDeleteProps = { unite: string; - annee: number; - valeur: IndicateurSourceValeur; + valeur: PreparedValue; onDismissConfirm: (overwrite: boolean) => void; }; /** Affiche un dialogue de confirmation avant suppression d'une valeur */ export const ConfirmDelete = (props: ConfirmDeleteProps) => { - const { annee, valeur, unite, onDismissConfirm } = props; + const { valeur, unite, onDismissConfirm } = props; const [isOpen, setIsOpen] = useState(true); - const { objectif, objectifCommentaire, resultat, resultatCommentaire } = - valeur; + const { + objectif, + objectifCommentaire, + resultat, + resultatCommentaire, + annee, + } = valeur; return ( ; -export type PreparedValue = PreparedData['sources'][number]['valeurs'][number]; +export type PreparedValue = PreparedData['valeursExistantes'][number];