linny-r 1.9.3 → 2.0.2

package/static/scripts/linny-r-gui-controller.js

@@ -13,7 +13,7 @@ handler functions.
 */
 
 /*
-Copyright (c) 2017-2023 Delft University of Technology
+Copyright (c) 2017-2024 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
@@ -421,7 +421,7 @@ class GUIController extends Controller {
     this.edit_btns = ['clone', 'paste', 'delete', 'undo', 'redo'];
     this.model_btns = ['settings', 'save', 'repository', 'actors',
         'dataset', 'equation', 'chart', 'sensitivity', 'experiment',
-        'diagram', 'savediagram', 'finder', 'monitor', 'solve'];
+        'diagram', 'savediagram', 'finder', 'monitor', 'tex', 'solve'];
     this.other_btns = ['new', 'load', 'receiver', 'documentation',
         'parent', 'lift', 'solve', 'stop', 'reset', 'zoomin', 'zoomout',
         'stepback', 'stepforward', 'autosave', 'recall'];
@@ -549,7 +549,7 @@ class GUIController extends Controller {
     this.buttons.settings.addEventListener('click',
         () => UI.showSettingsDialog(MODEL));
     this.buttons.save.addEventListener('click',
-        () => FILE_MANAGER.saveModel());
+        () => FILE_MANAGER.saveModel(event.shiftKey));
     this.buttons.actors.addEventListener('click',
         () => ACTOR_MANAGER.showDialog());
     this.buttons.diagram.addEventListener('click',
@@ -569,6 +569,7 @@ class GUIController extends Controller {
     this.buttons.finder.addEventListener('click', tdf);
     this.buttons.monitor.addEventListener('click', tdf);
     this.buttons.documentation.addEventListener('click', tdf);
+    this.buttons.tex.addEventListener('click', tdf);
     // Cluster navigation elements:
     this.focal_name.addEventListener('click',
         () => UI.showClusterPropertiesDialog(MODEL.focal_cluster));
@@ -717,6 +718,10 @@ class GUIController extends Controller {
         () => SCALE_UNIT_MANAGER.show());
     this.modals.settings.element('solver-prefs-btn').addEventListener('click',
         () => UI.showSolverPreferencesDialog());
+    this.modals.settings.element('power').addEventListener('click',
+        () => UI.togglePowerGridButton());
+    this.modals.settings.element('power-btn').addEventListener('click',
+        () => POWER_GRID_MANAGER.show());
     // Make solver modal elements responsive.
     this.modals.solver.ok.addEventListener('click',
         () => UI.updateSolverPreferences());
@@ -773,7 +778,12 @@ class GUIController extends Controller {
     this.modals.process.element('UB-x').addEventListener('click', eoxedit);
     this.modals.process.element('IL-x').addEventListener('click', eoxedit);
     this.modals.process.element('LCF-x').addEventListener('click', eoxedit);
-
+    // Processes can represent power grid elements.
+    this.modals.process.element('grid-plate').addEventListener(
+        'mouseenter', () => UI.showGridPlateMenu('process'));
+    // Make the grid plate menu responsive.
+    this.modals.process.element('grid-plate-menu').addEventListener(
+        'mouseleave', () => UI.hideGridPlateMenu('process'));
     this.modals.product.ok.addEventListener('click',
         () => UI.updateProductProperties());
     this.modals.product.cancel.addEventListener('click',
@@ -1089,10 +1099,10 @@ class GUIController extends Controller {
     // Only then try to restart.
     if(SOLVER.user_id) return;
     UI.updating_modal.show();
-    setTimeout(() => UI.tryToRestart(0), 5000);
+    setTimeout(() => UI.tryToRestart(), 5000);
   }
 
-  tryToRestart(trials) {
+  tryToRestart() {
     // Fetch the current version number from the server. This may take
     // a wile, as the server was shut down and restarts only after npm
     // has updated the Linny-R software. Typically, this takes only a few
@@ -1122,6 +1132,7 @@ class GUIController extends Controller {
                 'confirm when prompted by your browser.');
               // Hide "update" button in server dialog.
               UI.modals.server.element('update').style.display = 'none';
+              return;
             } else {
               // Inform user that install appears to have failed.
               msg.push(
@@ -1135,11 +1146,7 @@ class GUIController extends Controller {
           }
         })
       .catch((err) => {
-          if(trials < 10) {
-            setTimeout(() => UI.tryToRestart(trials + 1), 5000);
-          } else {
-            UI.warn(UI.WARNING.NO_CONNECTION, err);
-          }
+          UI.warn(UI.WARNING.NO_CONNECTION, err);
         });    
   }
 
@@ -2242,8 +2249,9 @@ class GUIController extends Controller {
         while(i < inp.length && inp[i].disabled) i++;
         if(i < inp.length) {
           inp[i].focus();
-        } else if('constraint-modal xp-clusters-modal'.indexOf(topmod.id) >= 0) {
-          // NOTE: Constraint modal and "ignore clusters" modal must NOT close
+        } else if(['constraint-modal', 'boundline-data-modal',
+            'xp-clusters-modal'].indexOf(topmod.id) >= 0) {
+          // NOTE: Constraint modal, boundline data modal and "ignore clusters" modal must NOT close
           // when Enter is pressed, but only de-focus the input field.
           e.target.blur();
         } else {
@@ -2299,9 +2307,14 @@ class GUIController extends Controller {
       } else if(code === 'ArrowRight') {
         e.preventDefault();
         this.stepForward(e);
+      } else if(e.ctrlKey && code === 'KeyS') {
+        // Ctrl-S means: save model. Treat separately because Shift-key
+        // alters the way in which the model file is saved.
+        e.preventDefault();
+        FILE_MANAGER.saveModel(e.shiftKey);
       } else if(alt && code === 'KeyR') {
         // Alt-R means: run to diagnose infeasible/unbounded problem.
-          VM.solveModel(true);
+        VM.solveModel(true);
       } else if(alt && ['KeyC', 'KeyM'].indexOf(code) >= 0) {
         // Special shortcut keys for "clone selection" and "model settings".
         const be = new Event('click');
@@ -2763,8 +2776,8 @@ class GUIController extends Controller {
   }
   
   hideStayOnTopDialogs() {
-    // Hide and reset all stay-on-top dialogs (even when not showing)
-    // NOTE: this routine is called when a new model is loaded
+    // Hide and reset all stay-on-top dialogs (even when not showing).
+    // NOTE: This routine is called when a new model is loaded.
     DATASET_MANAGER.dialog.style.display = 'none';
     this.buttons.dataset.classList.remove('stay-activ');
     DATASET_MANAGER.reset();
@@ -2786,6 +2799,9 @@ class GUIController extends Controller {
     DOCUMENTATION_MANAGER.dialog.style.display = 'none';
     this.buttons.documentation.classList.remove('stay-activ');
     DOCUMENTATION_MANAGER.reset();
+    TEX_MANAGER.dialog.style.display = 'none';
+    this.buttons.tex.classList.remove('stay-activ');
+    TEX_MANAGER.reset();
     FINDER.dialog.style.display = 'none';
     this.buttons.finder.classList.remove('stay-activ');
     FINDER.reset();
@@ -3558,10 +3574,13 @@ console.log('HERE name conflicts', name_conflicts, mapping);
     this.setBox('settings-decimal-comma', model.decimal_comma);
     this.setBox('settings-align-to-grid', model.align_to_grid);
     this.setBox('settings-block-arrows', model.show_block_arrows);
-    this.setBox('settings-diagnose', MODEL.always_diagnose);
+    this.setBox('settings-diagnose', model.always_diagnose);
+    this.setBox('settings-power', model.with_power_flow);
     this.setBox('settings-cost-prices', model.infer_cost_prices);
     this.setBox('settings-report-results', model.report_results);
     this.setBox('settings-encrypt', model.encrypt);
+    const pg_btn = md.element('power-btn');
+    pg_btn.style.display = (model.with_power_flow ? 'inline-block' : 'none');
     md.show('name');
   }
   
@@ -3616,9 +3635,9 @@ console.log('HERE name conflicts', name_conflicts, mapping);
     model.report_results = UI.boxChecked('settings-report-results');
     model.encrypt = UI.boxChecked('settings-encrypt');
     model.decimal_comma = UI.boxChecked('settings-decimal-comma');
-    MODEL.always_diagnose = this.boxChecked('settings-diagnose');
+    model.always_diagnose = this.boxChecked('settings-diagnose');
     // Notify modeler that diagnosis changes the value of +INF.
-    if(MODEL.always_diagnose) {
+    if(model.always_diagnose) {
       UI.notify('To diagnose unbounded problems, values beyond 1e+10 ' +
           'are considered as infinite (\u221E)');
     }
@@ -3627,6 +3646,9 @@ console.log('HERE name conflicts', name_conflicts, mapping);
         redraw = !model.align_to_grid && cb;
     model.align_to_grid = cb;
     model.grid_pixels = Math.floor(px);
+    cb = UI.boxChecked('settings-power');
+    redraw = redraw || cb !== model.with_power_flow;
+    model.with_power_flow = cb;
     cb = UI.boxChecked('settings-cost-prices');
     redraw = redraw || cb !== model.infer_cost_prices;
     model.infer_cost_prices = cb;
@@ -3674,6 +3696,20 @@ console.log('HERE name conflicts', name_conflicts, mapping);
     if(redraw) this.drawDiagram(model);
   }
   
+  togglePowerGridButton() {
+    // Responds to clicking the "power grid options" checkbox by toggling
+    // the "View/edit power grids" button.
+    const
+        cb = this.modals.settings.element('power'),
+        pb = this.modals.settings.element('power-btn');
+    // NOTE: When clicked, state has not been updated yet. 
+    if(cb.classList.contains('clear')) {
+      pb.style.display = 'inline-block';
+    } else {
+      pb.style.display = 'none';
+    }
+  }
+  
   // Solver preferences modal
   
   showSolverPreferencesDialog() {
@@ -3749,6 +3785,17 @@ console.log('HERE name conflicts', name_conflicts, mapping);
     md.group = group;
     md.element('name').value = p.name;
     md.element('actor').value = (p.hasActor ? p.actor.name : '');
+    md.element('length').value = p.length_in_km;
+    md.grid_id = (p.grid ? p.grid.id : '');
+    this.hideGridPlateMenu('process');
+    this.updateGridFields();
+    const tex = md.element('tex-id');
+    tex.value = p.TEX_id;
+    if(TEX_MANAGER.visible) {
+      tex.style.display = 'block';
+    } else {
+      tex.style.display = 'none';
+    }
     // Focus on lower bound when showing the dialog for a group.
     if(group.length > 0) {
       attr = 'LB';
@@ -3766,6 +3813,61 @@ console.log('HERE name conflicts', name_conflicts, mapping);
       md.element(attr + '-x').dispatchEvent(new Event('click'));
     }
   }
+  
+  showGridPlateMenu(modal) {
+    const md = this.modals[modal];
+    POWER_GRID_MANAGER.updateGridMenu(modal);
+    md.element('grid-plate-menu').style.display = 'block';
+  }
+  
+  hideGridPlateMenu(modal) {
+    const md = this.modals[modal];
+    md.element('grid-plate-menu').style.display = 'none';
+  }
+  
+  setGridPlate(div) {
+    const
+        parts = div.id.split('-'),
+        modal = parts[0],
+        md = this.modals[modal],
+        id = parts.pop(),
+        grid = MODEL.powerGridByID(id);
+    // NOTE: Store power grid identifier as property of the modal.
+    md.grid_id = (grid ? id : '');
+    this.updateGridFields();
+  }
+  
+  updateGridFields() {
+    // Adjust the powergrid-related elements of the dialog according to
+    // the value of the `grid_id` property of the modal.
+    const
+        md = this.modals.process,
+        plate = md.element('grid-plate'),
+        overlay = md.element('grid-overlay'),
+        notab = ['LB', 'IL', 'LCF'],
+        pg = MODEL.powerGridByID(md.grid_id);
+    if(pg) {
+      plate.className = 'grid-kV-plate';
+      plate.style.backgroundColor = pg.color;
+      plate.innerHTML = pg.voltage;
+      overlay.style.display = 'block';
+      // Disable tab stop for the properties that are now not shown.
+      for(let i = 0; i < notab.length; i++) {
+        md.element(notab[i]).tabIndex = -1;
+      }
+    } else {
+      plate.innerHTML = '(&#x21AF;)';
+      plate.className = 'no-grid-plate';
+      overlay.style.display = 'none';
+      // Enable tab stop for the properties that are now not shown.
+      for(let i = 0; i < notab.length; i++) {
+        md.element(notab[i]).tabIndex = 0;
+      }
+    }
+    this.hideGridPlateMenu('process');
+    // Show plate "button" only when power grids option is set for model.
+    plate.style.display = (MODEL.with_power_flow ? 'block' : 'none');
+  }
 
   updateProcessProperties() {
     // Validates process properties, and only updates the edited process
@@ -3826,6 +3928,10 @@ console.log('HERE name conflicts', name_conflicts, mapping);
     p.integer_level = this.boxChecked('process-integer');
     p.level_to_zero = this.boxChecked('process-shut-down');
     p.collapsed = this.boxChecked('process-collapsed');
+    p.power_grid = MODEL.powerGridByID(md.grid_id);
+    p.length_in_km = safeStrToFloat(md.element('length').value, 0);
+    p.TEX_id = md.element('tex-id').value;
+    if(TEX_MANAGER.visible) TEX_MANAGER.update(p);
     if(md.group.length > 1) {
       // Redraw the entire diagram, as multiple processes may have changed.
       md.updateModifiedProperties(p);
@@ -3852,6 +3958,13 @@ console.log('HERE name conflicts', name_conflicts, mapping);
     md.element('P-unit').innerHTML =
         (p.scale_unit === '1' ? '' : '/' + p.scale_unit);
     md.element('currency').innerHTML = MODEL.currency_unit;
+    const tex = md.element('tex-id');
+    tex.value = p.TEX_id;
+    if(TEX_MANAGER.visible) {
+      tex.style.display = 'block';
+    } else {
+      tex.style.display = 'none';
+    }
     // NOTE: IO parameter status is not "group-edited"!
     this.setImportExportBox('product', MODEL.ioType(p));
     // Focus on lower bound when showing the dialog for a group.
@@ -3924,9 +4037,11 @@ console.log('HERE name conflicts', name_conflicts, mapping);
         p.upper_bound)) return false;
     if(p.name.startsWith('$')) {
       // NOTE: For actor cash flow data products, price and initial
-      // level must remain blank.
+      // level must remain blank...
       md.element('P').value = '';
       md.element('IL').value = '';
+      // ... and the unit must be the model's currency unit.
+      md.element('unit').value = MODEL.currency_unit;
     }
     if(!this.updateExpressionInput('product-IL', 'initial level',
         p.initial_level)) return false;
@@ -3943,10 +4058,10 @@ console.log('HERE name conflicts', name_conflicts, mapping);
     }
     // At this point, all input has been validated, so entity properties
     // can be modified.
+    p.changeScaleUnit(md.element('unit').value);
     if(!p.name.startsWith('$')) {
       // NOTE: For actor cash flow data products, these properties must
       // also retain their initial value.
-      p.changeScaleUnit(md.element('unit').value);
       p.is_source = this.boxChecked('product-source');
       p.is_sink = this.boxChecked('product-sink');
       // NOTE: Do not unset `is_data` if product has ingoing data arrows.
@@ -3964,6 +4079,8 @@ console.log('HERE name conflicts', name_conflicts, mapping);
     p.no_links = this.boxChecked('product-no-links');
     let must_redraw = (pnl !== p.no_links);
     MODEL.ioUpdate(p, this.getImportExportBox('product'));
+    p.TEX_id = md.element('tex-id').value;
+    if(TEX_MANAGER.visible) TEX_MANAGER.update(p);
     // If a group was edited, update all entities in this group. 
     if(md.group.length > 0) md.updateModifiedProperties(p);
     if(must_redraw || md.group.length > 1) {

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

@@ -11,7 +11,7 @@ for the Linny-R Dataset Manager dialog.
 */
 
 /*
-Copyright (c) 2017-2023 Delft University of Technology
+Copyright (c) 2017-2024 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
@@ -577,8 +577,8 @@ class GUIDatasetManager extends DatasetManager {
   }
   
   selectModifier(event, id, x=true) {
-    // Select modifier, or when double-clicked, edit its expression or the
-    // name of the modifier
+    // Select modifier, or when double-clicked, edit its expression when
+    // x = TRUE, or the name of the modifier when x = FALSE.
     this.focal_table = this.modifier_table;
     if(this.selected_dataset) {
       const m = this.selected_dataset.modifiers[UI.nameToID(id)],
@@ -781,13 +781,17 @@ class GUIDatasetManager extends DatasetManager {
       if(this.selected_modifier) ms = this.selected_modifier.selector;
       md = this.rename_selector_modal;
     }
+    md.element('type').innerText = 'dataset modifier';
     md.element('name').value = ms;
     md.show('name');
   }
 
   newModifier() {
+    const md = this.new_selector_modal;
+    // NOTE: Selector modal is also used by constraint editor.
+    if(md.element('type').innerText !== 'dataset modifier') return;
     const
-        sel = this.new_selector_modal.element('name').value,
+        sel = md.element('name').value,
         m = this.selected_dataset.addModifier(sel);
     if(m) {
       this.selected_modifier = m;
@@ -795,72 +799,76 @@ class GUIDatasetManager extends DatasetManager {
       // (ignoring those with wildcards)
       const sl = this.selected_dataset.plainSelectors;
       if(sl.length > 1) MODEL.expandDimension(sl);
-      this.new_selector_modal.hide();
+      md.hide();
       this.updateModifiers();
     }
   }
   
   renameModifier() {
     if(!this.selected_modifier) return;
+    const md = this.rename_selector_modal;
+    // NOTE: Selector modal is also used by constraint editor.
+    if(md.element('type').innerText !== 'dataset modifier') return;
     const
         wild = this.selected_modifier.hasWildcards,
-        sel = this.rename_selector_modal.element('name').value,
-        // NOTE: normal dataset selector, so remove all invalid characters
+        sel = md.element('name').value,
+        // NOTE: Normal dataset selector, so remove all invalid characters.
         clean_sel = sel.replace(/[^a-zA-z0-9\%\+\-\?\*]/g, ''),
         // Keep track of old name
         oldm = this.selected_modifier,
-        // NOTE: addModifier returns existing one if selector not changed
+        // NOTE: addModifier returns existing one if selector not changed.
         m = this.selected_dataset.addModifier(clean_sel);
     // NULL can result when new name is invalid
     if(!m) return;
-    // If selected modifier was the dataset default selector, update it
+    // If selected modifier was the dataset default selector, update it.
     if(oldm.selector === this.selected_dataset.default_selector) {
       this.selected_dataset.default_selector = m.selector;
     }
     MODEL.renameSelectorInExperiments(oldm.selector, clean_sel);
-    // If only case has changed, just update the selector
+    // If only case has changed, just update the selector.
     if(m === oldm) {
       m.selector = clean_sel;
       this.updateDialog();
-      this.rename_selector_modal.hide();
+      md.hide();
       return;
     }
-    // Rest is needed only when a new modifier has been added
+    // Rest is needed only when a new modifier has been added.
     m.expression = oldm.expression;
     if(wild) {
-      // Wildcard selector means: recompile the modifier expression
+      // Wildcard selector means: recompile the modifier expression.
       m.expression.attribute = m.selector;
       m.expression.compile();
     }
     this.deleteModifier();
     this.selected_modifier = m;
-    // Update all chartvariables referencing this dataset + old selector
+    // Update all chartvariables referencing this dataset + old selector.
     const vl = MODEL.datasetVariables;
     let cv_cnt = 0;
     for(let i = 0; i < vl.length; i++) {
+      const v = vl[i];
       if(v.object === this.selected_dataset && v.attribute === oldm.selector) {
         v.attribute = m.selector;
         cv_cnt++;
       }
     }
-    // Also replace old selector in all expressions (count these as well)
+    // Also replace old selector in all expressions (count these as well).
     const xr_cnt = MODEL.replaceAttributeInExpressions(
         oldm.dataset.name + '|' + oldm.selector, m.selector);
-    // Notify modeler of changes (if any)
+    // Notify modeler of changes (if any).
     const msg = [];
     if(cv_cnt) msg.push(pluralS(cv_cnt, ' chart variable'));
     if(xr_cnt) msg.push(pluralS(xr_cnt, ' expression variable'));
     if(msg.length) {
       UI.notify('Updated ' +  msg.join(' and '));
       // Also update these stay-on-top dialogs, as they may display a
-      // variable name for this dataset + modifier
+      // variable name for this dataset + modifier.
       UI.updateControllerDialogs('CDEFJX');
     }
-    // NOTE: update dimensions only if dataset now has 2 or more modifiers
-    // (ignoring those with wildcards)
+    // NOTE: Update dimensions only if dataset now has 2 or more modifiers
+    // (ignoring those with wildcards).
     const sl = this.selected_dataset.plainSelectors;
     if(sl.length > 1) MODEL.expandDimension(sl);
-    this.rename_selector_modal.hide();
+    md.hide();
     this.updateModifiers();
   }
   

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

@@ -12,7 +12,7 @@ viewing and editing documentation text for model entities.
 */
 
 /*
-Copyright (c) 2017-2023 Delft University of Technology
+Copyright (c) 2017-2024 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
@@ -336,8 +336,14 @@ class DocumentationManager {
         this.markup = (e.comments ? e.comments : '');
         this.editor.value = this.markup;
         this.viewer.innerHTML = this.markdown;
-        this.edit_btn.classList.remove('disab');
-        this.edit_btn.classList.add('enab');
+        if(e.grid && MODEL.solved && MODEL.with_power_flow) {
+          // Show cycle flows instead of comments.
+          const cf = POWER_GRID_MANAGER.allCycleFlows(e);
+          if(cf) this.viewer.innerHTML = cf;
+        } else {
+          this.edit_btn.classList.remove('disab');
+          this.edit_btn.classList.add('enab');
+        }
         // NOTE: Permit documentation of the model by raising the dialog.
         if(this.entity === MODEL) this.dialog.style.zIndex = 101;
       } else if(e instanceof DatasetModifier) {
@@ -354,6 +360,8 @@ class DocumentationManager {
         }
       }
     }
+    // When TEX renderer is visible, also update it.
+    if(TEX_MANAGER.visible) TEX_MANAGER.update(e, shift);
   }
   
   rewrite(str) {

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

@@ -11,7 +11,7 @@ for the Linny-R Equation Manager dialog.
 */
 
 /*
-Copyright (c) 2017-2023 Delft University of Technology
+Copyright (c) 2017-2024 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

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

@@ -11,7 +11,7 @@ for the Linny-R Experiment Manager dialog.
 */
 
 /*
-Copyright (c) 2017-2023 Delft University of Technology
+Copyright (c) 2017-2024 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

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

@@ -11,7 +11,7 @@ functionality for the Linny-R Expression Editor dialog.
 */
 
 /*
-Copyright (c) 2017-2023 Delft University of Technology
+Copyright (c) 2017-2024 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
@@ -263,6 +263,9 @@ NOTE: Grouping groups results in a single group, e.g., (1;2);(3;4;5) evaluates a
     } 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;
     } else {
       own = UI.edited_object;
       sel = this.edited_input_id.split('-').pop();
@@ -292,6 +295,9 @@ NOTE: Grouping groups results in a single group, e.g., (1;2);(3;4;5) evaluates a
         DATASET_MANAGER.modifyExpression(xp.expr);
       } else if(EQUATION_MANAGER.edited_expression) {
         EQUATION_MANAGER.modifyEquation(xp.expr);
+      } else if(CONSTRAINT_EDITOR.edited_expression) {
+        // NOTE: Boundline selector expressions may result in a grouping.
+        CONSTRAINT_EDITOR.modifyExpression(xp.expr, xp.concatenating);
       }
       UI.modals.expression.hide();
       return true;