#3368: Fix create/edit pages for person, report, task

As they assume custom fields exist
NCI-Agency · Dec 21, 2020 · e6b1f10 · e6b1f10
1 parent 66fb0ed
commit e6b1f10
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 50 deletions.
diff --git a/client/src/pages/people/Edit.js b/client/src/pages/people/Edit.js
@@ -94,14 +94,16 @@ const PersonEdit = ({ pageDispatchers }) => {
     ? "Update profile"
     : "Save Person"
 
-  // set initial invisible custom fields
-  person[DEFAULT_CUSTOM_FIELDS_PARENT][
-    INVISIBLE_CUSTOM_FIELDS_FIELD
-  ] = getInvisibleFields(
-    Settings.fields.person.customFields,
-    DEFAULT_CUSTOM_FIELDS_PARENT,
-    person
-  )
+  if (Settings.fields.person.customFields) {
+    // set initial invisible custom fields
+    person[DEFAULT_CUSTOM_FIELDS_PARENT][
+      INVISIBLE_CUSTOM_FIELDS_FIELD
+    ] = getInvisibleFields(
+      Settings.fields.person.customFields,
+      DEFAULT_CUSTOM_FIELDS_PARENT,
+      person
+    )
+  }
 
   return (
     <div>

diff --git a/client/src/pages/people/New.js b/client/src/pages/people/New.js
@@ -23,14 +23,16 @@ const PersonNew = ({ pageDispatchers }) => {
   })
 
   const person = new Person()
-  // set initial invisible custom fields
-  person[DEFAULT_CUSTOM_FIELDS_PARENT][
-    INVISIBLE_CUSTOM_FIELDS_FIELD
-  ] = getInvisibleFields(
-    Settings.fields.person.customFields,
-    DEFAULT_CUSTOM_FIELDS_PARENT,
-    person
-  )
+  if (Settings.fields.person.customFields) {
+    // set initial invisible custom fields
+    person[DEFAULT_CUSTOM_FIELDS_PARENT][
+      INVISIBLE_CUSTOM_FIELDS_FIELD
+    ] = getInvisibleFields(
+      Settings.fields.person.customFields,
+      DEFAULT_CUSTOM_FIELDS_PARENT,
+      person
+    )
+  }
 
   return <PersonForm initialValues={person} title="Create a new Person" />
 }

diff --git a/client/src/pages/reports/Edit.js b/client/src/pages/reports/Edit.js
@@ -138,14 +138,17 @@ const ReportEdit = ({ pageDispatchers }) => {
     report.getTasksEngagementAssessments(),
     report.getAttendeesEngagementAssessments()
   )
-  // set initial invisible custom fields
-  reportInitialValues[DEFAULT_CUSTOM_FIELDS_PARENT][
-    INVISIBLE_CUSTOM_FIELDS_FIELD
-  ] = getInvisibleFields(
-    Settings.fields.report.customFields,
-    DEFAULT_CUSTOM_FIELDS_PARENT,
-    report
-  )
+
+  if (Settings.fields.report.customFields) {
+    // set initial invisible custom fields
+    reportInitialValues[DEFAULT_CUSTOM_FIELDS_PARENT][
+      INVISIBLE_CUSTOM_FIELDS_FIELD
+    ] = getInvisibleFields(
+      Settings.fields.report.customFields,
+      DEFAULT_CUSTOM_FIELDS_PARENT,
+      report
+    )
+  }
   reportInitialValues.tasks = Task.fromArray(reportInitialValues.tasks)
   reportInitialValues.reportPeople = Person.fromArray(
     reportInitialValues.reportPeople

diff --git a/client/src/pages/reports/New.js b/client/src/pages/reports/New.js
@@ -29,13 +29,15 @@ const ReportNew = ({ pageDispatchers }) => {
   const report = new Report()
 
   // set initial invisible custom fields
-  report[DEFAULT_CUSTOM_FIELDS_PARENT][
-    INVISIBLE_CUSTOM_FIELDS_FIELD
-  ] = getInvisibleFields(
-    Settings.fields.report.customFields,
-    DEFAULT_CUSTOM_FIELDS_PARENT,
-    report
-  )
+  if (Settings.fields.report.customFields) {
+    report[DEFAULT_CUSTOM_FIELDS_PARENT][
+      INVISIBLE_CUSTOM_FIELDS_FIELD
+    ] = getInvisibleFields(
+      Settings.fields.report.customFields,
+      DEFAULT_CUSTOM_FIELDS_PARENT,
+      report
+    )
+  }
 
   if (currentUser && currentUser.uuid) {
     const person = new Person(currentUser)

diff --git a/client/src/pages/tasks/Edit.js b/client/src/pages/tasks/Edit.js
@@ -125,15 +125,16 @@ const TaskEdit = ({ pageDispatchers }) => {
   }
   const task = new Task(data ? data.task : {})
 
-  // set initial invisible custom fields
-  task[DEFAULT_CUSTOM_FIELDS_PARENT][
-    INVISIBLE_CUSTOM_FIELDS_FIELD
-  ] = getInvisibleFields(
-    Settings.fields.task.customFields,
-    DEFAULT_CUSTOM_FIELDS_PARENT,
-    task
-  )
-
+  if (Settings.fields.task.customFields) {
+    // set initial invisible custom fields
+    task[DEFAULT_CUSTOM_FIELDS_PARENT][
+      INVISIBLE_CUSTOM_FIELDS_FIELD
+    ] = getInvisibleFields(
+      Settings.fields.task.customFields,
+      DEFAULT_CUSTOM_FIELDS_PARENT,
+      task
+    )
+  }
   return (
     <div>
       <RelatedObjectNotes

diff --git a/client/src/pages/tasks/New.js b/client/src/pages/tasks/New.js
@@ -93,15 +93,16 @@ const TaskNewConditional = ({
     task.taskedOrganizations = [new Organization(data.organization)]
   }
 
-  // set initial invisible custom fields
-  task[DEFAULT_CUSTOM_FIELDS_PARENT][
-    INVISIBLE_CUSTOM_FIELDS_FIELD
-  ] = getInvisibleFields(
-    Settings.fields.task.customFields,
-    DEFAULT_CUSTOM_FIELDS_PARENT,
-    task
-  )
-
+  if (Settings.fields.task.customFields) {
+    // set initial invisible custom fields
+    task[DEFAULT_CUSTOM_FIELDS_PARENT][
+      INVISIBLE_CUSTOM_FIELDS_FIELD
+    ] = getInvisibleFields(
+      Settings.fields.task.customFields,
+      DEFAULT_CUSTOM_FIELDS_PARENT,
+      task
+    )
+  }
   return (
     <TaskForm
       initialValues={task}

diff --git a/...t/tests/webdriver/baseSpecs/myOrg.spec.js → ...webdriver/customFieldsSpecs/myOrg.spec.js b/...t/tests/webdriver/baseSpecs/myOrg.spec.js → ...webdriver/customFieldsSpecs/myOrg.spec.js
diff --git a/client/tests/webdriver/noCustomFieldsSpecs/anetObjectForms.spec.js b/client/tests/webdriver/noCustomFieldsSpecs/anetObjectForms.spec.js
@@ -1,8 +1,8 @@
 // import { expect } from "chai"
 import CreateAuthorizationGroup from "../pages/createAuthorizationGroup.page"
+import CreateOrganization from "../pages/createNewOrganization.page"
 import CreatePerson from "../pages/createNewPerson.page"
 import CreateTask from "../pages/createNewTask.page"
-import CreateOrganization from "../pages/CreateOrganization.page"
 import CreateReport from "../pages/createReport.page"
 import EditPosition from "../pages/editPosition.page"
 import CreateNewLocation from "../pages/location/createNewLocation.page"