front: try fix tests

Signed-off-by: Egor Berezovskiy <[email protected]>
OpenRailAssociation · Jan 22, 2025 · 58be440 · 58be440
1 parent ce5bb6f
commit 58be440
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/front/src/reducers/osrdconf/helpers.ts b/front/src/reducers/osrdconf/helpers.ts
@@ -1,12 +1,12 @@
 import { feature, point } from '@turf/helpers';
 import { compact, last, pick } from 'lodash';
-import { v4 as uuidV4 } from 'uuid';
 
 import { calculateDistanceAlongTrack } from 'applications/editor/tools/utils';
 import type { ManageTrainSchedulePathProperties } from 'applications/operationalStudies/types';
 import { pathStepMatchesOp } from 'modules/pathfinding/utils';
 import type { SuggestedOP } from 'modules/trainschedule/components/ManageTrainSchedule/types';
 import { addElementAtIndex } from 'utils/array';
+import nextId from 'utils/react-id';
 
 import type { OperationalStudiesConfState } from './operationalStudiesConf';
 import type { PathStep } from './types';
@@ -77,7 +77,7 @@ export function upsertPathStep(statePathSteps: (PathStep | null)[], op: Suggeste
       'theoreticalMargin',
       'stopFor',
     ]),
-    id: uuidV4(),
+    id: nextId(),
     ...(op.uic
       ? { uic: op.uic, secondary_code: op.ch }
       : {

diff --git a/front/src/reducers/osrdconf/stdcmConf/index.ts b/front/src/reducers/osrdconf/stdcmConf/index.ts
@@ -1,6 +1,5 @@
 import { createSlice, type PayloadAction } from '@reduxjs/toolkit';
 import type { Draft } from 'immer';
-import { v4 as uuidV4 } from 'uuid';
 
 import {
   ArrivalTimeTypes,
@@ -12,20 +11,21 @@ import { defaultCommonConf, buildCommonConfReducers } from 'reducers/osrdconf/os
 import type { OsrdStdcmConfState, StdcmPathStep } from 'reducers/osrdconf/types';
 import { addElementAtIndex } from 'utils/array';
 import { isArrivalDateInSearchTimeWindow } from 'utils/date';
+import nextId from 'utils/react-id';
 import type { ArrayElement, PickAndNonNullableFields } from 'utils/types';
 
 const DEFAULT_TOLERANCE = 1800; // 30min
 
 export const stdcmConfInitialState: OsrdStdcmConfState = {
   stdcmPathSteps: [
     {
-      id: uuidV4(),
+      id: nextId(),
       isVia: false,
       arrivalType: ArrivalTimeTypes.PRECISE_TIME,
       tolerances: { before: DEFAULT_TOLERANCE, after: DEFAULT_TOLERANCE },
     },
     {
-      id: uuidV4(),
+      id: nextId(),
       isVia: false,
       arrivalType: ArrivalTimeTypes.ASAP,
       tolerances: { before: DEFAULT_TOLERANCE, after: DEFAULT_TOLERANCE },
@@ -209,7 +209,7 @@ export const stdcmConfSlice = createSlice({
     addStdcmVia(state: Draft<OsrdStdcmConfState>, action: PayloadAction<number>) {
       // Index takes count of the origin in the array
       state.stdcmPathSteps = addElementAtIndex(state.stdcmPathSteps, action.payload, {
-        id: uuidV4(),
+        id: nextId(),
         stopType: StdcmStopTypes.PASSAGE_TIME,
         isVia: true,
       });

diff --git a/front/src/utils/react-id.ts b/front/src/utils/react-id.ts
@@ -0,0 +1,9 @@
+import { v4 as uuidV4 } from 'uuid';
+
+/**
+ * Generate a unique id for react components
+ * @returns a unique id
+ */
+export default function nextId() {
+  return `id-${uuidV4()}`;
+}