refactoring menu maintenance

ddooley · ddooley · commit d36230fc707b · 2026-05-07T10:18:59.000-07:00
fix to SchemaSlotGroupMenu
diff --git a/lib/AppContext.js b/lib/AppContext.js
@@ -66,6 +66,11 @@ export default class AppContext {
 
   };
 
+  selectedTableRow(class_name) {
+    const tab = this.dhs[class_name];
+    return tab?.hot.getSelected()?.[0]?.[0] ?? -1; // -1 = undefined
+  }
+
   /**
    * Accessed by both a tabChange() but also by a #report_select_type change
    */
@@ -74,8 +79,6 @@ export default class AppContext {
     let dh = this.getCurrentDataHarmonizer();
     let class_name = dh.template_name;
     let report_type = $('#report_select_type').val();
-    const class_dh = this.dhs['Class'];
-    const class_row = class_dh?.hot.getSelected()?.[0]?.[0] ?? -1; // -1 = undefined
 
     //console.log("REFRESHTABDISPLAY", class_name, this.schemaEditor, report_type)
 
@@ -91,9 +94,9 @@ export default class AppContext {
     //$('#slot_report_type, #slot_report_type_option')
     //  .toggle(this.schemaEditor !== undefined && class_name === 'Slot');
 
-    // The Schema tab always displays a full list, even with "record(s) by selected key" option set in menu.
+    // The Schema tab always displays a full list, even with "record(s) by 
+    // selected key" option set in menu.
     if (this.schemaEditor !== undefined && class_name === 'Schema') {
-      // Report type override
       report_type = 'all';
     }
 
@@ -114,30 +117,19 @@ export default class AppContext {
         this.slotTypeFilter(dh); // Done via hidden fields. no constraint (no keys)
         break;
 
+      /* Unused at moment
       // The following Display > menu is specific to the Field / Slots display
       case 'slot':
         //this.slotTypeFilter(dh, ['slot']);   
         //dh.hot.getPlugin('multiColumnSorting').sort() ; //{ column: 3, sortOrder: 'asc' }
         break;
 
-      case 'attribute':
+      // A class attribute" object has all the same fields as a class slot. 
+      // Hence they are all in the same report.
+      case 'attribute': 
         this.slotTypeFilter(dh, ['attribute']);
         break;
-
-      case 'slot_usage':
-        this.slotTypeFilter(dh, ['slot','slot_usage']);
-        // UNFINISHED CODE
-        columnSorting.sort({
-          column: dh.slot_name_column,
-          sortOrder: 'asc'
-          //compareFunctionFactory: function(sortOrder, columnMeta) {
-          //  return function(value, nextValue) {
-          //    return 0; // Custom compare function for the first column (don't sort)
-          //  }
-          //}
-        });
-
-        break;
+      */
 
       // Records by selected key case
       case '': 
@@ -146,13 +138,23 @@ export default class AppContext {
         let fkey_vals = this.dependent_rows.get(class_name).fkey_vals;
         // Some reports should show all class's entries if none selected in Class (Table) tab.
 
-        if (this.schemaEditor !== undefined && dh.template_name === 'UniqueKey') {
-          // If no row is selected in the Class (Table) tab, remove the class_id
-          // filter so all unique keys for the selected schema are shown.
-          alert(class_row)
-          if (class_row < 0) {
-            delete fkey_vals['class_id'];
-            //alert("here")
+        if (this.schemaEditor !== undefined) {
+          switch (dh.template_name) {
+            case 'UniqueKey':
+            case 'SlotGroup':
+            case 'Slot':
+              // If no row is selected in the Class (Table) tab, remove the class_id
+              // filter so all unique keys for the selected schema are shown.
+              if (this.selectedTableRow('Class') < 0) {
+                delete fkey_vals['class_id'];
+              } 
+              break;
+            case 'PermissibleValue':
+            case 'EnumSource':
+              if (this.selectedTableRow('Enum') < 0) {
+                delete fkey_vals['enum_id'];
+              }
+              break;
           }
         }
 
@@ -185,101 +187,12 @@ export default class AppContext {
 
   }
 
-  /** filterByKeys() SHOULD NOT BE APPLIED TO A schema's ROOT (top level) tab.
-   * E.g. for SCHEMA EDITOR, on "Schema" TAB - we never want to filter selection
-   * there unless there's a way of releasing that filter.
-   */
-  async filterByKeys_UNUSED_UNUSED(dh, key_vals = {}) {
-
-    /* For Slot tab query, only foreign key at moment is schema_id.
-     * However, if user has selected a table in Table/Class tab, we want 
-     * filter on class_name field. 
-      schema_id
-      match to foreign keys: 
-      For every slot_id, class_id, name found, also include slot_id, name.
-      alt: find slot_id, name, and class_id = key or NULL
-      I.e. allow NULL to apply just to class_id field.
-    */
-    /*
-      if (class_name === 'Slot') {
-
-        let column = dh.slot_name_to_column[key_name];
-        filtersPlugin.addCondition(column, 'eq', [value]); //
-        // Get selected table/class, if any:
-        const class_column = this.slot_name_to_column['class_name'];
-        const class_dh = this.context.dhs['Class'];
-        const focused_class_col = class_dh.slot_name_to_column['name'];
-        const focused_class_row = class_dh.current_selection[0];
-        const focused_class_name = (focused_class_row > -1) ? class_dh.hot.getDataAtCell(focused_class_row, focused_class_col) : '';
-        // If user has clicked on a table, use that focus to constrain Field list
-        if (focused_class_name > '') {
-          filtersPlugin.addCondition(class_column, 'eq', [focused_class_name], 'disjunction'); 
-          //filtersPlugin.addCondition(class_column, 'empty',[], 'disjunction');
-        }
-        // With no table selected, only show rows that DONT have a table/class mentioned
-        else {
-          filtersPlugin.addCondition(class_column, 'empty',[]);
-        }
-      }
-    */
-    
-
-
-    // Special call to initialize highlight of schema library slots having 'slot_type' = 'field'.
-    // Assumes crudFindAllRowsByKeyVals() will let in slots/fields with null values in order to
-    // also bring in slots not associated with a class. (no class_name).
-
-//      let multiColumnSorting = dh.hot.getPlugin('multiColumnSorting');
-    //const columnSorting = dh.hot.getPlugin('columnSorting');
-    //columnSorting.clearSort(); // Reset sort so filter matches raw fields
-
-    const mode = $('#report_select_type').val();
-
-    switch (mode) {
-
-      // Just a list of schema fields: 
-      // sort by slot_group if any, then rank if any, then alphabetically
-      // Slots and attributes are fully editable.
-      case 'slot':
-
-      // Table-only fields. Sort as above. 
-      // NOTE: This shows attributes for ALL tables in schema.
-      // One issue - possible naming collision with schema.slot name will cause schema slot attributes to overwrite slot.attributes slot values?
-      case 'attribute':
-        this.slotTypeFilter(dh, [mode]);
-//          filtersPlugin.addCondition(dh.slot_type_column, 'eq', [mode]); //slot_type
-//          filtersPlugin.filter();
-
-/*
-        multiColumnSorting.sort([
-          {column: 5, sortOrder: 'asc'}, // slot_group
-          {column: 4, sortOrder: 'asc'}, // rank
-          {column: 1, sortOrder: 'asc'}, // slot.name
-        ]);
-*/
-        break;
-
-      /**********************************************************/
-      // Show all slot_usage fields. For each, show schema.slot if available.
-      case 'slot_usage':
-        
-        this.slotTypeFilter(dh, ['slot','slot_usage']);
-
 
-        break;
-
-      default:
-        //Show all types of field:
-        this.slotTypeFilter(dh, ['slot','slot_usage','attribute']);
-    }
-    dh.render();  // Otherwise cells() implements meta and class stuff that isn't reflected
-
-  }
-
-  // Filtering has unpredictable results in terms of rendering, and in 
-  // conjunction with sorting, so using hiddenrowsplugin instead.
+  // Using hiddenrowsplugin because filters plugin has unpredictable results 
+  // in terms of rendering, and in conjunction with sorting
   tabFilter(dh, key_vals) {
     dh.hot.suspendExecution(); // Recommended in handsontable example.
+    // In case user has applied some filters, clears them:
     let filtersPlugin = dh.hot.getPlugin('filters');
     filtersPlugin.clearConditions();
 
@@ -306,29 +219,9 @@ export default class AppContext {
     dh.render(); // Otherwise chunks of old html left with old visible rows
   };
 
-/*
-  tabFilter(dh, key_vals) {
-    dh.hot.suspendExecution(); // Recommended in handsontable example.
-    let filtersPlugin = dh.hot.getPlugin('filters');
-    filtersPlugin.clearConditions();
-
-    Object.entries(key_vals).forEach(([key_name, value]) => {
-      let column = dh.slot_name_to_column[key_name];
-      //console.log('filter on', class_name, key_name, column, value); //foreign_key, 
-      if (column !== undefined) {
-        // See https://handsontable.com/docs/javascript-data-grid/api/filters/
-        filtersPlugin.addCondition(column, 'eq', [value]); //
-      }
-      else
-        console.log(`ERROR: unable to find filter column "${key_name}" in "${dh.template_name}" table.  Check DH_linkML unique_key_slots for this class`);
-    });
 
-    filtersPlugin.filter();
-    dh.hot.resumeExecution();
-  };
-*/
-
-  // Controlling shown or hidden 
+  // Controlling shown or hidden rows. Much like above
+  // Could be merged with above with additional parameter for selecting {[column name]: [acceptable values...] }
   slotTypeFilter(dh, show_type = null) {
     //dh.suspendExecution(); 
     // See https://handsontable.com/docs/javascript-data-grid/api/core/#suspendexecution
@@ -412,11 +305,6 @@ export default class AppContext {
       }
     }
 
-    // Ensure dynamic Enums are added so picklist source / range references are
-    // detected and pulldown/multiselect menus are crafted; and validation works
-    this.schemaEditor?.initMenus();
-
-
     // For all schemas, implement menu inheritance if any. Inheritance assembles
     // .inherits[enum1 name, enum2 name, ... , this enum], merging each in order
     // such that permissible value labels, descriptions and mappings can be
@@ -433,10 +321,17 @@ export default class AppContext {
     });
 
     this.dhs = this.makeDHsFromRelations(schema, template_name);
-    this.schemaEditor?.refreshMenus(); // requires classes Class, Enum to be built.
+
     // this.currentDataHarmonizer is now set.
     this.crudGetDependentRows(this.current_data_harmonizer_name);
     this.crudUpdateRecordPath();
+
+    // Ensure dynamic Enums are added so picklist source / range references are
+    // detected and pulldown/multiselect menus are crafted; and validation works
+    this.schemaEditor?.initMenus();
+
+    this.schemaEditor?.refreshMenus(); // requires classes Class, Enum to be built.
+
     this.refreshTabDisplay();
 
     return this;
diff --git a/lib/DataHarmonizer.js b/lib/DataHarmonizer.js
@@ -630,27 +630,6 @@ class DataHarmonizer {
               // 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 (self.context.schemaEditor) {
-                switch (self.template_name) {
-                case 'Schema':
-                  // For a schema name change (the only key in schema table),
-                  // update ALL related SchemaEditor Menus (classes, slots ...)
-                  // for that template.
-                  self.context.schemaEditor.refreshMenus();
-                  break;
-
-                case 'Slot':
-                  // A change in a Field/Slot table's row's schema
-                  self.context.schemaEditor.refreshMenus(['SchemaSlotMenu']);
-                  break;
-
-                case 'Type':
-                case 'Class':
-                case 'Enum':
-                  self.context.schemaEditor.refreshMenus([`Schema${self.template_name}Menu`]);
-                }
-              }
             }
           }
         },
@@ -695,22 +674,6 @@ class DataHarmonizer {
           // rows, if none, skip this.
           if (row_change) { // primary_key slot cell value change case handled in afterChange() event above.
             self.context.crudCalculateDependentKeys(self.template_name);
-
-            if (self.context.schemaEditor) { // Schema Editor specific function
-              if (self.template_name === 'Schema') {
-                self.context.schemaEditor.refreshMenus();
-              }
-              if (self.template_name === 'Class' || self.template_name === 'Slot') {
-                // Have to update Slot > SlotUsage > slot_group menu for given Class.
-                // (Currently not having Schema Class itself control slot_group.)
-                // Find slot menu field and update source controlled vocab.
-                // ISSUE: Menu won't work/validate if multiple classes are displayed.
-                //const class_name = self.hot.getDataAtCell(
-                //  row, self.slot_name_to_column['name']
-                //);
-                self.context.schemaEditor.refreshMenus(['SchemaSlotMenu','SchemaSlotGroupMenu']);   
-              }
-            }
           }
 
           // - See if sidebar info is required for top column click.
@@ -847,7 +810,7 @@ class DataHarmonizer {
     for (let [dependent_name] of this.context.relations[class_name].dependents.entries()) {
 
       let dependent_rep = this.context.dependent_rows.get(dependent_name);
-      console.log("report for ", dependent_name, dependent_rep)
+      //console.log("report for ", dependent_name, dependent_rep)
       dependent_report[dependent_name] = dependent_rep;
 
       if (class_name != dependent_name && dependent_rep.count) {
diff --git a/lib/SchemaEditor.js b/lib/SchemaEditor.js
