change options

src/provider/ADataProvider.ts

@@ -2,7 +2,7 @@ import {AEventDispatcher, debounce, ISequence, OrderedSet, IDebounceContext, IEv
 import {Column, Ranking, AggregateGroupColumn, createAggregateDesc, IAggregateGroupColumnDesc, isSupportType, EDirtyReason, RankColumn, createRankDesc, createSelectionDesc, IColumnDesc, IDataRow, IGroup, IndicesArray, IOrderedGroup, ISelectionColumnDesc, EAggregationState, IColumnDump, IRankingDump, IColorMappingFunctionConstructor, IMappingFunctionConstructor, ITypeFactory} from '../model';
 import {models} from '../model/models';
 import {forEachIndices, everyIndices, toGroupID, unifyParents} from '../model/internal';
-import {IDataProvider, IDataProviderDump, IDataProviderOptions, SCHEMA_REF, IExportOptions, IAggregationStrategy} from './interfaces';
+import {IDataProvider, IDataProviderDump, IDataProviderOptions, SCHEMA_REF, IExportOptions} from './interfaces';
 import {exportRanking, map2Object, object2Map} from './utils';
 import {IRenderTasks} from '../renderer';
 import {IColumnConstructor} from '../model/Column';
@@ -211,33 +211,31 @@ abstract class ADataProvider extends AEventDispatcher implements IDataProvider {
   private uid = 0;
   private readonly typeFactory: ITypeFactory;
 
+  private readonly options: Readonly<IDataProviderOptions> = {
+    columnTypes: {},
+    colorMappingFunctionTypes: {},
+    mappingFunctionTypes: {},
+    singleSelection: false,
+    showTopN: 10,
+    aggregationStrategy: 'item'
+  };
+
   /**
    * lookup map of a column type to its column implementation
    */
   readonly columnTypes: {[columnType: string]: IColumnConstructor};
   readonly colorMappingFunctionTypes: {[colorMappingFunctionType: string]: IColorMappingFunctionConstructor};
   readonly mappingFunctionTypes: {[mappingFunctionType: string]: IMappingFunctionConstructor};
 
-  protected readonly multiSelections: boolean;
-  private readonly aggregationStrategy: IAggregationStrategy;
   private showTopN: number;
 
   constructor(options: Partial<IDataProviderOptions> = {}) {
     super();
-    const o: Readonly<IDataProviderOptions> = Object.assign({
-      columnTypes: {},
-      colorMappingFunctionTypes: {},
-      mappingFunctionTypes: {},
-      singleSelection: false,
-      showTopN: 10,
-      aggregationStrategy: 'item'
-    }, options);
-    this.columnTypes = Object.assign(models(), o.columnTypes);
-    this.colorMappingFunctionTypes = Object.assign(colorMappingFunctions(), o.colorMappingFunctionTypes);
-    this.mappingFunctionTypes = Object.assign(mappingFunctions(), o.mappingFunctionTypes);
-    this.multiSelections = o.singleSelection !== true;
-    this.showTopN = o.showTopN;
-    this.aggregationStrategy = o.aggregationStrategy;
+    Object.assign(this.options, options);
+    this.columnTypes = Object.assign(models(), this.options.columnTypes);
+    this.colorMappingFunctionTypes = Object.assign(colorMappingFunctions(), this.options.colorMappingFunctionTypes);
+    this.mappingFunctionTypes = Object.assign(mappingFunctions(), this.options.mappingFunctionTypes);
+    this.showTopN = this.options.showTopN;
 
     this.typeFactory = this.createTypeFactory();
   }
@@ -695,7 +693,7 @@ abstract class ADataProvider extends AEventDispatcher implements IDataProvider {
     if (addSupportType) {
       r.push(this.create(createAggregateDesc())!);
       r.push(this.create(createRankDesc())!);
-      if (this.multiSelections) {
+      if (this.options.singleSelection !== false) {
         r.push(this.create(createSelectionDesc())!);
       }
     }
@@ -750,12 +748,12 @@ abstract class ADataProvider extends AEventDispatcher implements IDataProvider {
   }
 
   getAggregationStrategy() {
-    return this.aggregationStrategy;
+    return this.options.aggregationStrategy;
   }
 
   private initAggregateState(ranking: Ranking, groups: IGroup[]) {
     let initial = -1;
-    switch(this.aggregationStrategy) {
+    switch(this.getAggregationStrategy()) {
       case 'group':
         initial = 0;
         break;
@@ -880,7 +878,7 @@ abstract class ADataProvider extends AEventDispatcher implements IDataProvider {
     if (this.selection.has(index)) {
       return; //no change
     }
-    if (!this.multiSelections && this.selection.size > 0) {
+    if (this.options.singleSelection === true && this.selection.size > 0) {
       this.selection.clear();
     }
     this.selection.add(index);
@@ -909,7 +907,7 @@ abstract class ADataProvider extends AEventDispatcher implements IDataProvider {
     if (everyIndices(indices, (i) => this.selection.has(i))) {
       return; //no change
     }
-    if (!this.multiSelections) {
+    if (this.options.singleSelection === true) {
       this.selection.clear();
       if (indices.length > 0) {
         this.selection.add(indices[0]);

src/provider/LocalDataProvider.ts

@@ -37,7 +37,7 @@ interface ISortHelper {
  * a data provider based on an local array
  */
 export default class LocalDataProvider extends ACommonDataProvider {
-  private readonly options: ILocalDataProviderOptions = {
+  private readonly ooptions: ILocalDataProviderOptions = {
     /**
      * whether the filter should be applied to all rankings regardless where they are
      */
@@ -56,9 +56,9 @@ export default class LocalDataProvider extends ACommonDataProvider {
 
   constructor(private _data: any[], columns: IColumnDesc[] = [], options: Partial<ILocalDataProviderOptions & IDataProviderOptions> = {}) {
     super(columns, options);
-    Object.assign(this.options, options);
+    Object.assign(this.ooptions, options);
     this._dataRows = toRows(_data);
-    this.tasks = this.options.taskExecutor === 'direct' ? new DirectRenderTasks() : new ScheduleRenderTasks();
+    this.tasks = this.ooptions.taskExecutor === 'direct' ? new DirectRenderTasks() : new ScheduleRenderTasks();
     this.tasks.setData(this._dataRows);
 
     const that = this;
@@ -145,7 +145,7 @@ export default class LocalDataProvider extends ACommonDataProvider {
   cloneRanking(existing?: Ranking) {
     const ranking = super.cloneRanking(existing);
 
-    if (this.options.filterGlobally) {
+    if (this.ooptions.filterGlobally) {
       ranking.on(`${Ranking.EVENT_FILTER_CHANGED}.reorderAll`, this.reorderAll);
     }
 
@@ -207,7 +207,7 @@ export default class LocalDataProvider extends ACommonDataProvider {
   }
 
   cleanUpRanking(ranking: Ranking) {
-    if (this.options.filterGlobally) {
+    if (this.ooptions.filterGlobally) {
       ranking.on(`${Ranking.EVENT_FILTER_CHANGED}.reorderAll`, null);
     }
 
@@ -233,7 +233,7 @@ export default class LocalDataProvider extends ACommonDataProvider {
     //do the optional filtering step
     const filter: (Column | ((d: IDataRow) => boolean))[] = [];
 
-    if (this.options.filterGlobally) {
+    if (this.ooptions.filterGlobally) {
       for (const r of this.getRankings()) {
         if (r.isFiltered()) {
           filter.push(...r.flatColumns.filter((d) => d.isFiltered()));

src/provider/RemoteDataProvider.ts

@@ -53,7 +53,7 @@ function createIndex2Pos(order: IndicesArray) {
  * a remote implementation of the data provider
  */
 export default class RemoteDataProvider extends ACommonDataProvider {
-  private readonly options: IRemoteDataProviderOptions = {
+  private readonly ooptions: IRemoteDataProviderOptions = {
     maxCacheSize: 1000
   };
 
@@ -62,7 +62,7 @@ export default class RemoteDataProvider extends ACommonDataProvider {
 
   constructor(private server: IServerData, columns: IColumnDesc[] = [], options: Partial<IRemoteDataProviderOptions & IDataProviderOptions> = {}) {
     super(columns, options);
-    Object.assign(this.options, options);
+    Object.assign(this.ooptions, options);
   }
 
   getTotalNumberOfRows() {
@@ -107,7 +107,7 @@ export default class RemoteDataProvider extends ACommonDataProvider {
     // removed cached
     this.cache.forEach((_v, k) => union.delete(k));
 
-    if ((this.cache.size + union.size) > this.options.maxCacheSize) {
+    if ((this.cache.size + union.size) > this.ooptions.maxCacheSize) {
       // clean up cache
     }
     // const maxLength = Math.max(...orders.map((o) => o.length));