linny-r 2.0.9 → 2.0.10

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

@@ -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());
@@ -58,14 +58,14 @@ class GUIDatasetManager extends DatasetManager {
         'click', () => DATASET_MANAGER.deleteDataset());
     document.getElementById('ds-filter-btn').addEventListener(
         'click', () => DATASET_MANAGER.toggleFilter());
-    // Update when filter input text changes 
+    // 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.
     this.properties = document.getElementById('dataset-properties');
-    // Toggle buttons at bottom of dialog
+    // Toggle buttons at bottom of dialog.
     this.blackbox = document.getElementById('dataset-blackbox');
     this.blackbox.addEventListener(
         'click', () => DATASET_MANAGER.toggleBlackBox());
@@ -75,7 +75,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 +86,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());
@@ -170,7 +170,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 +191,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 +208,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 +233,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 +253,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 +261,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 +274,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(': ');
@@ -278,12 +293,12 @@ class GUIDatasetManager extends DatasetManager {
   }
 
   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;
@@ -1047,7 +1062,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 +1072,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 +1082,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 +1090,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 +1218,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 +1228,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 +1236,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)

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

@@ -256,8 +256,8 @@ class Finder {
         }
       }
       // Also allow search for scale unit names.
-      if(et.indexOf('U') >= 0) {
-        imgs += '<img src="images/scale.png">';
+      if(et === 'U') {
+        imgs = '<img src="images/scale.png">';
         for(let k in MODEL.products) if(MODEL.products.hasOwnProperty(k)) {
           if(fp && !k.startsWith(UI.BLACK_BOX) && patternMatch(
               MODEL.products[k].scale_unit, this.filter_pattern)) {
@@ -266,6 +266,37 @@ class Finder {
             addDistinct('Q', this.filtered_types);
           }
         }
+        for(let k in MODEL.datasets) if(MODEL.datasets.hasOwnProperty(k)) {
+          if(fp && !k.startsWith(UI.BLACK_BOX)) {
+            const ds = MODEL.datasets[k];
+            if(ds !== MODEL.equations_dataset && patternMatch(
+                ds.scale_unit, this.filter_pattern)) {
+              enl.push(k);
+              this.entities.push(MODEL.datasets[k]);
+              addDistinct('D', this.filtered_types);
+            }
+          }
+        }
+      }
+      // Also allow search for dataset modifier selectors.
+      if(et.indexOf('S') >= 0) {
+        imgs = '<img src="images/dataset.png">';
+        for(let k in MODEL.datasets) if(MODEL.datasets.hasOwnProperty(k)) {
+          if(fp && !k.startsWith(UI.BLACK_BOX)) {
+            const ds = MODEL.datasets[k];
+            if(ds !== MODEL.equations_dataset) {
+              for(let mk in ds.modifiers) if(ds.modifiers.hasOwnProperty(mk)) {
+                if(patternMatch(
+                    ds.modifiers[mk].selector, this.filter_pattern)) {
+                  enl.push(k);
+                  this.entities.push(MODEL.datasets[k]);
+                  addDistinct('D', this.filtered_types);
+                  break;
+                }
+              }
+            }
+          }
+        }
       }
       // Also allow search for link multiplier symbols.
       if(et.indexOf('M') >= 0) {
@@ -341,11 +372,11 @@ class Finder {
   
   get entityGroup() {
     // Returns the list of filtered entities if all are of the same type,
-    // while excluding (no actor), (top cluster), datasets and equations.
+    // while excluding (no actor), (top cluster), and equations.
     const
         eg = [],
         ft = this.filtered_types[0];
-    if(this.filtered_types.length === 1 && 'DE'.indexOf(ft) < 0) {
+    if(this.filtered_types.length === 1 && ft !== 'E') {
       for(const e of this.entities) {
         // Exclude "no actor" and top cluster.
         if(e.name && e.name !== '(no_actor)' && e.name !== '(top_cluster)' &&
@@ -601,7 +632,7 @@ class Finder {
     // look only for the entity types denoted by these letters.
     let ft = this.filter_input.value,
         et = VM.entity_letters;
-    if(/^(\*|U|M|[ABCDELPQ]+)\?/i.test(ft)) {
+    if(/^(\*|U|M|S|[ABCDELPQ]+)\?/i.test(ft)) {
       ft = ft.split('?');
       // NOTE: *? denotes "all entity types except constraints".
       et = (ft[0] === '*' ? 'ACDELPQ' : ft[0].toUpperCase());
@@ -644,6 +675,7 @@ class Finder {
         if(UI.hidden('dataset-dlg')) {
           UI.buttons.dataset.dispatchEvent(new Event('click'));
         }
+        DATASET_MANAGER.expandToShow(obj.name);
         DATASET_MANAGER.selected_dataset = obj;
         DATASET_MANAGER.updateDialog();
       } else if(obj instanceof DatasetModifier) {
@@ -777,9 +809,162 @@ class Finder {
       UI.showLinkPropertiesDialog(e, 'R', false, group);
     } else if(e instanceof Cluster) {
       UI.showClusterPropertiesDialog(e, group);
+    } else if(e instanceof Dataset) {
+      this.showDatasetGroupDialog(e, group);
     }
   }
   
+  showDatasetGroupDialog(ds, dsl) {
+    // Initialize fields with properties of first element of `dsl`.
+    if(!dsl.length) return;
+    const md = UI.modals.datasetgroup;
+    md.group = dsl;
+    md.selected_ds = ds;
+    md.element('no-time-msg').style.display = (ds.array ? 'block' : 'none');
+    md.show('prefix', ds);
+  }
+  
+  updateDatasetGroupProperties() {
+    // Update properties of selected group of datasets.
+    const md = UI.modals.datasetgroup;
+    if(!md.group.length) return;
+    // Reduce multiple spaces to a single space.
+    let prefix = md.element('prefix').value.replaceAll(/\s+/gi, ' ').trim();
+    // Trim trailing colons (also when they have spaces between them).
+    while(prefix.endsWith(':')) prefix = prefix.slice(0, -1).trim();
+    // Count the updated chart variables and expressions.
+    let cv_cnt = 0,
+        xr_cnt = 0;
+    // Only rename datasets if prefix has been changed.
+    if(prefix !== md.shared_prefix) {
+      // Check whether prefix is valid.
+      if(prefix && !UI.validName(prefix)) {
+        UI.warn(`Invalid prefix "${prefix}"`);
+        return;
+      }
+      // Add the prefixer ": " to make it a true prefix.
+      if(prefix) prefix += UI.PREFIXER;
+      let old_prefix = md.shared_prefix;
+      if(old_prefix) old_prefix += UI.PREFIXER;
+      // Check whether prefix will create name conflicts.
+      let nc = 0;
+      for(const ds of md.group) {
+        let nn = ds.name;
+        if(nn.startsWith(old_prefix)) {
+          nn = nn.replace(old_prefix, prefix);
+          const obj = MODEL.objectByName(nn);
+          if(obj && obj !== ds) {
+            console.log('Anticipated name conflict with', obj.type,
+                obj.displayName);
+            nc++;
+          }
+        }
+      }
+      if(nc > 0) {
+        UI.warn(`Prefix "${prefix}" will result in` +
+            pluralS(nc, 'name conflict'));
+        return;
+      }
+      // Rename the datasets -- this may affect the group.
+      MODEL.renamePrefixedDatasets(old_prefix, prefix, md.group);
+      cv_cnt += MODEL.variable_count;
+      xr_cnt += MODEL.expression_count;
+    }
+    // Validate input field values.
+    const dv = UI.validNumericInput('datasetgroup-default', 'default value');
+    if(dv === false) return;
+    const ts = UI.validNumericInput('datasetgroup-time-scale', 'time step');
+    if(ts === false) return;
+    // No issues => update *only the modified* properties of all datasets in
+    // the group.
+    const data = {
+        'default': dv,
+        'unit': md.element('unit').value.trim(),
+        'periodic': UI.boxChecked('datasetgroup-periodic'),
+        'array': UI.boxChecked('datasetgroup-array'),
+        'time-scale': ts,
+        'time-unit': md.element('time-unit').value,
+        'method': md.element('method').value
+      };
+    for(let name in md.fields) if(md.changed[name]) {
+      const
+          prop = md.fields[name],
+          value = data[name];
+      for(const ds of md.group) ds[prop] = value;
+    }
+    // Also update the dataset modifiers.
+    const dsv_list = MODEL.datasetVariables;
+    for(const ds of md.group) {
+      for(const k of Object.keys(md.selectors)) {
+        const sel = md.selectors[k];
+        if(ds.modifiers.hasOwnProperty(k)) {
+           // If dataset `ds` has selector with key `k`,
+           // first check if it has been deleted.
+          if(sel.deleted) {
+            // If so, delete this modifier it from `ds`.
+            if(k === ds.default_selector) ds.default_selector = '';
+            delete ds.modifiers[k];
+          } else {
+            // If not deleted, check whether the selector was renamed.
+            const dsm = ds.modifiers[k];
+            let s = k;
+            if(sel.new_s) {
+              // If so, let `s` be the key for new selector.
+              s = UI.nameToID(sel.new_s);
+              dsm.selector = sel.new_s;
+              if(s !== k) {
+                // Add modifier with its own selector key.
+                ds.modifiers[s] = ds.modifiers[k];
+                delete ds.modifiers[k];
+              }
+              // Always update all chart variables referencing dataset + old selector.
+              for(const v of dsv_list) {
+                if(v.object === ds && v.attribute === sel.sel) {
+                  v.attribute = sel.new_s;
+                  cv_cnt++;
+                }
+              }
+              // Also replace old selector in all expressions (count these as well).
+              xr_cnt += MODEL.replaceAttributeInExpressions(
+                  ds.name + '|' + sel.sel, sel.new_s);
+            }
+            // NOTE: Keep original expression unless a new expression is specified.
+            if(sel.new_x) {
+              dsm.expression.text = sel.new_x;
+              // Clear code so the expresion will be recompiled.
+              dsm.expression.code = null;
+            }
+          }
+        } else {
+          // If dataset `ds` has NO selector with key `k`, add the (new) selector.
+          let s = sel.sel,
+              id = k;
+          if(sel.new_s) {
+            s = sel.new_s;
+            id = UI.nameToID(sel.new_s);
+          }
+          const dsm = new DatasetModifier(ds, s);
+          dsm.expression.text = (sel.new_x === false ? sel.expr : sel.new_x);
+          ds.modifiers[id] = dsm;
+        }
+      }
+      // Set the new default selector (if changed).
+      if(md.new_defsel !== false) ds.default_selector = md.new_defsel;
+    }
+    // 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 '));
+    }
+    MODEL.cleanUpScaleUnits();
+    MODEL.updateDimensions();
+    md.hide();
+    // Also update the draggable dialogs that may be affected.
+    UI.updateControllerDialogs('CDEFIJX');
+  }
+
   copyAttributesToClipboard(shift) {
     // Copy relevant entity attributes as tab-separated text to clipboard.
     // NOTE: All entity types have "get" method `attributes` that returns an