[Review] code review

MTES-MCT · May 23, 2023 · c3b4b5d · c3b4b5d
1 parent 966b98d
commit c3b4b5d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 19 deletions.
diff --git a/frontend/src/features/missions/MissionForm/ActionsForm.tsx b/frontend/src/features/missions/MissionForm/ActionsForm.tsx
@@ -48,22 +48,19 @@ export function ActionsForm({ currentActionIndex, form, remove, setCurrentAction
         })
       })
     )
-    if (envActions?.length === 0) {
-      setCurrentActionIndex(0)
-    }
+
+    setCurrentActionIndex(0)
   }
 
   const handleAddControlAction = () => {
     unshift(actionFactory({ actionType: ActionTypeEnum.CONTROL }))
-    if (envActions?.length === 0) {
-      setCurrentActionIndex(0)
-    }
+
+    setCurrentActionIndex(0)
   }
   const handleAddNoteAction = () => {
     unshift(actionFactory({ actionType: ActionTypeEnum.NOTE }))
-    if (envActions?.length === 0) {
-      setCurrentActionIndex(0)
-    }
+
+    setCurrentActionIndex(0)
   }
   const handleSelectAction = id => () => setCurrentActionIndex(envActions && envActions.findIndex(a => a.id === id))
   const handleRemoveAction = id => e => {

diff --git a/frontend/src/features/missions/MissionForm/index.tsx b/frontend/src/features/missions/MissionForm/index.tsx
@@ -33,7 +33,7 @@ export function Mission() {
 
   const missionFormikValues = useMemo(() => {
     if (!id) {
-      return missionFactory(undefined)
+      return missionFactory()
     }
 
     return missionFactory(missionToEdit)
@@ -62,11 +62,9 @@ export function Mission() {
         validateOnMount={false}
         validationSchema={MissionSchema}
       >
-        {() => (
-          <FormikForm>
-            <MissionForm id={id} mission={missionToEdit} setShouldValidateOnChange={setShouldValidateOnChange} />
-          </FormikForm>
-        )}
+        <FormikForm>
+          <MissionForm id={id} mission={missionToEdit} setShouldValidateOnChange={setShouldValidateOnChange} />
+        </FormikForm>
       </Formik>
     </EditMissionWrapper>
   )

diff --git a/frontend/src/features/missions/Missions.helpers.ts b/frontend/src/features/missions/Missions.helpers.ts
@@ -62,7 +62,7 @@ export const actionFactory = ({
   }
 }
 
-export const missionFactory = (mission: Mission | undefined): Mission | NewMission => {
+export const missionFactory = (mission?: Mission | undefined): Mission | NewMission => {
   let formattedMission = {
     closedBy: '',
     controlUnits: [controlUnitFactory()],

diff --git a/frontend/src/hooks/useSyncFormValuesWithRedux.ts b/frontend/src/hooks/useSyncFormValuesWithRedux.ts
@@ -1,13 +1,15 @@
 import { useFormikContext } from 'formik'
 import _ from 'lodash'
 import { useEffect, useMemo } from 'react'
-import { useDispatch } from 'react-redux'
 
 import { setIsFormDirty } from '../domain/shared_slices/MissionsState'
+import { useAppDispatch } from './useAppDispatch'
 
-export const useSyncFormValuesWithRedux = (setFormValues: (values) => void) => {
+import type { ActionCreatorWithPayload } from '@reduxjs/toolkit'
+
+export const useSyncFormValuesWithRedux = (setFormValues: ActionCreatorWithPayload<any, string>) => {
   const { dirty, values } = useFormikContext()
-  const dispatch = useDispatch()
+  const dispatch = useAppDispatch()
 
   const dispatchFormUpdate = useMemo(() => {
     const throttled = newValues => {