Merge pull request #1719 from bcgov/1702-fix-default-commit-handler-i…

…ssue Fix: add null and undefined values to optional fields in json schemas
bcgov · Jul 21, 2023 · e410b49 · e410b49
2 parents 921267c + 4ba0cae
commit e410b49
Show file tree

Hide file tree

Showing 33 changed files with 358 additions and 384 deletions.
diff --git a/app/components/Contact/ContactForm.tsx b/app/components/Contact/ContactForm.tsx
@@ -140,7 +140,7 @@ const ContactForm: React.FC<Props> = (props) => {
             id: formChange.id,
             formDataRecordId: formChange.formDataRecordId,
             newFormData: formData,
-            isUniqueValue: true,
+            isUniqueValue: isUniqueValue,
             changeStatus: "pending",
           },
         },

diff --git a/app/components/Form/ProjectForm.tsx b/app/components/Form/ProjectForm.tsx
@@ -314,20 +314,27 @@ const ProjectForm: React.FC<Props> = (props) => {
         },
         projectType: {
           ...projectSchema.properties.projectType,
-          anyOf: query.allProjectTypes.edges
-            .map(({ node }) => {
+          anyOf: [
+            ...query.allProjectTypes.edges.map(({ node }) => {
               return {
                 type: "string",
                 title: node.name,
                 enum: [node.name],
                 value: node.name,
               };
-            })
-            .sort((a, b) => {
-              if (b.value === "Other") {
-                return -1;
-              } else return 0;
             }),
+            // Add null as an option
+            {
+              type: "null",
+              value: null,
+              enum: [null],
+              title: "N/A",
+            },
+          ].sort((a, b) => {
+            if (b.value === "Other") {
+              return -1;
+            } else return 0;
+          }),
         },
         projectStatusId: {
           ...projectSchema.properties.projectStatusId,

diff --git a/app/components/Form/ProjectMilestoneReportForm.tsx b/app/components/Form/ProjectMilestoneReportForm.tsx
@@ -221,7 +221,7 @@ const ProjectMilestoneReportForm: React.FC<Props> = (props) => {
           formChangePatch: {
             newFormData: {
               ...formData,
-              hasExpenses: reportTypeRecord.node.hasExpenses,
+              hasExpenses: reportTypeRecord?.node.hasExpenses,
             },
           },
         },
@@ -233,7 +233,7 @@ const ProjectMilestoneReportForm: React.FC<Props> = (props) => {
             id: milestoneNode.id,
             newFormData: {
               ...milestoneChangeData,
-              hasExpenses: reportTypeRecord.node.hasExpenses,
+              hasExpenses: reportTypeRecord?.node.hasExpenses,
             },
             changeStatus: "pending",
           },

diff --git a/app/components/Form/SelectProjectTypeWidget.tsx b/app/components/Form/SelectProjectTypeWidget.tsx
diff --git a/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js b/app/cypress/e2e/cif/project-revision/create-first-project-revision.cy.js
@@ -485,6 +485,7 @@ describe("when creating a project, the project page", () => {
     cy.findByText(/TEIMP End Date/i)
       .next()
       .contains(/Jan(\.)? 1, 2022/);
+    cy.contains("Changes saved").should("be.visible"); // a check to make sure happo is taking the right screenshot
     cy.happoAndAxe("Auto-generate quarterly reports", "generated", "main");
 
     //generate annual reports
@@ -509,6 +510,7 @@ describe("when creating a project, the project page", () => {
       .next()
       .contains(/Feb(\.)? 2, 2024/);
     cy.findAllByText(/^on track$/i).should("have.length", 5);
+    cy.contains("Changes saved").should("be.visible"); // a check to make sure happo is taking the right screenshot
     cy.happoAndAxe("Auto-generate annual reports", "generated", "main");
   });
 

diff --git a/app/data/jsonSchemaForm/contactSchema.ts b/app/data/jsonSchemaForm/contactSchema.ts
@@ -17,26 +17,31 @@ const contactSchema = {
       pattern: "^[\\.\\w-]+@([\\w-]+\\.)+[\\w-]{2,4}$",
     },
     phone: {
-      type: "string",
+      type: ["null", "string"],
       title: "Phone",
       pattern:
         "^(\\+?\\d{1,2}[\\s,-]?)?\\(?\\d{3}\\)?[\\s.-]?\\d{3}[\\s.-]?\\d{4}$",
+      default: null,
     },
     phoneExt: {
-      type: "string",
+      type: ["null", "string"],
       title: "Phone Extension",
+      default: null,
     },
     companyName: {
-      type: "string",
+      type: ["null", "string"],
       title: "Company Name",
+      default: null,
     },
     contactPosition: {
-      type: "string",
+      type: ["null", "string"],
       title: "Position",
+      default: null,
     },
     comments: {
-      type: "string",
+      type: ["null", "string"],
       title: "Comments",
+      default: null,
     },
   },
 };

diff --git a/app/data/jsonSchemaForm/projectEmissionIntensitySchema.ts b/app/data/jsonSchemaForm/projectEmissionIntensitySchema.ts