BUGFIX: multiple reloads when template the same accidentally cleared data harmonizers.

Author: kennethbruskiewicz

lib/AppContext.js

@@ -226,6 +226,7 @@ export default class AppContext {
     const isForcedSchemaProvided = overrides.forced_schema !== null;
     const isLocaleChange = overrides.locale !== null;
 
+   
     const clearAndSetup = async (
       data_harmonizers = {},
       forced_schema = null
@@ -245,7 +246,7 @@ export default class AppContext {
 
     // Handle same template path without uploaded template
     if (isSameTemplatePath) {
-      return clearAndSetup();
+      return clearAndSetup(this.dhs);
     }
 
     // Handle forced schema case

lib/DataHarmonizer.js

@@ -1407,6 +1407,32 @@ class DataHarmonizer {
     return false;
   }
 
+  /**
+   * Construct a dictionary of source field names pointing to column index
+   * @param {Object} fields A flat version of data.js.
+   * @return {Map<String, Integer>} Dictionary of all fields.
+   */
+  getFieldNameMap(fields) {
+    const map = {};
+    for (const [fieldIndex, field] of fields.entries()) {
+      map[field.name] = fieldIndex;
+    }
+    return map;
+  }
+
+  /**
+   * Construct a dictionary of source field TITLES pointing to column index
+   * @param {Object} fields A flat version of data.js.
+   * @return {Map<String, Integer>} Dictionary of all fields.
+   */
+  getFieldTitleMap(fields) {
+    const map = {};
+    for (const [fieldIndex, field] of fields.entries()) {
+      map[field.title] = fieldIndex;
+    }
+    return map;
+  }
+
   /**
    * Create a matrix containing the grid's headers. Empty strings are used to
    * indicate merged cells.
@@ -2074,32 +2100,6 @@ class DataHarmonizer {
    *
    */
 
-  /**
-   * Get a dictionary of source field names pointing to column index
-   * @param {Object} fields A flat version of data.js.
-   * @return {Dictionary<Integer>} Dictionary of all fields.
-   */
-  getFieldNameMap(fields) {
-    const map = {};
-    for (const [fieldIndex, field] of fields.entries()) {
-      map[field.name] = fieldIndex;
-    }
-    return map;
-  }
-
-  /**
-   * Get a dictionary of source field TITLES pointing to column index
-   * @param {Object} fields A flat version of data.js.
-   * @return {Dictionary<Integer>} Dictionary of all fields.
-   */
-  getFieldTitleMap(fields) {
-    const map = {};
-    for (const [fieldIndex, field] of fields.entries()) {
-      map[field.title] = fieldIndex;
-    }
-    return map;
-  }
-
   /**
    * Modifies exportHeaders map of fields so that each field contains an array
    * of one or more source fields by name that are used to compose it.
@@ -2852,21 +2852,30 @@ class DataHarmonizer {
   toJSON() {
     const handsontableInstance = this.hot;
     const tableData = this.fullData(handsontableInstance);
-    const columnHeaders = handsontableInstance.getColHeader().map(stripDiv);
+    const columnHeaders = handsontableInstance.getColHeader().map(stripDiv);  // TODO: use fields() or this.getFlatHeaders()[1];
+    console.log(columnHeaders);
 
     function createStruct(row) {
       const structInstance = {};
+      // iterate over the columns in a row
       for (let i = 0; i < row.length; i++) {
+
+        const columnHeader = columnHeaders[i];
+        console.log(columnHeader);
+
         // Optional type checking (adjust data types as needed)
-        if (typeof columnHeaders[i] === 'string') {
-          structInstance[columnHeaders[i]] = row[i];
-        } else if (typeof columnHeaders[i] === 'number') {
-          structInstance[columnHeaders[i]] = Number(row[i]); // Convert to number
+        if (typeof columnHeader === 'string') {
+          structInstance[columnHeader] = row[i];
+        } else if (typeof columnHeader === 'number') {
+          structInstance[columnHeader] = Number(row[i]); // Convert to number
         } else {
           // Handle other data types if needed
-          structInstance[columnHeaders[i]] = row[i];
+          structInstance[columnHeader] = row[i];
         }
       }
+
+      console.log(structInstance);
+
       return structInstance;
     }
 
@@ -2880,6 +2889,8 @@ class DataHarmonizer {
       }
     }
 
+    console.log(arrayOfStructs);
+
     return arrayOfStructs;
   }
 }