regression during refactor

cidgoh · Aug 23, 2024 · e7abc84 · e7abc84
1 parent 62a7304
commit e7abc84
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 23 deletions.
diff --git a/lib/Toolbar.js b/lib/Toolbar.js
@@ -15,12 +15,7 @@ import {
   prependToSheet,
 } from '@/lib/utils/files';
 import { nullValuesToString, isEmptyUnitVal } from '@/lib/utils/general';
-import {
-  MULTIVALUED_DELIMITER,
-  singleFieldDisplayName,
-  multiFieldDisplayName,
-  mergedPermissibleValues,
-} from '@/lib/utils/fields';
+import { MULTIVALUED_DELIMITER, titleOverText } from '@/lib/utils/fields';
 import { takeKeys, invert } from '@/lib/utils/objects';
 import {
   findBestLocaleMatch,
@@ -462,11 +457,41 @@ class Toolbar {
                   const field = findField(k);
                   let nv = v;
                   if (field.sources && !isEmptyUnitVal(v)) {
-                    const permissible_values = mergedPermissibleValues(field);
+                    const merged_permissible_values = field.sources.reduce(
+                      (acc, source) => {
+                        return Object.assign(
+                          acc,
+                          field.permissible_values[source]
+                        );
+                      },
+                      {}
+                    );
                     if (field.multivalued === true) {
-                      nv = multiFieldDisplayName(permissible_values)(v);
+                      nv = v
+                        .split(MULTIVALUED_DELIMITER)
+                        .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 {
-                      nv = singleFieldDisplayName(permissible_values)(v);
+                      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])
+                          : v;
                     }
                   }
                   return [k, nv];

diff --git a/lib/editors/KeyValueEditor.js b/lib/editors/KeyValueEditor.js
@@ -1,5 +1,5 @@
 import Handsontable from 'handsontable';
-import { fieldDisplayName, mergedPermissibleValues } from '@/lib/utils/fields';
+import { MULTIVALUED_DELIMITER, titleOverText } from '@/lib/utils/fields';
 import { isEmptyUnitVal } from '@/lib/utils/general';
 
 // Derived from: https://jsfiddle.net/handsoncode/f0b41jug/
@@ -148,15 +148,30 @@ export const keyValueListRenderer = function (
 };
 
 export const multiKeyValueListRenderer = (field) => {
-  const permissible_values = mergedPermissibleValues(field);
+  const merged_permissible_values = field.sources.reduce((acc, source) => {
+    return Object.assign(acc, field.permissible_values[source]);
+  }, {});
   return function (hot, TD, row, col, prop, value, cellProperties) {
     // Call the autocomplete renderer to ensure default styles and behavior are applied
     Handsontable.renderers
       .getRenderer('autocomplete')
       .apply(this, [hot, TD, row, col, prop, value, cellProperties]);
 
     if (!isEmptyUnitVal(value)) {
-      const label = fieldDisplayName(permissible_values)(value);
+      const label = value
+        .split(MULTIVALUED_DELIMITER)
+        .map((key) => {
+          if (!(key in merged_permissible_values))
+            console.warn(
+              `${key} not in merged_permissible_values ${Object.keys(
+                merged_permissible_values
+              )}`
+            );
+          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/i18n.js b/lib/utils/i18n.js
@@ -3,7 +3,7 @@ import i18next from 'i18next';
 import jqueryI18next from 'jquery-i18next';
 // import tags from 'language-tags';
 
-import { flattenObject, consolidate } from '@/lib/utils/objects';
+import { flattenObject } from '@/lib/utils/objects';
 import label_translations_file from '@/web/translations/translations.json';
 import {
   MULTIVALUED_DELIMITER,
@@ -19,15 +19,18 @@ export const interface_translation = transformStructFirstSpec(
 const withNamespace =
   (namespace, addons = {}) =>
   (obj) =>
-    consolidate(obj, (acc, [lang, translation]) =>
-      Object.assign(acc, {
-        [lang]: {
-          [namespace]: {
-            ...translation,
-            ...addons,
+    Object.entries(obj).reduce(
+      (acc, [lang, translation]) => ({
+        ...Object.assign(acc, {
+          [lang]: {
+            [namespace]: {
+              ...translation,
+              ...addons,
+            },
           },
-        },
-      })
+        }),
+      }),
+      {}
     );
 
 const englishIsDefault = (translation_object) => {
@@ -196,12 +199,12 @@ export function findLocalesForLangcodes(langcodes) {
 }
 
 export const translateObject = (obj, lng = i18next.language, delimiter = '_') =>
-  consolidate(obj, (acc, [key, val]) => {
+  Object.entries(obj).reduce((acc, [key, val]) => {
     return Object.assign(acc, {
       [i18next.t(key.replace(/ /g, delimiter), { lng })]:
         val !== null ? i18next.t(val, { lng }) : null,
     });
-  });
+  }, {});
 
 export function getLanguageNameInLanguage(langCode) {
   if (typeof Intl.DisplayNames !== 'undefined') {