Merge pull request #27 from EyeSeeTea/fix/demo-fixes

Misc Fixes
EyeSeeTea · Nov 7, 2024 · eb0bca3 · eb0bca3
2 parents 7a42023 + e3262b0
commit eb0bca3
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 22 deletions.
diff --git a/src/domain/usecases/utils/disease-outbreak/SaveDiseaseOutbreak.ts b/src/domain/usecases/utils/disease-outbreak/SaveDiseaseOutbreak.ts
@@ -17,12 +17,13 @@ export function saveDiseaseOutbreak(
         teamMemberRepository: TeamMemberRepository;
         roleRepository: RoleRepository;
     },
-    diseaseOutbreakEventBaseAttrs: DiseaseOutbreakEventBaseAttrs
+    diseaseOutbreakEvent: DiseaseOutbreakEventBaseAttrs
 ): FutureData<Id> {
     return repositories.diseaseOutbreakEventRepository
-        .save(diseaseOutbreakEventBaseAttrs)
-        .flatMap(() => {
-            return saveIncidentManagerTeamMemberRole(repositories, diseaseOutbreakEventBaseAttrs);
+        .save(diseaseOutbreakEvent)
+        .flatMap((diseaseOutbreakId: Id) => {
+            const diseaseOutbreakEventWithId = { ...diseaseOutbreakEvent, id: diseaseOutbreakId };
+            return saveIncidentManagerTeamMemberRole(repositories, diseaseOutbreakEventWithId);
         });
 }
 

diff --git a/src/webapp/pages/form-page/mapFormStateToEntityData.ts b/src/webapp/pages/form-page/mapFormStateToEntityData.ts
@@ -460,8 +460,9 @@ function mapFormStateToRiskAssessmentQuestionnaire(
                     formData.options,
                     index.toString()
                 );
+
             return {
-                id: customSection.id.replace("additionalQuestions", ""),
+                id: customSection.id.replace("additionalQuestions", "").replace(`_${index}`, ""),
                 question: allFields.find(field => field.id.includes(`custom-question${index}`))
                     ?.value as string,
                 likelihood: likelihoodOption,

diff --git a/src/webapp/pages/form-page/risk-assessment/mapRiskAssessmentToInitialFormState.ts b/src/webapp/pages/form-page/risk-assessment/mapRiskAssessmentToInitialFormState.ts
@@ -754,7 +754,7 @@ function getRiskAssessmentCustomQuestionSection(
         options;
     const riskAssesssmentQuestionFormSection: FormSectionState = {
         title: title,
-        id: questionId ? `${id}${questionId}` : `${id}`,
+        id: questionId ? `${id}${questionId}` : `${id}_${index}`,
         isVisible: true,
         fields: [
             {

diff --git a/src/webapp/pages/form-page/useForm.ts b/src/webapp/pages/form-page/useForm.ts
@@ -20,7 +20,6 @@ import {
     addNewResponseActionSection,
     getAnotherResponseActionSection,
 } from "./incident-action/mapIncidentActionToInitialFormState";
-import { DiseaseOutbreakEvent } from "../../../domain/entities/disease-outbreak-event/DiseaseOutbreakEvent";
 
 export type GlobalMessage = {
     text: string;
@@ -62,15 +61,12 @@ export function useForm(formType: FormType, id?: Id): State {
     const [globalMessage, setGlobalMessage] = useState<Maybe<GlobalMessage>>();
     const [formState, setFormState] = useState<FormLoadState>({ kind: "loading" });
     const [configurableForm, setConfigurableForm] = useState<ConfigurableForm>();
-    const [currentEventTrackerState, setCurrentEventTrackerState] =
-        useState<Maybe<DiseaseOutbreakEvent>>();
+
     const [formLabels, setFormLabels] = useState<FormLables>();
     const [isLoading, setIsLoading] = useState(false);
     const currentEventTracker = getCurrentEventTracker();
 
     useEffect(() => {
-        if (currentEventTrackerState?.id === currentEventTracker?.id) return;
-
         compositionRoot.getWithOptions.execute(formType, currentEventTracker, id).run(
             formData => {
                 setConfigurableForm(formData);
@@ -79,7 +75,6 @@ export function useForm(formType: FormType, id?: Id): State {
                     kind: "loaded",
                     data: mapEntityToFormState(formData, !!id),
                 });
-                setCurrentEventTrackerState(currentEventTracker);
             },
             error => {
                 setFormState({
@@ -90,16 +85,9 @@ export function useForm(formType: FormType, id?: Id): State {
                     text: i18n.t(`An error occurred while loading form: ${error.message}`),
                     type: "error",
                 });
-                setCurrentEventTrackerState(currentEventTracker);
             }
         );
-    }, [
-        compositionRoot.getWithOptions,
-        formType,
-        id,
-        currentEventTracker,
-        currentEventTrackerState?.id,
-    ]);
+    }, [compositionRoot.getWithOptions, formType, id, currentEventTracker]);
 
     const handleAddNew = useCallback(() => {
         if (formState.kind !== "loaded" || !configurableForm) return;

diff --git a/src/webapp/pages/incident-action-plan/useIncidentActionPlan.ts b/src/webapp/pages/incident-action-plan/useIncidentActionPlan.ts
@@ -15,6 +15,8 @@ import {
     IncidentActionPlan,
 } from "../../../domain/entities/incident-action-plan/IncidentActionPlan";
 import { Option } from "../../components/utils/option";
+import { useCurrentEventTracker } from "../../contexts/current-event-tracker-context";
+import { DiseaseOutbreakEvent } from "../../../domain/entities/disease-outbreak-event/DiseaseOutbreakEvent";
 
 export type IncidentActionFormSummaryData = {
     subTitle: string;
@@ -28,6 +30,7 @@ export type UIIncidentActionOptions = {
 
 export function useIncidentActionPlan(id: Id) {
     const { compositionRoot } = useAppContext();
+    const { changeCurrentEventTracker, getCurrentEventTracker } = useCurrentEventTracker();
 
     const [incidentAction, setIncidentAction] = useState<Option[] | undefined>();
     const [actionPlanSummary, setActionPlanSummary] = useState<IncidentActionFormSummaryData>();
@@ -87,7 +90,15 @@ export function useIncidentActionPlan(id: Id) {
             incidentActionPlan => {
                 const incidentActionExists = !!incidentActionPlan?.actionPlan?.id;
                 const incidentActionOptions = incidentActionPlan?.incidentActionOptions;
-
+                const currentEventTracker = getCurrentEventTracker();
+                if (incidentActionExists && currentEventTracker) {
+                    const updatedEventTracker = new DiseaseOutbreakEvent({
+                        ...currentEventTracker,
+                        incidentActionPlan: incidentActionPlan,
+                    });
+
+                    changeCurrentEventTracker(updatedEventTracker);
+                }
                 setIncidentActionExists(incidentActionExists);
                 setIncidentActionOptions(mapIncidentActionOptionsToTable(incidentActionOptions));
                 setIncidentAction(getIncidentActionFormSummary(incidentActionPlan));
@@ -99,7 +110,7 @@ export function useIncidentActionPlan(id: Id) {
                 setGlobalMessage(`Event tracker with id: ${id} does not exist`);
             }
         );
-    }, [compositionRoot, id]);
+    }, [compositionRoot, id, changeCurrentEventTracker, getCurrentEventTracker]);
 
     return {
         incidentActionExists: incidentActionExists,