handle schema editor changes to type,class,enum enums

Author: ddooley

lib/AppContext.js

@@ -131,12 +131,15 @@ export default class AppContext {
    * 2) Find any DH class / tab's slot that mentions changed enums, and 
    *      regenerate its "cached" flatVocabulary etc.
    * 
-   * @param {Array} enums list of special enumeration menus.
+   * @param {Array} enums list of special enumeration menus. Default list
+   * covers all menus that schema editor might have changed dynamically.
+   * 
+   * FUTURE: add SchemaSlotMenu ?
    */
   refreshSchemaEditorMenus(enums = ['SchemaTypeMenu','SchemaClassMenu','SchemaEnumMenu']) {
     let schema = this.template.current.schema;
-
     if (schema.name === 'DH_LinkML') {
+      //alert("doing "+enums.join(';'))
       for (const enum_name of enums) {
         // Initialize TypeMenu, ClassMenu and EnumMenu
 
@@ -145,7 +148,7 @@ export default class AppContext {
         let user_schema_name = 'DH_LinkML'; // default
 
         const selected_schema_row = dh_schema.hot.getSelected()?.[0][0]; 
-        if (selected_schema_row) {
+        if (selected_schema_row >=0) {
           const selected_schema_name = dh_schema.hot.getDataAtCell(selected_schema_row, 0);
           if (selected_schema_name) {
             user_schema_name = selected_schema_name;
@@ -185,9 +188,11 @@ export default class AppContext {
             break;
         }
 
-        // Reset menu's permissible_values to latest.
-        schema.enums[enum_name].permissible_values = permissible_values;
-
+        if (schema.enums[enum_name])
+          // Reset menu's permissible_values to latest.
+          schema.enums[enum_name].permissible_values = permissible_values;
+        else
+          console.log(`Error in refreshSchemaEditorMenus: Unable to find "${enum_name}" Enumeration.`)
       }
 
       // Then trigger update for any slot that has given menu in range.
@@ -205,8 +210,8 @@ export default class AppContext {
           }
         }
       }
-
     }
+    return false;
   }
 
   /** For generating permissible_values for SchemaTypeMenu, SchemaClassMenu,
@@ -293,7 +298,7 @@ export default class AppContext {
               minRows: is_child ? 0 : 10,
               minSpareRows: 0,
               //minHeight: '200px', // nonsensical if no rows exist
-              height: is_child ? '60vh' : '75vh',
+              height: is_child ? '60vh' : '75vh', //'400px' : '700px', // 
               // TODO: Workaround, possibly due to too small section column on child tables
               // colWidths: is_child ? 256 : undefined,
               colWidths: 200,

lib/DataHarmonizer.js

@@ -355,14 +355,14 @@ class DataHarmonizer {
         columns: this.getColumns(),
         colHeaders: true,
         rowHeaders: true,
-        //renderallrows: false, // working?
+        renderallrows: false, // working?
         manualRowMove: true,
         copyPaste: true,
         outsideClickDeselects: false, // for maintaining selection between tabs
         manualColumnResize: true,
         //colWidths: [100], //Just fixes first column width
-        minRows: 10,
-        minSpareRows: 10,
+        minRows: 5,
+        minSpareRows: 5,
         width: '100%',
         // Future: For empty dependent tables, tailor to minimize height.
         height: '75vh',
@@ -513,11 +513,11 @@ class DataHarmonizer {
          * # rows, this event can be triggered "silently" on update of fields likedata
          * empty provenance field.
          * @param {Array} grid_changes array of [row, column, old value (incl. undefined), new value (incl. null)].
-         * @param {String} action can be CopyPaste.paste, ...
+         * @param {String} action can be CopyPaste.paste, ... thisChange
          */
         beforeChange: function (grid_changes, action) {
           // Ignore addition of new records to table.
-          if (action == 'add_row' || action == 'upload') return;
+          if (action == 'add_row' || action == 'upload' || action =='thisChange') return;
           if (!grid_changes) return; // Is this ever the case?
 
           console.log('beforeChange', grid_changes, action);
@@ -698,17 +698,31 @@ class DataHarmonizer {
         // change selection, e.g. just edits 1 cell content, then
         // an afterSelection isn't triggered. THEREFORE we have to
         // trigger a crudFilterDependentViews() call.
-        // action e.g. edit, updateData
+        // action e.g. edit, updateData, CopyPaste.paste
         afterChange: function (grid_changes, action) {
-
-          //Ignore if partial key left by change.  For full dependent key,
-          // ISSUE: "updateData" event getting triggered.
+          if (action == 'upload' || action =='updateData') {
+            // This is being called for every cell change in an 'upload'
+            // Must block them or it somehow triggers stack overload of new
+            // afterChange events.
+            this.counter??= 0;
+            this.counter ++;
+            return;
+          }
+          // ISSUE: Thousands of upload actions for uploaded schema
+          // Note: https://github.com/handsontable/handsontable/discussions/9275
+          //console.log ("upload actions", this.counter)
 
           // Trigger only if change to some key slot child needs.
           if (grid_changes) {
             let row_changes = self.getRowChanges(grid_changes);
             if (self.hasRowKeyChange(self.template_name, row_changes)) {
               self.context.crudFilterDependentViews(self.template_name);
+              // If in schema editor mode, update or insert to name field (a
+              // key field) of class, slot or enum (should cause update in 
+              // compiled enums and slot flatVocabularies.
+              if (['Type','Class','Enum'].includes(self.template_name)) {
+                self.context.refreshSchemaEditorMenus(['Schema'+self.template_name+'Menu']);
+              }
             }
           }
         },
@@ -721,13 +735,18 @@ class DataHarmonizer {
            * foreign key values that make up some dependent table's record(s)
            * have changed, so that table's view should be refreshed. Dependent
            * tables determine what parent foreign key values they need to filter view by.
-           * This event is not involved in row content change.
+           * This event is not directly involved in row content change.
            *
+           * As well, refresh schema menus if selected schema has changed.
            */
 
           //console.log("afterSelectionEnd",row, column, row2, column2, selectionLayerLevel)
           if (self.current_selection[0] != row || self.current_selection[1] != column) {
             self.context.crudFilterDependentViews(self.template_name);
+            if (self.template_name == 'Schema' && self.current_selection[0] != row) {
+              self.context.refreshSchemaEditorMenus();
+            }
+
           }
 
           self.current_selection = [row, column]; //, row2, column2];
@@ -943,6 +962,7 @@ class DataHarmonizer {
   }  
 
   // Classes & slots (tables & fields) in loaded schema editor schema guide what can be imported.
+  // TRY SWITCHING TO hot.updateData()
   loadSchemaYAML(text) {
     let schema = null;
     try {
@@ -1158,14 +1178,15 @@ class DataHarmonizer {
       //dh.hot.resumeExecution();
       //dh.hot.updateSettings({hiddenRows: true});
       dh.hot.resumeRender();
+      dh.hot.render();
       //hot.updateSettings({hiddenRows: { rows: myRows}});
 
     }
 
     // New data type, class & enumeration items need to be reflected in DH
     // schema editor SchemaTypeMenu, SchemaClassMenu and SchemaEnumMenu menus 
 
-    // NEED TO DO THIS EACH TIME NEW SCHEMA ROW IS CALCULATED.
+    // Done each time a schema is uploaded or focused on.
     this.context.refreshSchemaEditorMenus(); 
 
     console.table("LOADED SCHEMA", schema);