#3235: Do not assume custom fields existing

NCI-Agency · Dec 21, 2020 · 06e3384 · 06e3384
1 parent d44a8f7
commit 06e3384
Showing 1 changed file with 22 additions and 19 deletions.
diff --git a/client/src/models/Person.js b/client/src/models/Person.js
@@ -326,43 +326,46 @@ export default class Person extends Model {
     }
   }
 
-  static filterShowPageFields(fieldsArrayFromConfig) {
+  getNumberOfFieldsInLeftColumn() {
+    return this.isPrincipal()
+      ? Settings.fields.principal.person.numberOfFieldsInLeftColumn
+      : Settings.fields.advisor.person.numberOfFieldsInLeftColumn
+  }
+
+  getShowPageFieldsOrdered() {
+    const fieldsArrayFromConfig = this.isPrincipal()
+      ? Settings.fields.principal.person.showPageOrderedFields
+      : Settings.fields.advisor.person.showPageOrderedFields
+
+    return Person.filterInvalidShowPageFields(
+      fieldsArrayFromConfig || [],
+      this.role
+    )
+  }
+
+  static filterInvalidShowPageFields(fieldsArrayFromConfig, role) {
     return fieldsArrayFromConfig.filter(field => {
       if (
         Settings.fields.person[field] ||
-        Settings.fields.person.customFields[field]
+        Settings.fields.person?.customFields?.[field]
       ) {
         return true
       }
       API.logOnServer(
         "WARN",
         "Person.js",
         356,
-        `Wrong field name in dictionary.fields.${this.role.toLowerCase()}.showPageOrderedFields, field name: ${field}`
+        `Wrong field name in dictionary.fields.${role.toLowerCase()}.showPageOrderedFields, field name: ${field}`
       )
       return false
     })
   }
 
-  getNumberOfFieldsInLeftColumn() {
-    return this.isPrincipal()
-      ? Settings.fields.principal.person.numberOfFieldsInLeftColumn
-      : Settings.fields.advisor.person.numberOfFieldsInLeftColumn
-  }
-
-  getShowPageFieldsOrdered() {
-    const fieldsArrayFromConfig = this.isPrincipal()
-      ? Settings.fields.principal.person.showPageOrderedFields
-      : Settings.fields.advisor.person.showPageOrderedFields
-
-    return Person.filterShowPageFields(fieldsArrayFromConfig)
-  }
-
   getNormalFieldsOrdered() {
     return (
       this.getShowPageFieldsOrdered()
         // filter out custom fields
-        .filter(key => !Person.customFields[key])
+        .filter(key => !Person?.customFields?.[key])
     )
   }
 
@@ -371,7 +374,7 @@ export default class Person extends Model {
     return (
       this.getShowPageFieldsOrdered()
         // filter out non-custom fields
-        .filter(key => Person.customFields[key])
+        .filter(key => Person?.customFields?.[key])
         .reduce((accum, key) => {
           accum[key] = Person.customFields[key]
           return accum