fixup! front: pathfinding: display CI/CH codes

Author: Yohh

front/src/common/StationCard.tsx

@@ -35,8 +35,8 @@ export default function StationCard({ station, onClick, fixedHeight = false }: P
       <div className="station-card-head">
         <span className="station-card-code">{trigram}</span>
         <span className="station-card-name">{name}&nbsp;</span>
-        {yardname && !yardNamesToExclude.includes(yardname) && <span>{yardname}</span>}
-        <span className="station-card-uic ml-3">{uic ? formatUicToCi(uic) : ''}</span>
+        {yardname && !yardNamesToExclude.includes(yardname) && <small>{yardname}</small>}
+        {uic && <span className="station-card-uic ml-3">{formatUicToCi(uic)}</span>}
       </div>
       <div className="station-card-localization">
         <span className="station-card-city">{town}</span>

front/src/common/api/osrdEditoastApi.ts

@@ -1642,7 +1642,7 @@ export type GeoJsonPoint = {
   type: 'Point';
 };
 export type PathWaypoint = {
-  ch?: string | null;
+  ch: string | null;
   duration: number;
   geo: GeoJsonPoint;
   id: string | null;
@@ -1651,7 +1651,7 @@ export type PathWaypoint = {
   path_offset: number;
   sch: GeoJsonPoint;
   suggestion: boolean;
-  uic?: number | null;
+  uic: number | null;
 };
 export type PathResponse = {
   created: string;
@@ -2202,7 +2202,7 @@ export type ResultSpeed = {
   time: number;
 };
 export type ResultStops = {
-  ch?: string | null;
+  ch: string | null;
   duration: number;
   position: number;
   time: number;

front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleStop.tsx

@@ -54,7 +54,7 @@ export default function DriverTrainScheduleStop({ stop, idx, train }: Props) {
       </td>
       <td>
         {stop.name || 'Unknown'}&nbsp;
-        {stop.ch === '00' || !stop.ch ? 'BV' : `${stop.ch}`}
+        <small>{stop.ch}</small>
       </td>
       <td className="stoptime-container">
         <div className="box">

front/src/modules/trainschedule/components/ManageTrainSchedule/Itinerary/DisplayVias.tsx

@@ -100,12 +100,10 @@ export default function DisplayVias({ zoomToFeaturePoint }: DisplayViasProps) {
                             `KM ${place.position && Math.round(place.position) / 1000}`
                           }`}
                         </small>
-                        <small className="">
-                          {place.ch === '00' || !place.ch ? 'BV' : `${place.ch}`}
-                        </small>
-                        <small className="text-muted ml-3">
-                          {place.uic ? formatUicToCi(place.uic) : ''}
-                        </small>
+                        <small className="">{place.ch}</small>
+                        {place.uic && (
+                          <small className="text-muted ml-3">{formatUicToCi(place.uic)}</small>
+                        )}
                       </div>
                       {index !== indexSelected && (
                         <div className="default-durations-button mr-1">

front/src/modules/trainschedule/components/ManageTrainSchedule/Itinerary/ModalSuggeredVias.tsx

@@ -12,6 +12,7 @@ import { Spinner } from 'common/Loader';
 import type { ArrayElement } from 'utils/types';
 import type { PathResponse, PathWaypoint } from 'common/api/osrdEditoastApi';
 import { formatUicToCi } from 'utils/strings';
+import cx from 'classnames';
 
 type Props = {
   removeAllVias: () => void;
@@ -67,18 +68,18 @@ export default function ModalSugerredVias({ removeAllVias, pathfindingInProgress
   const formatVia = (via: ArrayElement<PathResponse['steps']>, idx: number, idxTrueVia: number) => (
     <div
       key={`suggested-via-modal-${via.id}-${idx}`}
-      className={`d-flex align-items-center p-1 ${via.suggestion && 'suggested-via-clickable'}`}
+      className={cx('d-flex align-items-center p-1', via.suggestion && 'suggested-via-clickable')}
       title={via.name!}
     >
       {!via.suggestion && <small className="pr-2">{idxTrueVia}</small>}
       <i className={`${via.suggestion ? 'text-muted' : 'text-info'} icons-itinerary-bullet mr-2`} />
       <span className="suggested-via-name">{via.name || ''}</span>&nbsp;
-      <span>{via.ch === '00' || !via.ch ? 'BV' : `${via.ch}`}</span>
-      <small className="text-muted ml-3">{via.uic ? formatUicToCi(via.uic) : ''}</small>
+      <span>{via.ch}</span>
+      {via.uic && <small className="text-muted ml-3">{formatUicToCi(via.uic)}</small>}
       <div className="ml-auto">
-        <small className="mr-2">
-          {via.path_offset && `KM ${Math.round(via.path_offset) / 1000}`}
-        </small>
+        {via.path_offset && (
+          <small className="mr-2">{`KM ${Math.round(via.path_offset) / 1000}`}</small>
+        )}
         {via.suggestion && via.id && !selectedViasTracks.includes(via.id) ? (
           <button
             className="btn btn-sm btn-only-icon"

front/src/reducers/osrdconf2/common/tests/commonConfBuilder.ts

@@ -107,6 +107,8 @@ export default function commonConfBuilder() {
             type: 'Point',
           },
           suggestion: true,
+          ch: null,
+          uic: null,
         },
       ],
     }),

front/src/utils/strings.ts

@@ -63,5 +63,5 @@ export function convertInputStringToNumber(str: string) {
  * @param uic full UIC and CI code (8 digits)
  */
 export function formatUicToCi(uic: number) {
-  return uic.toString().startsWith('87') ? uic.toString().slice(2) : uic;
+  return uic.toString().replace(/^87/, '');
 }