feat: prefer report collision probability and re-entry object dimensions

Use collision_probability_report in conjunction tables when present.
Use the latest re-entry report for object width, height, and span.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: Philip

src/__generated__/V1.ts

@@ -122,9 +122,9 @@ export const getConjunctionEventsColumns = ({
         id: 'collision_probability_uksa',
         accessorKey: 'collision_probability_uksa',
         header: 'Conjunctions.table.poc_uksa',
-        cell: ({ getValue }) => {
-          const collision_probability = getValue<number>();
-          if (collision_probability === undefined) {
+        cell: ({ row }) => {
+          const collision_probability = row.original.collision_probability_report ?? row.original.collision_probability_uksa;
+          if (collision_probability === undefined || collision_probability === null) {
             return '-';
           }
 

src/__generated__/data-contracts.ts

@@ -45,7 +45,7 @@ const ReentryAlertAccordion = ({
             id: 'additional_object_details',
             heading: t('additional_object_details'),
             content: (
-              <ReentryAlertAdditionalObjectDetailsTable event={event} dataPdf={t('additional_object_details')} isClosed={isClosed} />
+              <ReentryAlertAdditionalObjectDetailsTable event={event} report={lastReport} dataPdf={t('additional_object_details')} isClosed={isClosed} />
             ),
           },
           {

src/components/conjunctions/data-table/ConjunctionsDataTableColumns.tsx

@@ -1,19 +1,20 @@
 import { useTranslations } from 'next-intl';
 import type { HTMLProps } from 'react';
 
-import type { TypeReentryEventOut } from '@/__generated__/data-contracts';
+import type { TypeReentryEventOut, TypeReentryEventReportOut } from '@/__generated__/data-contracts';
 import type { InformationsTableRow } from '@/components/InformationsTable';
 import { InformationsTable } from '@/components/InformationsTable';
 
-type ObjectDetailsData = Pick<TypeReentryEventOut, 'international_designator' | 'norad_id' | 'object_height' | 'object_span' | 'launching_year' | 'apogee' | 'perigee' | 'inclination'>;
+type ObjectDetailsData = Pick<TypeReentryEventOut, 'international_designator' | 'norad_id' | 'object_height' | 'object_width' | 'object_span' | 'launching_year' | 'apogee' | 'perigee' | 'inclination'>;
 
 type ReentryAlertAdditionalObjectDetailsTableProps = {
   event: TypeReentryEventOut;
+  report?: TypeReentryEventReportOut;
   dataPdf?: string;
   isClosed?: boolean;
 };
 
-const ReentryAlertAdditionalObjectDetailsTable = ({ event, dataPdf, isClosed }: ReentryAlertAdditionalObjectDetailsTableProps) => {
+const ReentryAlertAdditionalObjectDetailsTable = ({ event, report, dataPdf, isClosed }: ReentryAlertAdditionalObjectDetailsTableProps) => {
   const t = useTranslations('Tables.Reentry_alert_additional_object_details');
 
   const objectDetailsHeaders: HTMLProps<HTMLTableCellElement>[] = [{
@@ -35,13 +36,12 @@ const ReentryAlertAdditionalObjectDetailsTable = ({ event, dataPdf, isClosed }:
     },
   }, {
     header: t('object_dimensions'),
-    renderCell: ({ object_height, object_span }) => object_height && object_span ? `${t('height')} ${object_height}m x ${t('span')} ${object_span}m` : '-',
-    cellProps: {
-      className: 'pl-10',
+    renderCell: ({ object_height, object_width, object_span }) => {
+      const width = report?.object_width || object_width;
+      const span = report?.object_span || object_span;
+      const height = report?.object_height || object_height;
+      return width && span && height ? `${t('height')} ${height}m x ${t('width')} ${width}m x ${t('span')} ${span}m` : '-';
     },
-  }, {
-    header: t('launching_year'),
-    accessorKey: 'launching_year',
     cellProps: {
       className: 'pl-10',
     },