linny-r 2.0.9 → 2.0.11

package/static/scripts/linny-r-gui-dataset-manager.js

@@ -11,7 +11,7 @@ for the Linny-R Dataset Manager dialog.
 */
 
 /*
-Copyright (c) 2017-2024 Delft University of Technology
+Copyright (c) 2017-2025 Delft University of Technology
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -32,7 +32,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-// CLASS GUIDatasetManager provides the dataset dialog functionality
+// CLASS GUIDatasetManager provides the dataset dialog functionality.
 class GUIDatasetManager extends DatasetManager {
   constructor() {
     super();
@@ -44,7 +44,7 @@ class GUIDatasetManager extends DatasetManager {
         'click', (event) => UI.toggleDialog(event));
     document.getElementById('ds-new-btn').addEventListener(
          // Shift-click on New button => add prefix of selected dataset
-         // (if any) to the name field of the dialog
+         // (if any) to the name field of the dialog.
         'click', () => DATASET_MANAGER.promptForDataset(event.shiftKey));
     document.getElementById('ds-data-btn').addEventListener(
         'click', () => DATASET_MANAGER.editData());
@@ -56,16 +56,12 @@ class GUIDatasetManager extends DatasetManager {
         'click', () => DATASET_MANAGER.load_csv_modal.show());
     document.getElementById('ds-delete-btn').addEventListener(
         'click', () => DATASET_MANAGER.deleteDataset());
-    document.getElementById('ds-filter-btn').addEventListener(
-        'click', () => DATASET_MANAGER.toggleFilter());
-    // Update when filter input text changes 
-    this.filter_text = document.getElementById('ds-filter-text');
-    this.filter_text.addEventListener(
-        'input', () => DATASET_MANAGER.changeFilter());
     this.dataset_table = document.getElementById('dataset-table');
-    // Data properties pane
+    // Data properties pane below the dataset scroll area.
     this.properties = document.getElementById('dataset-properties');
-    // Toggle buttons at bottom of dialog
+    // Number of prefixed datasets is displayed at bottom of left pane.
+    this.prefixed_count = document.getElementById('dataset-prefixed-count');
+    // Toggle buttons at bottom of dialog.
     this.blackbox = document.getElementById('dataset-blackbox');
     this.blackbox.addEventListener(
         'click', () => DATASET_MANAGER.toggleBlackBox());
@@ -75,7 +71,7 @@ class GUIDatasetManager extends DatasetManager {
     this.io_box = document.getElementById('dataset-io');
     this.io_box.addEventListener(
         'click', () => DATASET_MANAGER.toggleImportExport());
-    // Modifier pane buttons
+    // Modifier pane buttons.
     document.getElementById('ds-add-modif-btn').addEventListener(
         'click', () => DATASET_MANAGER.promptForSelector('new'));
     document.getElementById('ds-rename-modif-btn').addEventListener(
@@ -86,9 +82,9 @@ class GUIDatasetManager extends DatasetManager {
         'click', () => DATASET_MANAGER.deleteModifier());
     document.getElementById('ds-convert-modif-btn').addEventListener(
         'click', () => DATASET_MANAGER.promptToConvertModifiers());
-    // Modifier table
+    // Modifier table.
     this.modifier_table = document.getElementById('dataset-modif-table');
-    // Modal dialogs
+    // Modal dialogs.
     this.new_modal = new ModalDialog('new-dataset');
     this.new_modal.ok.addEventListener(
         'click', () => DATASET_MANAGER.newDataset());
@@ -144,12 +140,13 @@ class GUIDatasetManager extends DatasetManager {
   reset() {
     super.reset();
     this.selected_prefix_row = null;
+    this.selected_dataset = null;
     this.selected_modifier = null;
     this.edited_expression = null;
-    this.filter_pattern = null;
     this.clicked_object = null;
     this.last_time_clicked = 0;
     this.focal_table = null;
+    this.prefixed_datasets = [];
     this.expanded_rows = [];
   }
   
@@ -170,7 +167,8 @@ class GUIDatasetManager extends DatasetManager {
   }
   
   enterKey() {
-    // Open "edit" dialog for the selected dataset or modifier expression
+    // Open "edit" dialog for the selected dataset or modifier expression.
+    if(!this.focal_table) this.focal_table = this.dataset_table;
     const srl = this.focal_table.getElementsByClassName('sel-set');
     if(srl.length > 0) {
       const r = this.focal_table.rows[srl[0].rowIndex];
@@ -190,7 +188,8 @@ class GUIDatasetManager extends DatasetManager {
   }
   
   upDownKey(dir) {
-    // Select row above or below the selected one (if possible)
+    // Select row above or below the selected one (if possible).
+    if(!this.focal_table) this.focal_table = this.dataset_table;
     const srl = this.focal_table.getElementsByClassName('sel-set');
     if(srl.length > 0) {
       let r = this.focal_table.rows[srl[0].rowIndex + dir];
@@ -206,11 +205,24 @@ class GUIDatasetManager extends DatasetManager {
     }
   }
   
+  expandToShow(name) {
+    // Expand all prefix rows for dataset having `name` so as to make it visible.
+    const pn = UI.prefixesAndName(name);
+    if(pn.length > 1) {
+      pn.pop();
+      while(pn.length) {
+        addDistinct(pn.join(UI.PREFIXER).toLowerCase(), this.expanded_rows);
+        pn.pop();
+      }
+      this.updateDialog();
+    }
+  }
+  
   hideCollapsedRows() {
-    // Hides all rows except top level and immediate children of expanded.
+    // Hide all rows except top level and immediate children of expanded.
     for(const row of this.dataset_table.rows) {
       const
-          // Get the first DIV in the first TD of this row
+          // Get the first DIV in the first TD of this row.
           first_div = row.firstChild.firstElementChild,
           btn = first_div.dataset.prefix === 'x';
       let p = row.dataset.prefix,
@@ -218,18 +230,18 @@ class GUIDatasetManager extends DatasetManager {
           show = !p || x;
       if(btn) {
         const btn_div = row.getElementsByClassName('tree-btn')[0];
-        // Special expand/collapse row
+        // Special expand/collapse row.
         if(show) {
-          // Set triangle to point down 
+          // Set triangle to point down.
           btn_div.innerText = '\u25BC';
         } else {
-          // Set triangle to point right 
+          // Set triangle to point right. 
           btn_div.innerText = '\u25BA';
-          // See whether "parent prefix" is expanded
+          // See whether "parent prefix" is expanded.
           p = p.split(UI.PREFIXER);
           p.pop();
           p = p.join(UI.PREFIXER);
-          // If so, then also show the row
+          // If so, then also show the row.
           show = (!p || this.expanded_rows.indexOf(p) >= 0);
         }
       }
@@ -238,7 +250,7 @@ class GUIDatasetManager extends DatasetManager {
   }
   
   togglePrefixRow(e) {
-    // Shows list items of the next prefix level
+    // Show list items of the next prefix level.
     let r = e.target;
     while(r.tagName !== 'TR') r = r.parentNode;
     const
@@ -246,7 +258,7 @@ class GUIDatasetManager extends DatasetManager {
         i = this.expanded_rows.indexOf(p);
     if(i >= 0) {
       this.expanded_rows.splice(i, 1);
-      // Also remove all prefixes that have `p` as prefix
+      // Also remove all prefixes that have `p` as prefix.
       for(let j = this.expanded_rows.length - 1; j >= 0; j--) {
         if(this.expanded_rows[j].startsWith(p + UI.PREFIXER)) {
           this.expanded_rows.splice(j, 1);
@@ -259,7 +271,7 @@ class GUIDatasetManager extends DatasetManager {
   }
   
   rowByPrefix(prefix) {
-    // Returns first table row with the specified prefix
+    // Return the first table row with the specified prefix.
     if(!prefix) return null;
     let lcp = prefix.toLowerCase(),
         pl = lcp.split(': ');
@@ -276,17 +288,29 @@ class GUIDatasetManager extends DatasetManager {
     for(const r of this.dataset_table.rows) if(r.dataset.prefix === lcp) return r;
     return null;
   }
+  
+  datasetsByPrefix(prefix) {
+    // Return the list of datasets having the specified prefix.
+    const
+        pid = UI.nameToID(prefix + UI.PREFIXER),
+        dsl = [];
+    for(const k of Object.keys(MODEL.datasets)) {
+      if(k.startsWith(pid)) dsl.push(k);
+    }
+    return dsl;
+  }
 
   selectPrefixRow(e) {
-    // Selects expand/collapse prefix row
+    // Select expand/collapse prefix row.
     this.focal_table = this.dataset_table;
-    // NOTE: `e` can also be a string specifying the prefix to select
+    // NOTE: `e` can also be a string specifying the prefix to select.
     let r = e.target || this.rowByPrefix(e);
     if(!r) return;
-    // Modeler may have clicked on the expand/collapse triangle;
+    // Modeler may have clicked on the expand/collapse triangle.
     const toggle = r.classList.contains('tree-btn');
     while(r.tagName !== 'TR') r = r.parentNode;
     this.selected_prefix_row = r;
+    this.prefixed_datasets = this.datasetsByPrefix(r.dataset.prefix);
     const sel = this.dataset_table.getElementsByClassName('sel-set');
     this.selected_dataset = null;
     if(sel.length > 0) {
@@ -296,7 +320,7 @@ class GUIDatasetManager extends DatasetManager {
     r.classList.add('sel-set');
     if(!e.target) r.scrollIntoView({block: 'center'});
     if(toggle || e.altKey || this.doubleClicked(r)) this.togglePrefixRow(e);
-    UI.enableButtons('ds-rename');      
+    this.updatePanes();      
   }
   
   updateDialog() {
@@ -306,18 +330,13 @@ class GUIDatasetManager extends DatasetManager {
         dnl = [],
         sd = this.selected_dataset,
         ioclass = ['', 'import', 'export'];
-    for(let d in MODEL.datasets) if(MODEL.datasets.hasOwnProperty(d) &&
-         // NOTE: do not list "black-boxed" entities
-        !d.startsWith(UI.BLACK_BOX) &&
-        // NOTE: do not list the equations dataset
-        MODEL.datasets[d] !== MODEL.equations_dataset) {
-      if(!this.filter_pattern || this.filter_pattern.length === 0 ||
-          patternMatch(MODEL.datasets[d].displayName, this.filter_pattern)) {
-        dnl.push(d);
-      }
+    for(let d in MODEL.datasets) if(MODEL.datasets.hasOwnProperty(d)) {
+      // NOTE: Do not list "black-boxed" entities or the equations dataset.
+      if(!d.startsWith(UI.BLACK_BOX) &&
+          MODEL.datasets[d] !== MODEL.equations_dataset) dnl.push(d);
     }
     dnl.sort((a, b) => UI.compareFullNames(a, b, true));
-    // First determine indentation levels, prefixes and names 
+    // First determine indentation levels, prefixes and names.
     const
         indent = [],
         pref_ids = [],
@@ -326,11 +345,11 @@ class GUIDatasetManager extends DatasetManager {
         xids = [];
     for(const dn of dnl) {
       const pref = UI.prefixesAndName(MODEL.datasets[dn].name);
-      // NOTE: only the name part (so no prefixes at all) will be shown
+      // NOTE: Only the name part (so no prefixes at all) will be shown.
       names.push(pref.pop());
       indent.push(pref.length);
-      // NOTE: ignore case but join again with ": " because prefixes
-      // can contain any character; only the prefixer is "reserved"
+      // NOTE: Ignore case but join again with ": " because prefixes
+      // can contain any character; only the prefixer is "reserved".
       const pref_id = pref.join(UI.PREFIXER).toLowerCase();
       pref_ids.push(pref_id);
       pref_names[pref_id] = pref;
@@ -348,11 +367,11 @@ class GUIDatasetManager extends DatasetManager {
       } else {
         ind_div = '';
       }
-      // NOTE: empty string should not add a collapse/expand row
+      // NOTE: Empty string should not add a collapse/expand row.
       if(pid && pid != prev_id && xids.indexOf(pid) < 0) {
         // NOTE: XX: aa may be followed by XX: YY: ZZ: bb, which requires
         // *two* collapsable lines: XX: YY and XX: YY: ZZ: before adding
-        // XX: YY: ZZ: bb
+        // XX: YY: ZZ: bb.
         const
             ps = pid.split(UI.PREFIXER),
             pps = prev_id.split(UI.PREFIXER),
@@ -360,20 +379,20 @@ class GUIDatasetManager extends DatasetManager {
             pns = pn.join(UI.PREFIXER),
             lpl = [];
         let lindent = 0;
-        // Ignore identical leading prefixes
+        // Ignore identical leading prefixes.
         while(ps.length > 0 && pps.length > 0 && ps[0] === pps[0]) {
           lpl.push(ps.shift());
           pps.shift();
           pn.shift();
           lindent++;
         }
-        // Add a "collapse" row for each new prefix
+        // Add a "collapse" row for each new prefix.
         while(ps.length > 0) {
           lpl.push(ps.shift());
           lindent++;
           const lpid = lpl.join(UI.PREFIXER);
           dl.push(['<tr data-prefix="', lpid,
-              '" data-prefix-name="', pns, '" class="dataset"',
+              '" data-prefix-name="', pns.slice(0, lpid.length), '" class="dataset"',
               'onclick="DATASET_MANAGER.selectPrefixRow(event);"><td>',
               // NOTE: data-prefix="x" signals that this is an extra row
               (lindent > 0 ?
@@ -383,7 +402,7 @@ class GUIDatasetManager extends DatasetManager {
               '<div data-prefix="x" class="tree-btn">',
               (this.expanded_rows.indexOf(lpid) >= 0 ? '\u25BC' : '\u25BA'),
               '</div>', pn.shift(), '</td></tr>'].join(''));
-          // Add to the list to prevent multiple c/x-rows for the same prefix
+          // Add to the list to prevent multiple c/x-rows for the same prefix.
           xids.push(lpid);
         }
       }
@@ -422,6 +441,7 @@ class GUIDatasetManager extends DatasetManager {
         sd = this.selected_dataset,
         btns = 'ds-data ds-clone ds-delete ds-rename';
     if(sd) {
+      this.prefixed_count.style.display = 'none';
       this.properties.style.display = 'block';
       document.getElementById('dataset-default').innerHTML =
           VM.sig4Dig(sd.default_value) +
@@ -454,8 +474,22 @@ class GUIDatasetManager extends DatasetManager {
       UI.enableButtons(btns);
     } else {
       this.properties.style.display = 'none';
+      const
+          pdsl = this.prefixed_datasets.length,
+          npds = pluralS(pdsl, 'dataset');
+      this.prefixed_count.innerText = npds;
+      this.prefixed_count.style.display = (pdsl ? 'block' : 'none');
       UI.disableButtons(btns);
-      if(this.selected_prefix_row) UI.enableButtons('ds-rename');
+      if(this.selected_prefix_row) {
+        UI.enableButtons('ds-rename ds-delete', true);
+        document.getElementById('ds-rename-btn')
+            .title = `Rename ${npds} by changing prefix "${this.selectedPrefix}"`;
+        document.getElementById('ds-delete-btn')
+            .title = `Delete ${npds} having prefix "${this.selectedPrefix}"`;        
+      } else {
+        document.getElementById('ds-rename-btn').title = 'Rename selected dataset';
+        document.getElementById('ds-delete-btn').title = 'Delete selected dataset';
+      }
     }
     this.updateModifiers();
   }
@@ -540,37 +574,14 @@ class GUIDatasetManager extends DatasetManager {
     if(d) DOCUMENTATION_MANAGER.update(d, shift);
   }
   
-  toggleFilter() {
-    const
-        btn = document.getElementById('ds-filter-btn'),
-        bar = document.getElementById('ds-filter-bar'),
-        dsa = document.getElementById('dataset-scroll-area');
-    if(btn.classList.toggle('stay-activ')) {
-      bar.style.display = 'block';
-      dsa.style.top = '81px';
-      dsa.style.height = 'calc(100% - 141px)';
-      this.changeFilter();
-    } else {
-      bar.style.display = 'none';
-      dsa.style.top = '62px';
-      dsa.style.height = 'calc(100% - 122px)';
-      this.filter_pattern = null; 
-      this.updateDialog();
-    }
-  }
-  
-  changeFilter() {
-    this.filter_pattern = patternList(this.filter_text.value);
-    this.updateDialog();
-  }
-  
   selectDataset(event, id) {
-    // Select dataset, or edit it when Alt- or double-clicked
+    // Select dataset, or edit it when Alt- or double-clicked.
     this.focal_table = this.dataset_table;
     const
         d = MODEL.datasets[id] || null,
         edit = event.altKey || this.doubleClicked(d);
     this.selected_dataset = d;
+    this.prefixed_datasets.length = 0;
     if(d && edit) {
       this.last_time_clicked = 0;
       this.editData();
@@ -733,18 +744,34 @@ class GUIDatasetManager extends DatasetManager {
       this.updateDialog();
     }    
   }
+  
+  get selectedAsList() {
+  // Return list of datasets selected directly or by prefix.
+    const dsl = [];
+    // Prevent including the equations dataset (just in case).
+    if(this.selected_dataset && this.selected_dataset !== MODEL.equations_dataset) {
+      dsl.push(this.selected_dataset);
+    } else {
+      // NOTE: List of prefixed datasets contains keys, not objects.
+      for(const k of this.prefixed_datasets) {
+        const ds = MODEL.datasets[k];
+        if(ds !== MODEL.equations_dataset) dsl.push();
+      }
+    }
+    return dsl;
+  }
 
   deleteDataset() {
-    const d = this.selected_dataset;
-    // Double-check, just in case...
-    if(d && d !== MODEL.equations_dataset) {
-      MODEL.removeImport(d);
-      MODEL.removeExport(d);
-      delete MODEL.datasets[d.identifier];
-      this.selected_dataset = null;
-      this.updateDialog();
-      MODEL.updateDimensions();      
+    // Delete selected dataset(s).
+    for(const ds of this.selectedAsList) {
+      MODEL.removeImport(ds);
+      MODEL.removeExport(ds);
+      delete MODEL.datasets[ds.identifier];
     }
+    this.selected_dataset = null;
+    this.prefixed_datasets.length = 0;
+    this.updateDialog();
+    MODEL.updateDimensions();      
   }
   
   toggleBlackBox() {
@@ -1047,7 +1074,7 @@ class GUIDatasetManager extends DatasetManager {
   }
   
   editData() {
-    // Show the Edit time series dialog
+    // Show the Edit time series dialog.
     const
         ds = this.selected_dataset,
         md = this.series_modal,
@@ -1057,7 +1084,7 @@ class GUIDatasetManager extends DatasetManager {
       md.element('unit').value = ds.scale_unit;
       cover.style.display = (ds.array ? 'block' : 'none');
       md.element('time-scale').value = VM.sig4Dig(ds.time_scale);
-      // Add options for time unit selector
+      // Add options for time unit selector.
       const ol = [];
       for(let u in VM.time_unit_shorthand) {
         if(VM.time_unit_shorthand.hasOwnProperty(u)) {
@@ -1067,7 +1094,7 @@ class GUIDatasetManager extends DatasetManager {
         }
       }
       md.element('time-unit').innerHTML = ol.join('');
-      // Add options for(dis)aggregation method selector
+      // Add options for(dis)aggregation method selector.
       ol.length = 0;
       for(let i = 0; i < this.methods.length; i++) {
         ol.push(['<option value="', this.methods[i],
@@ -1075,12 +1102,12 @@ class GUIDatasetManager extends DatasetManager {
             '">', this.method_names[i], '</option>'].join(''));
       }
       md.element('method').innerHTML = ol.join('');
-      // Update the "periodic" box
+      // Update the "periodic" box.
       UI.setBox('series-periodic', ds.periodic);
-      // Update the "array" box
+      // Update the "array" box.
       UI.setBox('series-array', ds.array);
       md.element('url').value = ds.url;
-      // Show data as decimal numbers (JS default notation) on separate lines
+      // Show data as decimal numbers (JS default notation) on separate lines.
       this.series_data.value = ds.data.join('\n');
       md.show('default');
     }
@@ -1203,7 +1230,8 @@ class GUIDatasetManager extends DatasetManager {
         UI.warn(`Invalid default value "${v}" in column ${i}`);
         return false;
       } else {
-        dsa.push([sf]);
+        // Push empty list, as this will become the actual dataset without default value.
+        dsa.push([]);
       }
     }
     for(let i = 2; i < n; i++) {
@@ -1212,7 +1240,7 @@ class GUIDatasetManager extends DatasetManager {
         UI.warn(`Number of values (${dsv.length}) on line ${i} does not match number of dataset names (${ncol})`);
         return false;
       }
-      for(let j = 0; j < dsv.length; j++) {
+      for(let j = 0; j < ncol; j++) {
         const
             v = dsv[j].trim(),
             sf = safeStrToFloat(v, '');
@@ -1220,6 +1248,7 @@ class GUIDatasetManager extends DatasetManager {
           UI.warn(`Invalid numerical value "${v}" for <strong>${dsn[j]}</strong> on line ${i}`);
           return false;
         }
+        dsa[j].push(sf);
       }
     }
     // Add or update datasets.

package/static/scripts/linny-r-gui-experiment-manager.js

@@ -441,19 +441,25 @@ class GUIExperimentManager extends ExperimentManager {
   }
   
   newExperiment() {
-    const n = this.new_modal.element('name').value.trim();
-    const x = MODEL.addExperiment(n);
-    if(x) {
-      this.new_modal.hide();
-      this.selected_experiment = x;
-      this.updateDialog();
+    // NOTE: Title must be a "clean" name: no \ or | and spacing reduced to
+    // a single space to permit using it unambiguously in experiment result
+    // specifiers of variable names.
+    const n = UI.cleanName(this.new_modal.element('name').value);
+    if(n) {
+      const x = MODEL.addExperiment(n);
+      if(x) {
+        this.new_modal.hide();
+        this.selected_experiment = x;
+        this.updateDialog();
+      }
+    } else {
+      this.new_modal.element('name').focus();
+      return;
     }
   }
   
   promptForName() {
     if(this.selected_experiment) {
-      this.rename_modal.element('former-name').innerHTML =
-          this.selected_experiment.title;
       this.rename_modal.element('name').value = '';
       this.rename_modal.show('name');
     }
@@ -464,12 +470,16 @@ class GUIExperimentManager extends ExperimentManager {
       const
           nel = this.rename_modal.element('name'),
           n = UI.cleanName(nel.value);
-      // Show modeler the "cleaned" new name
+      // Show modeler the "cleaned" new name.
       nel.value = n;
-      // Keep prompt open if title is empty string
+      // Keep prompt open if cleaned title is empty string, or identifies
+      // an existing experiment.
+      nel.focus();
       if(n) {
-        // Warn modeler if name already in use for some experiment
-        if(MODEL.indexOfExperiment(n) >= 0) {
+        // Warn modeler if name already in use for some experiment, other than
+        // the selected experiment (as upper/lower case changes must be possible).
+        if(MODEL.indexOfExperiment(n) >= 0 &&
+            n.toLowerCase() !== this.selected_experiment.title.toLowerCase()) {
           UI.warn(`An experiment with title "${n}" already exists`);
         } else {
           this.selected_experiment.title = n;

package/static/scripts/linny-r-gui-expression-editor.js

@@ -197,9 +197,9 @@ NOTE: Grouping groups results in a single group, e.g., (1;2);(3;4;5) evaluates a
       let n = '',
           a = '';
       if(ids[0] === 'link') {
-        n = document.getElementById('link-from-name').innerHTML +
+        n = document.getElementById('link-from-name').innerText +
             UI.LINK_ARROW +
-            document.getElementById('link-to-name').innerHTML;
+            document.getElementById('link-to-name').innerText;
       } else {
         n = document.getElementById(ids[0] + '-name').value;
         if(ids[0] === 'process') {
@@ -218,6 +218,7 @@ NOTE: Grouping groups results in a single group, e.g., (1;2);(3;4;5) evaluates a
     this.obj.value = 0;
     this.updateVariableBar();
     this.clearStatusBar();
+    this.showPrefix(UI.entityPrefix(prop));
     md.show('text');
   }
  
@@ -257,15 +258,20 @@ NOTE: Grouping groups results in a single group, e.g., (1;2);(3;4;5) evaluates a
     // the dataset and the selector as extra parameters for the parser.
     let own = null,
         sel = '';
-    if(!this.edited_input_id && DATASET_MANAGER.edited_expression) {
-      own = DATASET_MANAGER.selected_dataset;
-      sel = DATASET_MANAGER.selected_modifier.selector;
-    } else if(!this.edited_input_id && EQUATION_MANAGER.edited_expression) {
-      own = MODEL.equations_dataset;
-      sel = EQUATION_MANAGER.selected_modifier.selector;
-    } else if(!this.edited_input_id && CONSTRAINT_EDITOR.edited_expression) {
-      own = CONSTRAINT_EDITOR.selected;
-      sel = CONSTRAINT_EDITOR.selected_selector;
+    if(!this.edited_input_id) {
+      if(DATASET_MANAGER.edited_expression) {
+        own = DATASET_MANAGER.selected_dataset;
+        sel = DATASET_MANAGER.selected_modifier.selector;
+      } else if(EQUATION_MANAGER.edited_expression) {
+        own = MODEL.equations_dataset;
+        sel = EQUATION_MANAGER.selected_modifier.selector;
+      } else if(CONSTRAINT_EDITOR.edited_expression) {
+        own = CONSTRAINT_EDITOR.selected;
+        sel = CONSTRAINT_EDITOR.selected_selector;
+      } else if(UI.modals.datasetgroup.showing) {
+        own = UI.modals.datasetgroup.selected_ds;
+        sel = UI.modals.datasetgroup.selected_selector;
+      }
     } else {
       own = UI.edited_object;
       sel = this.edited_input_id.split('-').pop();
@@ -298,6 +304,8 @@ NOTE: Grouping groups results in a single group, e.g., (1;2);(3;4;5) evaluates a
       } else if(CONSTRAINT_EDITOR.edited_expression) {
         // NOTE: Boundline selector expressions may result in a grouping.
         CONSTRAINT_EDITOR.modifyExpression(xp.expr, xp.concatenating);
+      } else if(UI.modals.datasetgroup.showing) {
+        UI.modals.datasetgroup.modifyExpression(xp.expr);
       }
       UI.modals.expression.hide();
       return true;
@@ -308,7 +316,13 @@ NOTE: Grouping groups results in a single group, e.g., (1;2);(3;4;5) evaluates a
     this.status.style.backgroundColor = UI.color.dialog_background;
     this.status.innerHTML = ' ';
   }
-  
+
+  showPrefix(prefix) {  
+    // When editing an expression for a prefixed entity, show the prefix
+    // on the status line.
+    if(prefix) this.status.innerHTML = '<em>Prefix:</em> ' + prefix;
+  }
+
   namesByType(type) {
     // Returns a list of entity names of the specified types
     // (used only to generate the options of SELECT elements)