merged permissible values warning

cidgoh · Aug 22, 2024 · 761db04 · 761db04
1 parent f3e5fb4
commit 761db04
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/lib/Toolbar.js b/lib/Toolbar.js
@@ -485,13 +485,15 @@ class Toolbar {
                     if (field.multivalued === true) {
                       nv = v
                         .split(MULTIVALUED_DELIMITER)
-                        .map((_v) =>
-                          _v in merged_permissible_values
-                            ? titleOverText(merged_permissible_values[_v])
-                            : _v
-                        )
+                        .map((_v) => {
+                          if (!(_v in merged_permissible_values)) console.warn(`${_v} not in merged_permissible_values ${Object.keys(merged_permissible_values)}`);
+                          return _v in merged_permissible_values
+                          ? titleOverText(merged_permissible_values[_v])
+                          : _v
+                        })
                         .join(MULTIVALUED_DELIMITER);
                     } else {
+                      if (!(v in merged_permissible_values)) console.warn(`${_v} not in merged_permissible_values ${Object.keys(merged_permissible_values)}`);
                       nv =
                         v in merged_permissible_values
                           ? titleOverText(merged_permissible_values[v])

diff --git a/lib/editors/KeyValueEditor.js b/lib/editors/KeyValueEditor.js
@@ -160,7 +160,10 @@ export const multiKeyValueListRenderer = (field) => {
     if (!isEmptyUnitVal(value)) {
       const label = value
         .split(MULTIVALUED_DELIMITER)
-        .map((key) => titleOverText(merged_permissible_values[key]))
+        .map((key) => {
+          if (!(key in merged_permissible_values)) console.warn(field, merged_permissible_values, value);
+          return key in merged_permissible_values ? titleOverText(merged_permissible_values[key]) : key
+        })
         .join(MULTIVALUED_DELIMITER);
       TD.innerHTML = `<div class="htAutocompleteArrow">▼</div>${label}`; // This directly sets what is displayed in the cell
     }

diff --git a/lib/utils/fields.js b/lib/utils/fields.js
@@ -259,5 +259,9 @@ export const formatEscapeHTML = (string) => {
 };
 
 export function titleOverText(enm) {
-  return typeof enm.title !== 'undefined' ? enm.title : enm.text;
+  try {
+    return typeof enm.title !== 'undefined' ? enm.title : enm.text;
+  } catch (e) {
+    console.error(e, enm);
+  }
 }