Fix key in mission form action list

MTES-MCT · Apr 8, 2024 · 634bbdf · 634bbdf
1 parent 46525d8
commit 634bbdf
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/frontend/src/features/Mission/components/MissionForm/ActionList/index.tsx b/frontend/src/features/Mission/components/MissionForm/ActionList/index.tsx
@@ -35,7 +35,7 @@ export function ActionList({
   onRemove,
   onSelect
 }: ActionListProps) {
-  const getMissionApiQuery = useGetMissionQuery(missionId || skipToken)
+  const getMissionApiQuery = useGetMissionQuery(missionId ?? skipToken)
 
   const allSortedMissionActionsForTimeline: Array<
     MissionActionForTimeline | EnvMissionAction.MissionActionForTimeline
@@ -118,13 +118,13 @@ export function ActionList({
               if (action.source === Mission.MissionSource.MONITORFISH) {
                 return (
                   <ActionCard
+                    // eslint-disable-next-line react/no-array-index-key
+                    key={index}
                     isSelected={action.index === currentIndex}
                     missionAction={action}
                     onSelect={() => onSelect(action.index!!)}
                   >
                     <FishActionCard
-                      // eslint-disable-next-line react/no-array-index-key
-                      key={index}
                       missionAction={action as MissionActionFormValues}
                       onRemove={() => onRemove(action.index!!)}
                     />
@@ -134,12 +134,13 @@ export function ActionList({
 
               if (action.source === Mission.MissionSource.MONITORENV) {
                 return (
-                  <ActionCard isSelected={false} missionAction={action}>
-                    <EnvActionCard
-                      // eslint-disable-next-line react/no-array-index-key
-                      key={index}
-                      missionAction={action as EnvMissionAction.MissionAction}
-                    />
+                  <ActionCard
+                    // eslint-disable-next-line react/no-array-index-key
+                    key={index}
+                    isSelected={false}
+                    missionAction={action}
+                  >
+                    <EnvActionCard missionAction={action as EnvMissionAction.MissionAction} />
                   </ActionCard>
                 )
               }