fix: intervention data load in edit panel

naturalsolutions · Aug 21, 2021 · 443b108 · 443b108
1 parent 0f2054a
commit 443b108
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/frontend/components/Form/useDate.tsx b/frontend/components/Form/useDate.tsx
@@ -66,18 +66,18 @@ const DatePicker: React.FC<DatePickerProps> = ({
       <Controller
         control={control}
         name={name}
-        defaultValue={new Date()}
+        defaultValue={""}
         render={({ onChange, value }) => (
           <>
             <KeyboardDatePicker
-              disableToolbar
+              disableToolbar={false}
               fullWidth
               variant="dialog"
               inputVariant="outlined"
               format={setLocaleFormat(router.locale)}
               margin="dense"
               label={label}
-              value={value ? value : new Date()}
+              value={value ? value : ""}
               onChange={onChange}
               InputLabelProps={{ shrink: true }}
               error={Boolean(error)}

diff --git a/frontend/components/Interventions/Panel/Header.tsx b/frontend/components/Interventions/Panel/Header.tsx
@@ -45,8 +45,7 @@ const InterventionPanelHeader: FC<InterventionPanelHeaderProps> = ({
   const periodDate =
     !intervention.done &&
     !intervention.properties.cancelled &&
-    intervention.intervention_start_date &&
-    intervention.intervention_end_date
+    intervention.intervention_start_date
       ? `Prévue pour le ${new Date(
           intervention.intervention_start_date
         )?.toLocaleDateString()}`

diff --git a/frontend/components/Interventions/Panel/Panel.tsx b/frontend/components/Interventions/Panel/Panel.tsx
@@ -219,7 +219,7 @@ const InterventionsEdit: FC<IInterventionEditProps> = () => {
 
   useEffect(() => {
     const { query, route } = router;
-
+    setIntervention(undefined);
     if (
       route === "/[organizationSlug]/map" &&
       query.panel === "intervention-edit" &&