[front-2]: fix

front/src/api/floris/service.ts

@@ -6,7 +6,9 @@ import { WindmillData } from './types';
 import { getWindmillDataRequestParams } from './utils';
 
 export const getWindmillData = (formValues: Partial<FlorisFormValues>) => {
+  const { park } = formValues;
   const params = getWindmillDataRequestParams(formValues);
-  const url = `${FLORIS_ENDPOINTS.getWindmillData}?${params}`;
+  const parkPath = park ? `/${park.id}/` : '';
+  const url = `${FLORIS_ENDPOINTS.getWindmillData}${parkPath}?${params}`;
   return api.get<WindmillData>(url);
 };

front/src/api/floris/utils.ts

@@ -5,20 +5,25 @@ import { FLORIS_PLOTS } from './constants';
 export const getWindmillDataRequestParams = (
   formValues: Partial<FlorisFormValues>,
 ) => {
-  const layoutX = formValues.turbines
+  let params = '';
-    ?.map((row) => `layout_x=${row.x}`)
+  if (formValues.turbines) {
-    .join('&');
+    const layoutX = formValues.turbines
-  const layoutY = formValues.turbines
+      ?.map((row) => `layout_x=${row.x}`)
-    ?.map((row) => `layout_y=${row.y}`)
+      .join('&');
-    .join('&');
+    const layoutY = formValues.turbines
-  const yawAngle = formValues.turbines
+      ?.map((row) => `layout_y=${row.y}`)
-    ?.map((row) => `yaw_angle=${row.angle}`)
+      .join('&');
-    .join('&');
+    const yawAngle = formValues.turbines
+      ?.map((row) => `yaw_angle=${row.angle}`)
+      .join('&');
+    params += `${layoutX}&${layoutY}&${yawAngle}`;
+  }
   const plots = Object.values(FLORIS_PLOTS)
     .filter((_, i) => formValues.plots?.[i])
     .map((p) => `plots=${p.name}`)
     .join('&');
   const dateStart = `date_start=${formValues.dateFrom?.substring(0, 10)}`;
   const dateEnd = `date_end=${formValues.dateTo?.substring(0, 10)}`;
-  return `${layoutX}&${layoutY}&${yawAngle}&${plots}&${dateStart}&${dateEnd}`;
+  params += `&${plots}&${dateStart}&${dateEnd}`;
+  return params;
 };

front/src/components/ux/floris-form/component.tsx

@@ -64,7 +64,13 @@ export function FlorisForm({
   const handleManulEntryCheckboxChange = (
     event: React.ChangeEvent<HTMLInputElement>,
   ) => {
-    setIsManualEntry(event.target.checked);
+    const { checked } = event.target;
+    setIsManualEntry(checked);
+    if (checked) {
+      reset({ ...getValues(), park: undefined });
+    } else {
+      reset({ ...getValues(), turbines: undefined });
+    }
   };
 
   return (