finishing touches on DH create row(s)

Author: ddooley

lib/AppContext.js

@@ -412,14 +412,7 @@ export default class AppContext {
 
     Object.entries(schema.classes)
       // Container class is only used in input and output file coordination.
-      .filter(([class_name]) => 
-        // If given template_name found, build it
-        class_name == template_name
-        // Or given class is a child of template
-        || this.relations[class_name]?.parent?.[template_name]
-        // Or given class is a child of child of template etc.
-        // ...
-      )
+      .filter(([class_name]) => this.isAncestor([class_name], template_name))
       .forEach((obj, index) => {
         if (obj.length > 0) {
           const [class_name, tree_obj] = obj;
@@ -450,7 +443,7 @@ export default class AppContext {
               schema: schema, // assign during constructor so validator can init on it.
               hot_override_settings: {
                 minRows: is_child ? 0 : 10,
-                minSpareRows: is_child ? 0 : 10,
+                minSpareRows: 0,
                 height: is_child ? '40vh' : '75vh',
                 // TODO: Workaround, possibly due to too small section column on child tables
                 // colWidths: is_child ? 256 : undefined, 
@@ -463,8 +456,11 @@ export default class AppContext {
             dh.validator.useTargetClass(class_name);
 
             if (is_child) {
-              // Initialization of each child table is to hide all rows until
-              // parent primary key record is selected as a foreign key index.
+              /* Initialization of each child table is to hide all rows until
+               * parent primary key record is selected as a foreign key index.
+               * Note: user cut and paste of records doesn't change read-only
+               * fields.
+              **/
               dh.filterAll();
               // All foreign key fields must be read-only. Their contents are
               // controlled by dependent create and update actions. 
@@ -484,7 +480,9 @@ export default class AppContext {
                * WRT rows which are foreign keys to other tables, a user:
                * - Can update or delete a key field which then cascades to
                *   other child table(s). This might trigger violation of unique_keys!
-               *   
+               * 
+               * Note: user cut and paste of records doesn't change read-only
+               * fields.
               */ 
 
             }
@@ -499,6 +497,23 @@ export default class AppContext {
     return data_harmonizers;
   }
 
+  // Determine if parent relationships link class_name to given ancestor
+  isAncestor(class_names, ancestor_name) {
+    let subject_name = class_names.shift();
+    if (!subject_name)
+      return false;
+    if (subject_name == ancestor_name)
+      return true;
+    if (this.relations[subject_name]?.parent) {
+      if (this.relations[subject_name].parent[ancestor_name])
+        return true;
+      // Ancestor wasn't one of parents, so try search on all ancestors.
+      //console.log(this.relations[subject_name].parent, Object.values(this.relations[subject_name].parent))
+      class_names.push(Object.values(this.relations[subject_name].parent));
+    }
+    return this.isAncestor(class_names, ancestor_name)
+  }
+
   /*
   Return initialized, rendered dataHarmonizer instances rendered in order.
   If a template name is provided, only include that one in its schema, and any underlings.

lib/DataHarmonizer.js

@@ -685,7 +685,31 @@ class DataHarmonizer {
         colHeaders: true,
         rowHeaders: true,
         copyPaste: true,
-        contextMenu: ['remove_row', 'row_above', 'row_below'],
+        contextMenu: [
+
+          {
+            key: 'remove_row',
+            name: 'Remove row',
+            callback: function () {
+              //Enables removal of a row and all subordinate rows in other DH tables.
+              self.hot.alter('remove_row', self.hot.getSelected()[0][0]); //, numRows
+            },
+          },
+          {
+            key: 'row_above',
+            name: 'Insert row above',
+            callback: function () {
+              self.addRows('insert_row_above', 1, self.hot.getSelected()[0][0]);
+            },
+          },
+          {
+            key: 'row_below',
+            name: 'Insert row below',
+            callback: function () {
+              self.addRows('insert_row_above', 1, parseInt(self.hot.getSelected()[0][0])+1);
+            },
+          },
+        ],
         outsideClickDeselects: false, // for maintaining selection between tabs
         manualColumnResize: true,
         //colWidths: [100], //Just fixes first column width
@@ -728,13 +752,18 @@ class DataHarmonizer {
         },
         afterSelection: (row, column, row2, column2) => {
           self.current_selection = [row, column, row2, column2];
+          // Two possible actions:
+          // - For each subordinate table send a message to refilter
+          // - See if sidebar info is required for top column click.
+
           if (this.helpSidebar) {
             if (column > -1) {
               const field = self.slots[column];
               const helpContent = self.getComment(field);
               self.helpSidebar.setContent(helpContent);
             } else self.helpSidebar.close();
           }
+          return false;
         },
         // Bit of a hackey way to RESTORE classes to secondary headers. They are
         // removed by Handsontable when re-rendering main table.
@@ -791,22 +820,26 @@ class DataHarmonizer {
     this.hot.updateSettings({ columns: currentColumns });
   }
 
-  /* Currently only called via Footer.js
-   * numRows is (usually) user specified number of rows to add at bottom
-   * of current dh table.  However, if table has foreign key(s) to another
-   * table, the other table's focused row will control foreign key values
-   * added to this table.
+  /* Called via Footer.js, and also in right click menu DH contextMenu click 
+   * row_above, row_below.
+   * numRows is specified number of rows to add to current dh table. If table
+   * has foreign key(s) to another table, the other table's focused row will
+   * control foreign key values added to this table.
+   * row_where = 'insert_row_below' | 'insert_row_above'
   */
-  addRowsToBottom(numRows) {
+  addRows(row_where, numRows, startRowIndex = false) {
 
     numRows = parseInt(numRows); // Coming from form string input.
     // Get the starting row index where the new rows will be added
-    const startRowIndex = this.hot.countRows();
+    if (startRowIndex === false)
+      startRowIndex = this.hot.countRows();
+
+    console.log("menu",this.template_name, this.context.relations?.[this.template_name]?.parent)
 
     // If this has no foreign key parent table(s) then go ahead and add x rows.
     if (! this.context.relations?.[this.template_name]?.parent) {
       // Insert the new rows below the last existing row
-      this.hot.alter('insert_row_below', startRowIndex, numRows);
+      this.hot.alter(row_where, startRowIndex, numRows);
       return;
     }
 
@@ -853,7 +886,7 @@ class DataHarmonizer {
       return;
     }
 
-    this.hot.alter('insert_row_below', startRowIndex, numRows);
+    this.hot.alter(row_where, startRowIndex, numRows);
 
     // Populate new rows with selected value(s)
     this.hot.batch(() => {

lib/Footer.js

@@ -26,7 +26,7 @@ class Footer {
 
     this.root.find('.add-rows-button').on('click', () => {
       const numRows = this.root.find('.add-rows-input').val();
-      context.getCurrentDataHarmonizer().addRowsToBottom(numRows);
+      context.getCurrentDataHarmonizer().addRows('insert_row_below', numRows);
     });
   }
 }