Fix display of validation buttons during tab navigation

Author: ddooley

lib/AppContext.js

@@ -52,7 +52,7 @@ export default class AppContext {
     });
 
     $(document).on('dhCurrentSelectionChange', (event, data) => {
-      const { currentSelection } = data;
+      const { currentSelection } = data; // Is data mutable?
       this.currentSelection = currentSelection;
     });
   }
@@ -506,6 +506,12 @@ export default class AppContext {
     Object.entries(dh.slots).forEach(
       ([index, slot]) => (dh.slot_name_to_column[slot.name] = parseInt(index))
     );
+
+    dh.slot_title_to_column = {};
+    Object.entries(dh.slots).forEach(
+      ([index, slot]) => (dh.slot_title_to_column[slot.title] = parseInt(index))
+    );
+
   }
 
   /**
@@ -930,7 +936,7 @@ export default class AppContext {
    */
   crudFilterDependentViews(class_name) {
     let class_dependents = this.relations[class_name].dependents;
-    this.crudGetDependentRows(class_name, class_dependents);
+    this.crudGetDependentRows(class_name, false, class_dependents);
     for (let [dependent_name] of class_dependents.entries()) {
       let dependent_report = this.dependent_rows.get(dependent_name);
       //console.log("view refresh", dependent_name, dependent_report)
@@ -1027,25 +1033,28 @@ export default class AppContext {
    * The delete or update in root table is row specific and happens in calling
    * routine via user confirmation.
    * Note: this report is done regardless of visibility of rows/columns to user.
-   *
-   * INPUT
-   * @start_name {String} name of root table to begin looking for cascading effect of foreign key changes. 1st user-selected row is used for all primary key and target class filtering.
    * 
    * Builds a list of dependents that have root-related records
-    *  dependent_rows: {
-      [dependent_name]: {
-        slots: {} // just like start_name, these are values of all slots that other tables depend on.
-        [parent]: {
-          slots: {[slot_name]: value, ... },
-          incomplete: true | false,
-          changed_slots: {[slot_name]: value, ... },
-          count: [# records in dependent matching this combo],
-          rows: [row # of affected row, ...]
-      }
-    }
-
+   *  dependent_rows: {
+   *    [dependent_name]: {
+   *      slots: {} // just like start_name, these are values of all slots that other tables depend on.
+   *      [parent]: {
+   *        slots: {[slot_name]: value, ... },
+   *        incomplete: true | false,
+   *        changed_slots: {[slot_name]: value, ... },
+   *        count: [# records in dependent matching this combo],
+   *        rows: [row # of affected row, ...]
+   *    }
+   *  }
+   *
+   * For a given DH table, 1st user-selected row is used to get values for all non-foreign key and target slots.
+   * 
+   * @param {String} start_name name of root table to begin looking for cascading effect of foreign key changes. 
+   * @param {String} class_name name of class (DataHarmonizer instance) to start from.
+   * @param {Boolean} skipable: yes = don't do deep dive if no keys have changed for class name.
+   * @param {Object} changes dictionary pertaining to a particular dh row's slots.
    */
-  crudGetDependentRows(start_name, changes = {}) {
+  crudGetDependentRows(start_name, skippable=false, changes = {}) {
     // For each start class + its dependents
     let family = [start_name,...this.relations[start_name].dependents.keys()];
     family.forEach((class_name) => {
@@ -1058,6 +1067,8 @@ export default class AppContext {
         incomplete: incomplete
       };
 
+      if (skippable && isEmpty(changed_key_vals))
+        return
       /*
        * 2) Query given dependent to see # of rows of dependent retrieved.  
        * 3) Add rowcount to dependent_rows.
@@ -1073,7 +1084,7 @@ export default class AppContext {
         }
       }
 
-      this.dependent_rows.set(class_name, dependent_rows_obj); // Set doesn't bring existing class to end?
+      this.dependent_rows.set(class_name, dependent_rows_obj);
 
     })
 
@@ -1212,7 +1223,10 @@ export default class AppContext {
           foreign_slot_name
         );
         if (value == null) {
-          errors += `\n- ${parent_name}.${foreign_slot_name}: _____`;
+          const dh = this.dhs[parent_name];
+          const parent_title = this.template.current.schema.classes[parent_name].title;
+          const foreign_slot_title = dh.slots[dh.slot_name_to_column[foreign_slot_name]].title;
+          errors += `\n- ${parent_title}.${foreign_slot_title}: _____`;
         } else {
           required_selections[slot_name] = {
             value: value,
@@ -1330,14 +1344,14 @@ export default class AppContext {
    * @param {String} key_name to examine
    * @param {Object} changes for a row with slot_name as key.
    * @param {Object} dictionary of slots and their new values.
-   * @param {String} textual report of any slots which were changed.
-   *
-   * @return    {Boolean} found boolean true if complete keyVals
-   * @return    {Object} keyVals set of slots and their values from template or change
-   * @return    {String} change_log report of changed slot values
+   * @return {Boolean} found boolean true if complete keyVals
+   * @return {Object} keyVals set of slots and their values from template or change
+   * @return {String} change_log report of changed slot values
    */
-  crudHasCompleteUniqueKey(dh, row, key_name, changes, keyVals = {}, change_log = '') {
+  crudHasCompleteUniqueKey(dh, row, key_name, changes) {
     const key_obj = dh.template.unique_keys[key_name];
+    let keyVals = {};
+    let change_log = '';
     let changed = false;
     let complete = Object.entries(key_obj.unique_key_slots)
       // If every slot has a value, then the whole key is complete.

lib/DataHarmonizer.js

@@ -361,7 +361,7 @@ class DataHarmonizer {
               // Enables removal of a row and all dependent table rows.
               // If there are 1-many cascading deletes, verify if that's ok.
               let selection = self.hot.getSelected()[0][0];
-              let [change_report, change_message] = self.getChangeReport(self.template_name);
+              let [change_report, change_message] = self.getChangeReport(self.template_name, false);
               if (!change_message.length) {
                 self.hot.alter('remove_row', selection);
                 return true;
@@ -621,7 +621,8 @@ class DataHarmonizer {
                   parseInt(row) + 1
                 } would also change existing dependent table records! Do you want to continue?  Check:\n`;
 
-            let [change_report, change_message] = self.getChangeReport(self.template_name, changes);
+            let [change_report, change_message] = self.getChangeReport(self.template_name, true, changes);
+            console.log("CHANGES", changes,change_report)
             // confirm() presents user with report containing notice of subordinate changes
             // that need to be acted on.
 
@@ -681,7 +682,10 @@ class DataHarmonizer {
           // ISSUE: "updateData" event getting triggered.
           //if (action != 'updateData')
           //hotInstance.suspendRender();
-            self.context.crudFilterDependentViews(self.template_name);
+          if (action = "loadData")
+            self.clearValidationResults();
+          
+          self.context.crudFilterDependentViews(self.template_name);
 
         },
 
@@ -757,16 +761,49 @@ class DataHarmonizer {
     }
   }
 
+  clearValidationResults() {
+    $('#next-error-button,#no-error-button').hide();
+    this.invalid_cells = {};
+
+    /* TESTING: Because dh's can be filtered for rows, eliminate validation data.
+    //this.hideValidationResults();
+    // See DataHarmonizer . afterRenderer();
+    //'empty-invalid-cell' : 'invalid-cell'
+    $('#no-error-button').hide();
+    if (extraData.dh.invalid_cells.length>0) {
+      $('#next-error-button').show();
+      // NEED TO SHOW ALL ROWS
+      invalid_cells[row][col]
+      alert('here' + dh.template.template_name)
+      extraData.dh.changeRowVisibility('show-all-rows-dropdown-item');
+    }
+    else {
+      $('#next-error-button').hide();
+    }
+    */
+  }
+
   /**
-   * Regenerates this.context.dependent_rows for given class_name and its dependents.
-   * Then drafts report if 
+   * Returns a dependent_report of changed table rows, as well as an affected
+   * key slots summary.  Given changes object is user's sot edits, if any, on
+   * a row. If no class_name primary key related update or delete action is 
+   * asked for by user, i.e. they edited some other slot, then a 
+   * skippable = true parameter enables this report to exit quickly rather than
+   * doing a deep recursive dive.
+   * @param {String} class_name name of class (DataHarmonizer instance) to start from.
+   * @param {Boolean} skippable: yes = don't do deep dive if no keys have changed for class name.
+   * @param {Object} changes dictionary pertaining to a particular dh row's slots.
+   * @returns {Object} dependent_report dictionary of class_names and the key slot related data and change-affected rows
+   * @returns {String} change_message echoes description of entailed changes in dependent tables.
    */
-  getChangeReport(class_name, changes = {}) {
+  getChangeReport(class_name, skippable=false, changes = {}) {
     let change_message = '';
     let dependent_report = {};
-    this.context.crudGetDependentRows(class_name, changes);
+    this.context.crudGetDependentRows(class_name, skippable, changes);
     for (let [dependent_name] of this.context.relations[class_name].dependents.entries()) {
       let dependent_rep = this.context.dependent_rows.get(dependent_name);
+      if (skippable && isEmpty(dependent_rep.changed_slots))
+        break;
       dependent_report[dependent_name] = dependent_rep;
       if (class_name != dependent_name && dependent_rep.count) {
         let key_vals = Object.entries(dependent_rep.slots)
@@ -843,6 +880,7 @@ class DataHarmonizer {
       this.context.crudGetForeignKeyValues(parents);
     if (errors) {
       // Prompt user to select appropriate parent table row(s) first.
+      // FRINGE ISSUE: When user selects row/cell on subordinate table, then mouse-clicks on disabled tab, and then add-row, they get popup pertaining to disabled tab table.
       $('#empty-parent-key-modal-info').html(errors);
       $('#empty-parent-key-modal').modal('show');
       return;
@@ -990,7 +1028,8 @@ class DataHarmonizer {
         if (as_markup) return `[${curieOrURI}](${curieOrURI})`;
 
         return `<a href="${curieOrURI}" target="_blank">${curieOrURI}</a>`;
-      } else if (curieOrURI.includes(':')) {
+      } 
+      else if (curieOrURI.includes(':')) {
         const [prefix, reference] = curieOrURI.split(':', 2);
         if (prefix && reference && prefix in this.schema.prefixes) {
           // Lookup curie
@@ -2807,25 +2846,14 @@ class DataHarmonizer {
   toJSON() {
     const handsontableInstance = this.hot;
     const tableData = this.fullData(handsontableInstance);
-    const columnHeaders = handsontableInstance.getColHeader().map(stripDiv); // TODO: use fields() or this.getFlatHeaders()[1];
+    const columnHeaders = this.slot_names;
 
     function createStruct(row) {
       const structInstance = {};
       // iterate over the columns in a row
       for (let i = 0; i < row.length; i++) {
-        const columnHeader = columnHeaders[i];
-
-        // Optional type checking (adjust data types as needed)
-        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[columnHeader] = row[i];
-        }
+        structInstance[columnHeaders[i]] = row[i];
       }
-
       return structInstance;
     }
 
@@ -2838,7 +2866,7 @@ class DataHarmonizer {
         arrayOfStructs.push(createStruct(row));
       }
     }
-
+    console.log(arrayOfStructs);
     return arrayOfStructs;
   }
 }