Merge branch 'feature/full-create-edit-event-form' into feature/add-d…

…ata-source-create-event
EyeSeeTea · Aug 22, 2024 · 772ca31 · 772ca31
2 parents f5721ce + d3bb205
commit 772ca31
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/src/webapp/components/form/__tests__/Form.spec.tsx b/src/webapp/components/form/__tests__/Form.spec.tsx
@@ -25,7 +25,7 @@ describe("Given Form component", () => {
 
             const view = getView(formProps);
 
-            expect(await view.findByText("Save & continue")).toBeInTheDocument();
+            expect(await view.findByText("Save & Continue")).toBeInTheDocument();
         });
 
         it("then shows save button disabled if form is not valid", async () => {
@@ -206,7 +206,7 @@ function givenFormProps(): FormProps {
             id: "Form Id",
             title: "Form Title",
             subtitle: "Form Subtitle",
-            saveButtonLabel: "Save & continue",
+            saveButtonLabel: "Save & Continue",
             cancelButtonLabel: "Cancel & back",
             isValid: false,
             sections: [

diff --git a/src/webapp/pages/form-page/disease-outbreak-event/utils/mapEntityToInitialFormState.ts b/src/webapp/pages/form-page/disease-outbreak-event/utils/mapEntityToInitialFormState.ts
@@ -75,7 +75,7 @@ export function mapEntityToInitialFormState(
     return {
         id: diseaseOutbreakEvent?.id || "",
         title: "Create Event",
-        saveButtonLabel: "Save & continue",
+        saveButtonLabel: "Save & Continue",
         isValid: false,
         sections: [
             {
@@ -272,7 +272,6 @@ export function mapEntityToInitialFormState(
                         value: diseaseOutbreakEvent?.emerged.narrative || "",
                         multiline: false,
                         maxWidth: "600px",
-                        required: true,
                         showIsRequired: false,
                     },
                 ],
@@ -309,7 +308,6 @@ export function mapEntityToInitialFormState(
                         value: diseaseOutbreakEvent?.detected.narrative || "",
                         multiline: false,
                         maxWidth: "600px",
-                        required: true,
                         showIsRequired: false,
                     },
                 ],
@@ -346,7 +344,6 @@ export function mapEntityToInitialFormState(
                         value: diseaseOutbreakEvent?.notified.narrative || "",
                         multiline: false,
                         maxWidth: "600px",
-                        required: true,
                         showIsRequired: false,
                     },
                 ],
@@ -619,7 +616,6 @@ export function mapEntityToInitialFormState(
                         title: "8. Response narrative",
                         id: "8. Response narrative",
                         isVisible: true,
-                        required: true,
                         fields: [
                             {
                                 id: getFieldIdFromIdsDictionary(
@@ -633,7 +629,6 @@ export function mapEntityToInitialFormState(
                                     diseaseOutbreakEvent?.earlyResponseActions.responseNarrative ||
                                     "",
                                 multiline: true,
-                                required: true,
                                 showIsRequired: false,
                             },
                         ],