reset just within the dialog

lineupjs · Mar 18, 2020 · c8e6e46 · c8e6e46
1 parent 768f550
commit c8e6e46
Show file tree

Hide file tree

Showing 23 changed files with 32 additions and 52 deletions.
diff --git a/src/renderer/HistogramCellRenderer.ts b/src/renderer/HistogramCellRenderer.ts
@@ -1,5 +1,5 @@
 import {normalizedStatsBuilder, IStatistics, round, getNumberOfBins} from '../internal';
-import {Column, IDataRow, IOrderedGroup, INumberColumn, INumbersColumn, isNumberColumn, isNumbersColumn, IMapAbleColumn, isMapAbleColumn} from '../model';
+import {Column, IDataRow, IOrderedGroup, INumberColumn, INumbersColumn, isNumberColumn, isNumbersColumn, IMapAbleColumn, isMapAbleColumn, INumberFilter} from '../model';
 import InputNumberDialog from '../ui/dialogs/InputNumberDialog';
 import {colorOf} from './impose';
 import {IRenderContext, ERenderMode, ICellRendererFactory, IImposer, IRenderTasks} from './interfaces';
@@ -142,14 +142,14 @@ export function createNumberFilter(col: INumberColumn & IMapAbleColumn, parent:
 
   const updateFilter = initFilter(summaryNode, fContext);
 
-  const rerender = () => {
+  const rerender = (filter?: INumberFilter) => {
     const ready = context.tasks.summaryNumberStats(col).then((r) => {
       if (typeof r === 'symbol') {
         return;
       }
       const {summary, data} = r;
-
-      updateFilter(data ? data.missing : (summary ? summary.missing : 0), createFilterInfo(col));
+      currentFilter = createFilterInfo(col, filter);
+      updateFilter(data ? data.missing : (summary ? summary.missing : 0), currentFilter);
       summaryNode.classList.toggle(cssClass('missing'), !summary);
       if (!summary) {
         return;
@@ -167,8 +167,7 @@ export function createNumberFilter(col: INumberColumn & IMapAbleColumn, parent:
 
   return {
     reset() {
-      col.setFilter(noNumberFilter());
-      rerender();
+      rerender(noNumberFilter());
     },
     submit() {
       applyFilter(currentFilter.filterMissing, currentFilter.filterMin, currentFilter.filterMax);
@@ -192,8 +191,7 @@ export function getHistDOMRenderer(col: INumberColumn, imposer?: IImposer) {
   };
 }
 
-function createFilterInfo(col: IMapAbleColumn): IFilterInfo<number> {
-  const filter = col.getFilter();
+function createFilterInfo(col: IMapAbleColumn, filter = col.getFilter()): IFilterInfo<number> {
   const domain = col.getMapping().domain;
   const filterMin = isFinite(filter.min) ? filter.min : domain[0];
   const filterMax = isFinite(filter.max) ? filter.max : domain[1];

diff --git a/src/ui/dialogs/ADialog.ts b/src/ui/dialogs/ADialog.ts
@@ -138,7 +138,7 @@ abstract class ADialog {
         return false;
       }
       if (this.submit()) {
-        this.destroy();
+        this.destroy(true);
       }
       return false;
     };
@@ -148,7 +148,7 @@ abstract class ADialog {
         evt.stopPropagation();
         evt.preventDefault();
         this.cancel();
-        this.destroy();
+        this.destroy(true);
       };
     }
 
@@ -173,17 +173,17 @@ abstract class ADialog {
 
   protected abstract cancel(): void;
 
-  onBackgroundClick(action: 'cancel' | 'confirm') {
+  onBackgroundClick(action: 'cancel' | 'confirm' | 'auto') {
     if (action === 'confirm') {
       this.submit(); // TODO what if submit wasn't successful?
-    } else {
+    } else if (action === 'cancel') {
       this.cancel();
     }
-    this.destroy();
+    this.destroy(true);
   }
 
-  protected destroy() {
-    this.dialog.manager.remove(this);
+  protected destroy(handled = false) {
+    this.dialog.manager.remove(this, handled);
     if (this.popper) {
       this.popper.destroy();
     }

diff --git a/src/ui/dialogs/BooleanFilterDialog.ts b/src/ui/dialogs/BooleanFilterDialog.ts
@@ -30,7 +30,6 @@ export default class BooleanFilterDialog extends ADialog {
   protected reset() {
     const v = 'null';
     this.forEach('input[type="radio"]', (d: HTMLInputElement) => d.checked = d.value === v);
-    this.updateFilter(null);
   }
 
   protected cancel() {

diff --git a/src/ui/dialogs/CategoricalColorMappingDialog.ts b/src/ui/dialogs/CategoricalColorMappingDialog.ts
@@ -59,7 +59,6 @@ export default class CategoricalColorMappingDialog extends ADialog {
     this.forEach('[data-cat]', (n: HTMLInputElement, i) => {
       n.value = color(cats[i]!.color)!.hex();
     });
-    this.column.setColorMapping(DEFAULT_CATEGORICAL_COLOR_FUNCTION);
   }
 
   submit() {

diff --git a/src/ui/dialogs/CategoricalFilterDialog.ts b/src/ui/dialogs/CategoricalFilterDialog.ts
@@ -52,7 +52,6 @@ export default class CategoricalFilterDialog extends ADialog {
 
   protected reset() {
     this.forEach('input[data-cat]', (n: HTMLInputElement) => n.checked = true);
-    this.updateFilter(null, false);
   }
 
   protected cancel() {

diff --git a/src/ui/dialogs/CategoricalMappingFilterDialog.ts b/src/ui/dialogs/CategoricalMappingFilterDialog.ts
@@ -71,8 +71,6 @@ export default class CategoricalMappingFilterDialog extends ADialog {
       n.checked = false;
       (<HTMLInputElement>n.nextElementSibling!).value = '50';
     });
-    this.updateFilter(null, false);
-    this.column.setMapping(this.column.categories.map(() => 1));
   }
 
   protected submit() {

diff --git a/src/ui/dialogs/ChangeRendererDialog.ts b/src/ui/dialogs/ChangeRendererDialog.ts
@@ -46,9 +46,18 @@ export default class ChangeRendererDialog extends ADialog {
 
   protected reset() {
     const desc = this.column.desc;
-    this.column.setRenderer(desc.renderer || desc.type);
-    this.column.setGroupRenderer(desc.groupRenderer || desc.type);
-    this.column.setSummaryRenderer(desc.summaryRenderer || desc.type);
+    const r = this.findInput(`input[name=renderer][value="${desc.renderer || desc.type}"]`);
+    if (r) {
+      r.checked = true;
+    }
+    const g = this.findInput(`input[name=group][value="${desc.groupRenderer || desc.type}"]`);
+    if (g) {
+      g.checked = true;
+    }
+    const s = this.findInput(`input[name=summary][value="${desc.summaryRenderer || desc.type}"]`);
+    if (s) {
+      s.checked = true;
+    }
   }
 
   protected submit() {

diff --git a/src/ui/dialogs/ColorMappingDialog.ts b/src/ui/dialogs/ColorMappingDialog.ts
@@ -16,8 +16,7 @@ export default class ColorMappingDialog extends ADialog {
     this.before = this.column.getColorMapping();
   }
 
-  private createTemplate(id: string) {
-    const current = this.column.getColorMapping();
+  private createTemplate(id: string, current: IColorMappingFunction) {
     const entries = current instanceof CustomColorMappingFunction ? current.entries : [];
 
     let h = '';
@@ -114,11 +113,11 @@ export default class ColorMappingDialog extends ADialog {
     }
   }
 
-  protected build(node: HTMLElement) {
+  protected build(node: HTMLElement, value = this.column.getColorMapping()) {
     node.classList.add(cssClass('dialog-color'));
 
     const id = this.id;
-    node.innerHTML = this.createTemplate(id);
+    node.innerHTML = this.createTemplate(id, value);
 
     const continuouos = this.findInput(`#${id}KC`);
     const quantized = this.findInput(`#${id}KQ`);
@@ -194,8 +193,7 @@ export default class ColorMappingDialog extends ADialog {
   }
 
   protected reset() {
-    this.column.setColorMapping(DEFAULT_COLOR_FUNCTION);
-    this.build(this.node);
+    this.build(this.node, DEFAULT_COLOR_FUNCTION);
   }
 
   protected submit() {

diff --git a/src/ui/dialogs/CutOffHierarchyDialog.ts b/src/ui/dialogs/CutOffHierarchyDialog.ts
@@ -43,7 +43,6 @@ export default class CutOffHierarchyDialog extends ADialog {
   protected reset() {
     this.findInput('input[type="text"]').value = this.column.hierarchy.path;
     this.findInput('input[type="number"]').value = '';
-    this.column.setCutOff(this.before);
   }
 
   protected cancel() {

diff --git a/src/ui/dialogs/DateFilterDialog.ts b/src/ui/dialogs/DateFilterDialog.ts
@@ -25,7 +25,6 @@ export default class DateFilterDialog extends ADialog {
   protected reset() {
     this.forEach('input[type=date]', (n: HTMLInputElement) => n.value = '');
     this.forEach('input[type=checkbox]', (n: HTMLInputElement) => n.checked = false);
-    this.updateFilter(null);
   }
 
   protected cancel() {

diff --git a/src/ui/dialogs/DialogManager.ts b/src/ui/dialogs/DialogManager.ts
@@ -87,14 +87,14 @@ export default class DialogManager {
     this.takeDown();
   }
 
-  remove(dialog: ADialog) {
+  remove(dialog: ADialog, handled = false) {
     const index = this.openDialogs.indexOf(dialog);
     if (index < 0) {
       return false;
     }
     // destroy self and all levels below that = after that
     const destroyed = this.openDialogs.splice(index, this.openDialogs.length - index);
-    destroyed.reverse().forEach((d) => d.onBackgroundClick(this.onDialogBackgroundClick));
+    destroyed.reverse().forEach((d) => d.onBackgroundClick(handled ? 'auto' : this.onDialogBackgroundClick));
 
     if (this.openDialogs.length === 0) {
       this.takeDown();

diff --git a/src/ui/dialogs/EditPatternDialog.ts b/src/ui/dialogs/EditPatternDialog.ts
@@ -36,7 +36,6 @@ export default class EditPatternDialog extends ADialog {
 
   protected reset() {
     this.node.querySelector('input')!.value = '';
-    this.column.setPattern('');
   }
 
   protected submit() {

diff --git a/src/ui/dialogs/MappingDialog.ts b/src/ui/dialogs/MappingDialog.ts
@@ -226,7 +226,6 @@ export default class MappingDialog extends ADialog {
     this.update();
     this.updateLines();
     this.createMappings();
-    this.column.setMapping(this.scale);
   }
 
   private copyMapping(columnId: string) {

diff --git a/src/ui/dialogs/RenameDialog.ts b/src/ui/dialogs/RenameDialog.ts
@@ -30,7 +30,6 @@ export default class RenameDialog extends ADialog {
     this.findInput('input[type="text"]').value = meta.label;
     this.findInput('input[name="summary"]').value = meta.summary
     this.node.querySelector('textarea')!.value = meta.description;
-    this.column.setMetaData(meta);
   }
 
   protected submit() {

diff --git a/src/ui/dialogs/RenameRankingDialog.ts b/src/ui/dialogs/RenameRankingDialog.ts
@@ -20,7 +20,6 @@ export default class RenameRankingDialog extends ADialog {
 
   protected reset() {
     this.findInput('input[type="text"]').value = this.before;
-    this.ranking.setLabel(this.before);
   }
 
   protected cancel() {

diff --git a/src/ui/dialogs/ScriptEditDialog.ts b/src/ui/dialogs/ScriptEditDialog.ts
@@ -20,8 +20,7 @@ export default class ScriptEditDialog extends ADialog {
   }
 
   protected reset() {
-    this.node.querySelector('textarea')!.value = this.before;
-    this.column.setScript(this.before);
+    this.node.querySelector('textarea')!.value = (<any>this.column.desc).script || ScriptColumn.DEFAULT_SCRIPT;
   }
 
   protected submit() {

diff --git a/src/ui/dialogs/ShowTopNDialog.ts b/src/ui/dialogs/ShowTopNDialog.ts
@@ -34,6 +34,5 @@ export default class ShowTopNDialog extends ADialog {
   protected reset() {
     const defaultValue = 10;
     this.findInput('input').value = defaultValue.toString();
-    this.provider.setShowTopN(defaultValue);
   }
 }
diff --git a/src/ui/dialogs/StringFilterDialog.ts b/src/ui/dialogs/StringFilterDialog.ts
@@ -26,7 +26,6 @@ export default class StringFilterDialog extends ADialog {
   protected reset() {
     this.findInput('input[type="text"]').value = '';
     this.forEach('input[type=checkbox]', (n: HTMLInputElement) => n.checked = false);
-    this.updateFilter(null);
   }
 
   protected cancel() {

diff --git a/src/ui/dialogs/WeightsEditDialog.ts b/src/ui/dialogs/WeightsEditDialog.ts
@@ -26,7 +26,6 @@ export default class WeightsEditDialog extends ADialog {
       n.value = String(v);
       (<HTMLElement>n.nextElementSibling!.firstElementChild!).style.width = `${v}%`;
     });
-    this.column.setWeights(this.weights.slice().fill(weight));
   }
 
   protected build(node: HTMLElement) {

diff --git a/src/ui/dialogs/groupDate.ts b/src/ui/dialogs/groupDate.ts
@@ -41,8 +41,6 @@ export default function appendDate(col: DateColumn, node: HTMLElement): IToolbar
       circular.checked = r.circular;
       const g = node.querySelector<HTMLInputElement>(`input[name=granularity][value="${r.granularity}"]`)!;
       g.checked = true;
-
-      col.setDateGrouper(r);
     }
   };
 }
diff --git a/src/ui/dialogs/groupNumber.ts b/src/ui/dialogs/groupNumber.ts
@@ -67,8 +67,6 @@ export default function groupNumber(col: NumberColumn, node: HTMLElement, dialog
       bins.value = getNumberOfBins(ranking.getOrderLength()).toString();
       bins.disabled = false;
       node.querySelector<HTMLInputElement>('input[name=threshold][value=threshold]')!.checked = true;
-
-      col.setGroupThresholds([value]);
     }
   }
 }
diff --git a/src/ui/dialogs/groupString.ts b/src/ui/dialogs/groupString.ts
@@ -68,11 +68,6 @@ export default function groupString(col: StringColumn, node: HTMLElement, dialog
     reset() {
       text.value = '';
       startsWithRadioButton.checked = true;
-
-      col.setGroupCriteria({
-        type: EStringGroupCriteriaType.startsWith,
-        values: []
-      });
     }
   };
 }
diff --git a/src/ui/dialogs/utils.ts b/src/ui/dialogs/utils.ts
@@ -46,7 +46,6 @@ export function sortMethods(node: HTMLElement, column: {setSortMethod(v: string)
     },
     reset() {
       node.querySelector<HTMLInputElement>(`input[name=multivaluesort][value="${bak}"]`)!.checked = true;
-      column.setSortMethod(bak);
     }
   }
 }