Merge pull request #362 from cidgoh/multiselect-validation-fix

fix to multi-select validation

lib/DataHarmonizer.js

@@ -2122,6 +2122,7 @@ class DataHarmonizer {
                 cellVal,
                 field
               );
+
               valid = vocabValid;
               if (update) {
                 this.hot.setDataAtCell(row, col, update, 'thisChange');
@@ -2138,6 +2139,8 @@ class DataHarmonizer {
             }
             // Hardcoded case: If field is xsd:token, and 1st picklist is
             // "null value menu" then ignore validation on free-text stuff.
+            // In other words, if picklist is only being provided for null
+            // values, then field must allow free text content.
             if (
               !valid &&
               field.datatype === 'xsd:token' &&

lib/utils/validation.js

@@ -100,14 +100,16 @@ export function validateValAgainstVocab(value, field) {
 export function validateValsAgainstVocab(delimited_string, field) {
   let update_flag = false;
   let value_array = delimited_string.split(';');
-  value_array.forEach(function (value, index) {
+  // for-loop construct ensures return is out of this function.
+  for (let index = 0; index < value_array.length; index++) {
+    let value = value_array[index];
     const [valid, update] = validateValAgainstVocab(value, field);
     if (!valid) return [false, false];
     if (update) {
       update_flag = true;
       value_array[index] = update;
     }
-  });
+  }
   if (update_flag) return [true, value_array.join(';')];
   else return [true, false];
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "data-harmonizer",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "A standardized spreadsheet editor and validator that can be run offline and locally",
   "repository": "git@github.com:cidgoh/DataHarmonizer.git",
   "license": "MIT",