Merge development and solve conflicts

EyeSeeTea · Oct 3, 2024 · 0c1b32a · 0c1b32a
2 parents 416f097 + 49a6927
commit 0c1b32a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/src/webapp/pages/event-tracker/EventTrackerPage.tsx b/src/webapp/pages/event-tracker/EventTrackerPage.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from "react";
+import React, { useCallback, useEffect } from "react";
 import styled from "styled-components";
 import { Box, Button } from "@material-ui/core";
 import { useParams } from "react-router-dom";
@@ -55,6 +55,12 @@ export const EventTrackerPage: React.FC = React.memo(() => {
 
     const { dateRangeFilter } = useMapFilters();
 
+    const goToRiskSummaryForm = useCallback(() => {
+        goTo(RouteName.CREATE_FORM, {
+            formType: "risk-assessment-summary",
+        });
+    }, [goTo]);
+
     useEffect(() => {
         if (eventTrackerDetails) changeCurrentEventTrackerId(eventTrackerDetails);
     }, [changeCurrentEventTrackerId, eventTrackerDetails, id]);
@@ -106,9 +112,7 @@ export const EventTrackerPage: React.FC = React.memo(() => {
                             color="primary"
                             startIcon={<EditOutlined />}
                             onClick={() => {
-                                goTo(RouteName.CREATE_FORM, {
-                                    formType: "risk-assessment-summary",
-                                });
+                                goToRiskSummaryForm();
                             }}
                         >
                             {i18n.t("Create Risk Assessment")}
@@ -119,9 +123,7 @@ export const EventTrackerPage: React.FC = React.memo(() => {
                             color="secondary"
                             startIcon={<AddCircleOutline />}
                             onClick={() => {
-                                goTo(RouteName.CREATE_FORM, {
-                                    formType: "risk-assessment-summary",
-                                });
+                                goToRiskSummaryForm();
                             }}
                         >
                             {i18n.t("Add new Assessment")}

diff --git a/...ebapp/pages/form-page/disease-outbreak-event/utils/updateDiseaseOutbreakEventFormState.ts b/...ebapp/pages/form-page/disease-outbreak-event/utils/updateDiseaseOutbreakEventFormState.ts
@@ -14,21 +14,21 @@ import { applyRulesInFormState } from "./applyRulesInFormState";
 export function updateAndValidateFormState(
     prevFormState: FormState,
     updatedField: FormFieldState,
-    configirableForm: ConfigurableForm
+    configurableForm: ConfigurableForm
 ): FormState {
     const updatedForm = updateFormStateAndApplySideEffects(prevFormState, updatedField);
 
     const hasUpdatedFieldAnyRule =
-        configirableForm.rules.filter(rule => rule.fieldId === updatedField.id).length > 0;
+        configurableForm.rules.filter(rule => rule.fieldId === updatedField.id).length > 0;
 
     const updatedFormWithRulesApplied = hasUpdatedFieldAnyRule
-        ? applyRulesInFormState(updatedForm, updatedField, configirableForm.rules)
+        ? applyRulesInFormState(updatedForm, updatedField, configurableForm.rules)
         : updatedForm;
 
     const fieldValidationErrors = validateFormState(
         updatedFormWithRulesApplied,
         updatedField,
-        configirableForm
+        configurableForm
     );
 
     const updatedFormStateWithErrors = updateFormStateWithFieldErrors(