linny-r 2.0.8 → 2.0.10

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-file-manager.js

@@ -47,13 +47,11 @@ class GUIFileManager {
   // buttons on the top menu.
 
   getRemoteData(dataset, url) {
-    // Gets data from a URL, or from a file on the local host 
+    // Gets data from a URL, or from a file on the local host.
     if(url === '') return;
     if(url.indexOf('%') >= 0) {
       // Expand %i, %j and %k if used in the URL.
-      const letters = ['i', 'j', 'k'];
-      for(let i = 0; i < letters.length; i++) {
-        const l = letters[i];
+      for(const l of ['i', 'j', 'k']) {
         url = url.replaceAll('%' + l, valueOfIndexVariable(l));
       }
     }
@@ -361,9 +359,8 @@ class GUIFileManager {
     }
     fetch('autosave/', postData({
           action: 'store',
-          file: REPOSITORY_BROWSER.asFileName(
-              (MODEL.name || 'no-name') + '_by_' +
-                  (MODEL.author || 'no-author')),
+          file: asFileName((MODEL.name || 'no-name') +
+              '_by_' + (MODEL.author || 'no-author')),
           xml: MODEL.asXML,
           wsd: workspace
         }))
@@ -404,10 +401,9 @@ class GUIFileManager {
     }
   }
   
-  renderDiagramAsPNG(tight) {
-    // When `tight` is TRUE, add no whitespace around the diagram.
-    window.localStorage.removeItem('png-url');
-    if(tight) {
+  saveDiagramAsSVG(event) {
+    // Output SVG as string with nodes and arrows 100% opaque.
+    if(event.altKey) {
       // First align to grid and then fit to size.
       MODEL.alignToGrid();      
       UI.paper.fitToSize(1);
@@ -415,48 +411,15 @@ class GUIFileManager {
       UI.paper.fitToSize();
       MODEL.alignToGrid();      
     }
-    this.renderSVGAsPNG(UI.paper.opaqueSVG);
-  }
-  
-  renderSVGAsPNG(svg) {
-    // Sends SVG to the server, which will convert it to PNG using Inkscape;
-    // if successful, the server will return the URL to the PNG file location;
-    // this URL is passed via the browser's local storage to the newly opened
-    // browser tab that awaits this URL and then loads it
-    const form = {
-            action: 'png',
-            user: VM.solver_user,
-            token: VM.solver_token,
-            data: btoa(encodeURI(svg))
-          };
-    fetch('solver/', postData(form))
-      .then((response) => {
-          if(!response.ok) {
-            UI.alert(`ERROR ${response.status}: ${response.statusText}`);
-          }
-          return response.text();
-        })
-      .then((data) => {
-          // Pass URL of image to the newly opened browser window
-          window.localStorage.setItem('png-url', data);
-        })
-      .catch((err) => UI.warn(UI.WARNING.NO_CONNECTION, err));
-  }
-  
-  saveDiagramAsSVG(tight) {
-    // Output SVG as string with nodes and arrows 100% opaque.
-    if(tight) {
-      // First align to grid and then fit to size.
-      MODEL.alignToGrid();      
-      UI.paper.fitToSize(1);
+    if(event.shiftKey) {
+      this.pushOutSVG(UI.paper.opaqueSVG);
     } else {
-      UI.paper.fitToSize();
-      MODEL.alignToGrid();      
+      this.pushOutPNG(UI.paper.opaqueSVG);
     }
-    this.pushOutSVG(UI.paper.opaqueSVG);
   }
   
   pushOutSVG(svg) {
+    // Output SVG to browser as SVG image file download.
     const blob = new Blob([svg], {'type': 'image/svg+xml'});
     const e = document.getElementById('svg-saver');
     e.download = 'model.svg';
@@ -464,5 +427,36 @@ class GUIFileManager {
     e.href = (window.URL || webkitURL).createObjectURL(blob);
     e.click();
   }  
+
+  pushOutPNG(svg) {
+    // Output SVG to browser as PNG image file download.
+    const
+        bytes = new TextEncoder().encode(svg),
+        binstr = Array.from(bytes, (b) => String.fromCodePoint(b)).join(''),
+        uri = 'data:image/svg+xml;base64,' + window.btoa(binstr),
+        img = new Image();
+    img.onload = () => {
+        const
+            cvs = document.createElement('canvas'),
+            ctx = cvs.getContext('2d');
+        cvs.width = img.width * 4;
+        cvs.height = img.height * 4;
+        ctx.scale(4, 4);
+        ctx.drawImage(img, 0, 0);
+        cvs.toBlob(blob => {
+            const
+                e = document.getElementById('svg-saver'),
+                url = (window.URL || webkitURL).createObjectURL(blob),
+                name = asFileName(MODEL.focal_cluster.parent ?
+                    MODEL.focal_cluster.displayName : MODEL.name) ||
+                'Linny-R-model';
+            e.download = name + '.png';
+            e.type = 'image/png';
+            e.href = url;
+            e.click();
+          });
+    };
+    img.src = uri;      
+  }
  
 } // END of class GUIFileManager

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

@@ -46,7 +46,10 @@ class Finder {
     this.filter_input.addEventListener('input', () => FINDER.changeFilter());
     this.edit_btn = document.getElementById('finder-edit-btn');
     this.edit_btn.addEventListener(
-        'click', (event) => FINDER.editAttributes());
+        'click', () => FINDER.editAttributes());
+    this.chart_btn = document.getElementById('finder-chart-btn');
+    this.chart_btn.addEventListener(
+        'click', () => FINDER.confirmAddChartVariables());
     this.copy_btn = document.getElementById('finder-copy-btn');
     this.copy_btn.addEventListener(
         'click', (event) => FINDER.copyAttributesToClipboard(event.shiftKey));
@@ -54,6 +57,13 @@ class Finder {
     this.item_table = document.getElementById('finder-item-table');
     this.expression_table = document.getElementById('finder-expression-table');
         
+    // The Confirm add chart variables modal.
+    this.add_chart_variables_modal = new ModalDialog('confirm-add-chart-variables');
+    this.add_chart_variables_modal.ok.addEventListener(
+        'click', () => FINDER.addVariablesToChart());
+    this.add_chart_variables_modal.cancel.addEventListener(
+        'click', () => FINDER.add_chart_variables_modal.hide());
+
     // Attribute headers are used by Finder to output entity attribute values.
     this.attribute_headers = {
         A: 'ACTORS:\tWeight\tCash IN\tCash OUT\tCash FLOW',
@@ -246,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)) {
@@ -256,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) {
@@ -301,41 +342,100 @@ class Finder {
     this.edit_btn.style.display = 'none';
     this.copy_btn.style.display = 'none';
     if(n > 0) {
-      this.copy_btn.style.display = 'block';
+      this.copy_btn.style.display = 'inline-block';
+      if(CHART_MANAGER.visible && CHART_MANAGER.chart_index >= 0) {
+        const ca = this.commonAttributes;
+        if(ca.length) {
+          this.chart_btn.title = 'Add ' + pluralS(n, 'variable') +
+              ' to selected chart';
+          this.chart_btn.style.display = 'inline-block';
+        }
+      }
       n = this.entityGroup.length;
       if(n > 0) {
         this.edit_btn.title = 'Edit attributes of ' +
             pluralS(n, this.entities[0].type.toLowerCase());
-        this.edit_btn.style.display = 'block';
+        this.edit_btn.style.display = 'inline-block';
       }
     }
     this.updateRightPane();
   }
   
+  get commonAttributes() {
+    // Returns list of attributes that all filtered entities have in common.
+    let ca = Object.keys(VM.attribute_names);
+    for(const et of this.filtered_types) {
+      ca = intersection(ca, VM.attribute_codes[et]);
+    }
+    return ca;
+  }
+  
   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 = [],
-        n = this.entities.length;
-    if(n > 0) {
-      const ft = this.filtered_types[0];
-      if(this.filtered_types.length === 1 && 'DE'.indexOf(ft) < 0) {
-        for(let i = 0; i < n; i++) {
-          const e = this.entities[i];
-          // Exclude "no actor" and top cluster.
-          if(e.name && e.name !== '(no_actor)' && e.name !== '(top_cluster)' &&
-              // Also exclude actor cash flow data products because
-              // many of their properties should not be changed.
-              !e.name.startsWith('$')) {
-            eg.push(e);
-          }
+        ft = this.filtered_types[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)' &&
+            // Also exclude actor cash flow data products because
+            // many of their properties should not be changed.
+            !e.name.startsWith('$')) {
+          eg.push(e);
         }
       }
     }
     return eg;
   }
   
+  confirmAddChartVariables() {
+    // Show confirmation dialog to add variables to chart.
+    const
+        md = this.add_chart_variables_modal,
+        n = this.entities.length,
+        ca = this.commonAttributes;
+    let html,
+        et = '1 entity';
+    if(this.filtered_types.length === 1) {
+      et = pluralS(n, this.entities[0].type.toLowerCase());
+    } else if(n !== 1) {
+      et = `${n} entities`;
+    }
+    for(const a of ca) {
+      html += `<option value="${a}">${VM.attribute_names[a]}</option>`;
+    }
+    md.element('attribute').innerHTML = html;
+    md.element('count').innerText = et;
+    md.show();
+  }
+  
+  addVariablesToChart() {
+    // Add selected attribute for each filtered entity as chart variable
+    // to the selected chart.
+    const
+        md = this.add_chart_variables_modal,
+        ci = CHART_MANAGER.chart_index;
+    // Double-check whether chart exists.
+    if(ci < 0 || ci >= MODEL.charts.length) {
+      console.log('ANOMALY: No chart for index', ci);
+    }
+    const
+        c = MODEL.charts[ci],
+        a = md.element('attribute').value,
+        s = UI.boxChecked('confirm-add-chart-variables-stacked'),
+        enl = [];
+    for(const e of this.entities) enl.push(e.name);
+    enl.sort((a, b) => UI.compareFullNames(a, b, true));
+    for(const en of enl) {
+      const vi = c.addVariable(en, a);
+      if(vi !== null) c.variables[vi].stacked = s;
+    }
+    CHART_MANAGER.updateDialog();
+    md.hide();
+  }
+  
   updateRightPane() {
     const
         se = this.selected_entity,
@@ -352,10 +452,7 @@ class Finder {
         if(se.cluster) occ.push(se.cluster.identifier);
       } else if(se instanceof Product) {
         // Products "occur" in clusters where they have a position.
-        const cl = se.productPositionClusters;
-        for(let i = 0; i < cl.length; i++) {
-          occ.push(cl[i].identifier);
-        }
+        for(const c of se.productPositionClusters) occ.push(c.identifier);
       } else if(se instanceof Actor) {
         // Actors "occur" in clusters where they "own" processes or clusters.
         for(let k in MODEL.processes) if(MODEL.processes.hasOwnProperty(k)) {
@@ -374,13 +471,12 @@ class Finder {
       // NOTE: No "occurrence" of datasets or equations.
       // @@TO DO: identify MODULES (?)
       // All entities can also occur as chart variables.
-      for(let j = 0; j < MODEL.charts.length; j++) {
-        const c = MODEL.charts[j];
-        for(let k = 0; k < c.variables.length; k++) {
-          const v = c.variables[k];
+      for(let ci = 0; ci < MODEL.charts.length; ci++) {
+        const c = MODEL.charts[ci];
+        for(const v of c.variables) {
           if(v.object === se || (se instanceof DatasetModifier &&
               se.identifier === UI.nameToID(v.attribute))) {
-            occ.push(MODEL.chart_id_prefix + j);
+            occ.push(MODEL.chart_id_prefix + ci);
             break;
           }
         }
@@ -437,9 +533,8 @@ class Finder {
       // Check all notes in clusters for their color expressions and field.
       for(let k in MODEL.clusters) if(MODEL.clusters.hasOwnProperty(k)) {
         const c = MODEL.clusters[k];
-        for(let i = 0; i < c.notes.length; i++) {
-          const n = c.notes[i];
-          // Look for entity in both note contents and note color expression
+        for(const n of c.notes) {
+          // Look for entity in both note contents and note color expression.
           if(re.test(n.color.text) || re.test(n.contents)) {
             xal.push('NOTE');
             xol.push(n.identifier);
@@ -463,11 +558,9 @@ class Finder {
         const c = MODEL.constraints[k];
         for(let i = 0; i < c.bound_lines.length; i++) {
           const bl = c.bound_lines[i];
-          for(let j = 0; j < bl.selectors.length; j++) {
-            if(re.test(bl.selectors[j].expression.text)) {
-              xal.push('I' + (i + 1));
-              xol.push(c.identifier);
-            }
+          for(const sel of bl.selectors) if(re.test(sel.expression.text)) {
+            xal.push('I' + (i + 1));
+            xol.push(c.identifier);
           }
         }
       }
@@ -539,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());
@@ -582,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) {
@@ -715,33 +809,183 @@ 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" `attributes` that returns an
+    // NOTE: All entity types have "get" method `attributes` that returns an
     // object that for each defined attribute (and if model has been
     // solved also each inferred attribute) has a property with its value.
-    // For dynamic expressions, the expression text is used
+    // For dynamic expressions, the expression text is used.
     const ea_dict = {A: [], B: [], C: [], D: [], E: [], L: [], P: [], Q: []};
-    let e = this.selected_entity;
+    const e = this.selected_entity;
     if(shift && e) {
       ea_dict[e.typeLetter].push(e.attributes);
     } else {
-      for(let i = 0; i < this.entities.length; i++) {
-        e = this.entities[i];
-        ea_dict[e.typeLetter].push(e.attributes);
-      }
+      for(const e of this.entities) ea_dict[e.typeLetter].push(e.attributes);
     }
     const
       seq = ['A', 'B', 'C', 'D', 'E', 'P', 'Q', 'L'],
       text = [],
       attr = [];
-    for(let i = 0; i < seq.length; i++) {
+    for(const etl of seq) {
       const
-          etl = seq[i],
-          ead = ea_dict[etl];
+          ead = ea_dict[etl],
+          atcodes = VM.attribute_codes[etl];
       if(ead && ead.length > 0) {
         // No blank line before first entity type.
         if(text.length > 0) text.push('');
@@ -755,14 +999,9 @@ class Finder {
         }
         text.push(ah);
         attr.length = 0;
-        for(let i = 0; i < ead.length; i++) {
-          const
-              ea = ead[i],
-              ac = VM.attribute_codes[etl],
-              al = [ea.name];
-          for(let j = 0; j < ac.length; j++) {
-            if(ea.hasOwnProperty(ac[j])) al.push(ea[ac[j]]);
-          }
+        for(const ea of ead) {
+          const al = [ea.name];
+          for(const ac of atcodes) if(ea.hasOwnProperty(ac)) al.push(ea[ac]);
           attr.push(al.join('\t'));
         }
         attr.sort();