@easyquery/core 7.1.3-beta02 → 7.2.0-rc04

package/dist/lib/common/eq_services.d.ts

@@ -3,6 +3,7 @@ import { EqContext } from '../main/context';
 import { Query } from '../query/query';
 import { DataModel } from '../dm/data_model';
 import { EqModelLoader } from '../main/model_loader';
+import { DataModelStorage } from '../main/model_storage';
 import { QueryStorage } from '../main/query_storage';
 import { QuerySynchronizer } from '../main/query_synchronizer';
 import { DataFetcher } from '../main/data_fetcher';
@@ -13,6 +14,7 @@ export declare class EqServiceProvider {
     private httpClient;
     private queryResolver;
     private modelResolver;
+    private modelStorage;
     private modelLoader;
     private queryStorage;
     private querySynchronizer;
@@ -20,6 +22,7 @@ export declare class EqServiceProvider {
     private valueListResolver;
     private queryFileLoader;
     private aggrCalculator;
+    private modelStorageResolver;
     private modelLoaderResolver;
     private queryStorageResolver;
     private querySynchronizerResolver;
@@ -33,6 +36,7 @@ export declare class EqServiceProvider {
     createDataModel(): DataModel;
     createQuery(): Query;
     getModelLoader(): EqModelLoader;
+    getModelStorage(): DataModelStorage;
     getQueryStorage(): QueryStorage;
     getQuerySynchronizer(): QuerySynchronizer;
     getDataFetcher(): DataFetcher;
@@ -42,6 +46,7 @@ export declare class EqServiceProvider {
     registerDataModelResolver(resolver: (context: EqContext) => DataModel): void;
     registerQueryResolver(resolver: (context: EqContext) => Query): void;
     registerModelLoaderResolver(resolver: (context: EqContext) => EqModelLoader): void;
+    registerModelStorageResolver(resolver: (context: EqContext) => DataModelStorage): void;
     registerQueryStorageResolver(resolver: (context: EqContext) => QueryStorage): void;
     registerDataFetcherResolver(resolver: (context: EqContext) => DataFetcher): void;
     registerQuerySyncronizerResolver(resolver: (context: EqContext) => QuerySynchronizer): void;

package/dist/lib/common/eq_services.js

@@ -19,8 +19,9 @@ var EqServiceProvider = /** @class */ (function () {
         this.queryFileLoader = null;
         this.aggrCalculator = null;
         this.httpClient = new HttpClient();
-        this.httpClient.defaultHeaders['x-eqjs-version'] = '7.1.0';
+        this.httpClient.defaultHeaders['x-eqjs-version'] = '7.2.0';
         this.modelResolver = function (_) { return new DataModel(); };
+        this.modelStorageResolver = null;
         this.queryResolver = function (context) { return new Query(context.getModel()); };
         this.modelLoaderResolver = function (context) { return new EqServerModelLoader(context); };
         this.queryStorageResolver = function (context) { return new BrowserQueryStorage(context); };
@@ -31,6 +32,7 @@ var EqServiceProvider = /** @class */ (function () {
         this.aggrCalculatoResolver = function (context) { return new DefaultAggregatesCalculator(context); };
     }
     EqServiceProvider.prototype.reset = function () {
+        this.modelStorage = null;
         this.modelLoader = null;
         this.queryStorage = null;
         this.querySynchronizer = null;
@@ -59,6 +61,15 @@ var EqServiceProvider = /** @class */ (function () {
         }
         return this.modelLoader;
     };
+    EqServiceProvider.prototype.getModelStorage = function () {
+        if (!this.modelStorage) {
+            if (!this.modelStorageResolver) {
+                throw 'ModelStorageResolver is not defined';
+            }
+            this.modelStorage = this.modelStorageResolver(this.context);
+        }
+        return this.modelStorage;
+    };
     EqServiceProvider.prototype.getQueryStorage = function () {
         if (!this.queryStorage) {
             if (!this.queryStorageResolver) {
@@ -107,7 +118,7 @@ var EqServiceProvider = /** @class */ (function () {
     EqServiceProvider.prototype.getAggregatesCalculator = function () {
         if (!this.aggrCalculator) {
             if (!this.aggrCalculatoResolver) {
-                throw 'Resolver for TotalCalculator is not defined';
+                throw 'Resolver for AggregatesCalculator is not defined';
             }
             this.aggrCalculator = this.aggrCalculatoResolver(this.context);
         }
@@ -122,6 +133,9 @@ var EqServiceProvider = /** @class */ (function () {
     EqServiceProvider.prototype.registerModelLoaderResolver = function (resolver) {
         this.modelLoaderResolver = resolver;
     };
+    EqServiceProvider.prototype.registerModelStorageResolver = function (resolver) {
+        this.modelStorageResolver = resolver;
+    };
     EqServiceProvider.prototype.registerQueryStorageResolver = function (resolver) {
         this.queryStorageResolver = resolver;
     };

package/dist/lib/common/eq_services.js.map

@@ -1 +1 @@
-{"version":3,"file":"eq_services.js","sourceRoot":"","sources":["../../../src/common/eq_services.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"eq_services.js","sourceRoot":"","sources":["../../../src/common/eq_services.ts"],"names":[],"mappings":"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"}

package/dist/lib/data/eq_aggr_container.d.ts

@@ -1,12 +1,14 @@
-import { AggregatesContainer, AggrCalculationOptions, GroupKeys, GroupValues, AggregatesCalculator } from '@easydata/core';
+import { AggregatesContainer, AggrCalculationOptions, GroupKey, GroupTotals, AggregatesCalculator } from '@easydata/core';
 import { EqContext } from '../main/context';
-declare type LevelData = Map<string, GroupValues>;
+declare type LevelData = Map<string, GroupTotals>;
 export declare class EqAggregatesContainer implements AggregatesContainer {
     protected context: EqContext;
     private levels;
     constructor(context: EqContext);
-    getAggregates(level: number, key: GroupKeys): Promise<GroupValues>;
-    setAggregates(level: number, data: LevelData): void;
+    getAggregateData(level: number, groupKey: GroupKey): Promise<GroupTotals>;
+    setAggregateData(level: number, data: LevelData): void;
+    updateAggregateData(level: number, groupKey: GroupKey, values: GroupTotals): void;
+    private groupKeyToStr;
     private getLevelDesc;
     clear(): void;
 }
@@ -16,5 +18,7 @@ export declare class DefaultAggregatesCalculator implements AggregatesCalculator
     constructor(context: EqContext);
     getAggrContainer(): AggregatesContainer;
     calculate(options?: AggrCalculationOptions): Promise<void>;
+    needRecalculation(): boolean;
+    reset(): void;
 }
 export {};

package/dist/lib/data/eq_aggr_container.js

@@ -3,13 +3,12 @@ var EqAggregatesContainer = /** @class */ (function () {
         this.context = context;
         this.levels = {};
     }
-    EqAggregatesContainer.prototype.getAggregates = function (level, key) {
+    EqAggregatesContainer.prototype.getAggregateData = function (level, groupKey) {
         var _this = this;
         return new Promise(function (resolve, reject) {
-            var desc = _this.getLevelDesc(level);
             var processFunc = function (data) {
                 // map values
-                var keyStr = JSON.stringify(key);
+                var keyStr = _this.groupKeyToStr(groupKey);
                 var value = data.get(keyStr);
                 if (value) {
                     resolve(value);
@@ -18,33 +17,43 @@ var EqAggregatesContainer = /** @class */ (function () {
                     reject("Can't find data for " + keyStr);
                 }
             };
-            if (desc.data) {
+            var desc = _this.getLevelDesc(level, false);
+            if (desc && desc.data) {
                 processFunc(desc.data);
             }
             else {
-                desc.recivedCallbacks.push(processFunc);
+                desc.receivedCallbacks.push(processFunc);
             }
         });
     };
-    EqAggregatesContainer.prototype.setAggregates = function (level, data) {
-        var desc = this.getLevelDesc(level);
+    EqAggregatesContainer.prototype.setAggregateData = function (level, data) {
+        var desc = this.getLevelDesc(level, true);
         desc.data = data;
-        if (desc.recivedCallbacks) {
-            for (var _i = 0, _a = desc.recivedCallbacks; _i < _a.length; _i++) {
+        if (desc.receivedCallbacks) {
+            for (var _i = 0, _a = desc.receivedCallbacks; _i < _a.length; _i++) {
                 var callback = _a[_i];
                 callback(desc.data);
             }
         }
-        desc.recivedCallbacks = [];
+        desc.receivedCallbacks = [];
     };
-    EqAggregatesContainer.prototype.getLevelDesc = function (level) {
+    EqAggregatesContainer.prototype.updateAggregateData = function (level, groupKey, values) {
+        var desc = this.getLevelDesc(level, true);
+        var key = this.groupKeyToStr(groupKey);
+        desc.data.set(key, values);
+    };
+    EqAggregatesContainer.prototype.groupKeyToStr = function (groupKey) {
+        return JSON.stringify(groupKey);
+    };
+    EqAggregatesContainer.prototype.getLevelDesc = function (level, createIfNotExists) {
         var desc = this.levels[level];
-        if (!desc) {
+        if (!desc && createIfNotExists) {
             desc = {
-                recivedCallbacks: []
+                receivedCallbacks: [],
+                data: new Map()
             };
+            this.levels[level] = desc;
         }
-        this.levels[level] = desc;
         return desc;
     };
     EqAggregatesContainer.prototype.clear = function () {
@@ -77,18 +86,23 @@ var DefaultAggregatesCalculator = /** @class */ (function () {
             columns[i].enabled = false;
         }
         if (settings.hasGrandTotals()) {
-            this.aggrs.setAggregates(0, new Map());
+            this.aggrs.setAggregateData(0, new Map());
             if (options.resultObtained)
                 options.resultObtained({}, 0);
         }
         var groups = settings.getGroups();
         for (var level = 1; level <= groups.length && level <= options.maxLevel; level++) {
-            this.aggrs.setAggregates(level, new Map());
+            this.aggrs.setAggregateData(level, new Map());
             if (options.resultObtained)
                 options.resultObtained({}, level);
         }
         return Promise.resolve();
     };
+    DefaultAggregatesCalculator.prototype.needRecalculation = function () {
+        return true;
+    };
+    DefaultAggregatesCalculator.prototype.reset = function () {
+    };
     return DefaultAggregatesCalculator;
 }());
 export { DefaultAggregatesCalculator };

package/dist/lib/data/eq_aggr_container.js.map

@@ -1 +1 @@
-{"version":3,"file":"eq_aggr_container.js","sourceRoot":"","sources":["../../../src/data/eq_aggr_container.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"eq_aggr_container.js","sourceRoot":"","sources":["../../../src/data/eq_aggr_container.ts"],"names":[],"mappings":"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"}

package/dist/lib/data/eq_data_loader.js

@@ -9,7 +9,6 @@ var EasyQueryDataLoader = /** @class */ (function () {
         // different grids
         this.dataLoadPromise = new Promise(function (resolve, reject) {
             var fetchOptions = {
-                skipAggr: true,
                 chunk: chunk,
                 success: function (result) {
                     var dataTable = new EasyDataTable({

package/dist/lib/data/eq_data_loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"eq_data_loader.js","sourceRoot":"","sources":["../../../src/data/eq_data_loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAE6B,aAAa,EAChD,MAAM,gBAAgB,CAAC;AAKxB;IAEI,6BAAoB,OAAkB;QAAlB,YAAO,GAAP,OAAO,CAAW;IAAI,CAAC;IAIpC,uCAAS,GAAhB,UAAiB,KAA2B;QAA5C,iBA8CC;QA7CG,2EAA2E;QAC3E,kBAAkB;QAClB,IAAI,CAAC,eAAe,GAAG,IAAI,OAAO,CAAY,UAAC,OAAO,EAAE,MAAM;YAC1D,IAAM,YAAY,GAA6B;gBAC3C,QAAQ,EAAE,IAAI;gBACd,KAAK,EAAE,KAAK;gBACZ,OAAO,EAAE,UAAC,MAAM;oBACZ,IAAM,SAAS,GAAG,IAAI,aAAa,CAAC;wBAChC,MAAM,EAAE,KAAI,CAAC,OAAO,CAAC,UAAU;wBAC/B,SAAS,EAAE,KAAI,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS;qBAChD,CAAC,CAAC;oBAEH,IAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;oBAEnC,KAAkB,UAAc,EAAd,KAAA,SAAS,CAAC,IAAI,EAAd,cAAc,EAAd,IAAc,EAAE;wBAA7B,IAAM,GAAG,SAAA;wBACV,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;qBAC9B;oBAED,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;oBAC7C,KAAkB,UAAc,EAAd,KAAA,SAAS,CAAC,IAAI,EAAd,cAAc,EAAd,IAAc,EAAE;wBAA7B,IAAM,GAAG,SAAA;wBACV,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;qBACzB;oBAED,IAAI,YAAY,GAAG,CAAC,CAAC;oBACrB,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE;wBACzC,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC;qBAC3C;oBAED,OAAO,CAAC;wBACJ,KAAK,EAAE,SAAS;wBAChB,KAAK,EAAE,YAAY;wBACnB,OAAO,EAAE,CAAC,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,KAAK,GAAG,YAAY;qBACzE,CAAC,CAAC;gBACP,CAAC;gBACD,KAAK,EAAE,UAAC,KAAK,IAAK,OAAA,MAAM,CAAC,KAAK,CAAC,EAAb,CAAa;aAClC,CAAC;YAEF,IAAI,KAAI,CAAC,OAAO,CAAC,SAAS,EAAE;gBACxB,YAAY,CAAC,KAAK,GAAG,yBAAuB,KAAK,CAAC,MAAQ,CAAC;aAC9D;YAED,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,eAAe,CAAC;IAChC,CAAC;IACL,0BAAC;AAAD,CAAC,AArDD,IAqDC"}
+{"version":3,"file":"eq_data_loader.js","sourceRoot":"","sources":["../../../src/data/eq_data_loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAE6B,aAAa,EAChD,MAAM,gBAAgB,CAAC;AAKxB;IAEI,6BAAoB,OAAkB;QAAlB,YAAO,GAAP,OAAO,CAAW;IAAI,CAAC;IAIpC,uCAAS,GAAhB,UAAiB,KAA2B;QAA5C,iBA6CC;QA5CG,2EAA2E;QAC3E,kBAAkB;QAClB,IAAI,CAAC,eAAe,GAAG,IAAI,OAAO,CAAY,UAAC,OAAO,EAAE,MAAM;YAC1D,IAAM,YAAY,GAA6B;gBAC3C,KAAK,EAAE,KAAK;gBACZ,OAAO,EAAE,UAAC,MAAM;oBACZ,IAAM,SAAS,GAAG,IAAI,aAAa,CAAC;wBAChC,MAAM,EAAE,KAAI,CAAC,OAAO,CAAC,UAAU;wBAC/B,SAAS,EAAE,KAAI,CAAC,OAAO,CAAC,WAAW,CAAC,SAAS;qBAChD,CAAC,CAAC;oBAEH,IAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;oBAEnC,KAAkB,UAAc,EAAd,KAAA,SAAS,CAAC,IAAI,EAAd,cAAc,EAAd,IAAc,EAAE;wBAA7B,IAAM,GAAG,SAAA;wBACV,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;qBAC9B;oBAED,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;oBAC7C,KAAkB,UAAc,EAAd,KAAA,SAAS,CAAC,IAAI,EAAd,cAAc,EAAd,IAAc,EAAE;wBAA7B,IAAM,GAAG,SAAA;wBACV,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;qBACzB;oBAED,IAAI,YAAY,GAAG,CAAC,CAAC;oBACrB,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE;wBACzC,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC;qBAC3C;oBAED,OAAO,CAAC;wBACJ,KAAK,EAAE,SAAS;wBAChB,KAAK,EAAE,YAAY;wBACnB,OAAO,EAAE,CAAC,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,KAAK,GAAG,YAAY;qBACzE,CAAC,CAAC;gBACP,CAAC;gBACD,KAAK,EAAE,UAAC,KAAK,IAAK,OAAA,MAAM,CAAC,KAAK,CAAC,EAAb,CAAa;aAClC,CAAC;YAEF,IAAI,KAAI,CAAC,OAAO,CAAC,SAAS,EAAE;gBACxB,YAAY,CAAC,KAAK,GAAG,yBAAuB,KAAK,CAAC,MAAQ,CAAC;aAC9D;YAED,KAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,eAAe,CAAC;IAChC,CAAC;IACL,0BAAC;AAAD,CAAC,AApDD,IAoDC"}

package/dist/lib/eqs/eqs_exporter.js

@@ -28,9 +28,9 @@ var EqServerExporter = /** @class */ (function () {
             var blob = new Blob([responseData]);
             var filename = request.getXMLHttpRequest()
                 .getResponseHeader("Content-Disposition").match(/filename="(.*)"/)[1];
-            if (window.navigator.msSaveOrOpenBlob) {
+            if (window.navigator['msSaveOrOpenBlob']) {
                 // Internet Explorer
-                window.navigator.msSaveOrOpenBlob(blob, filename);
+                window.navigator['msSaveOrOpenBlob'](blob, filename);
             }
             else {
                 var a = document.createElement("a");

package/dist/lib/eqs/eqs_exporter.js.map

@@ -1 +1 @@
-{"version":3,"file":"eqs_exporter.js","sourceRoot":"","sources":["../../../src/eqs/eqs_exporter.ts"],"names":[],"mappings":"AAGA;IAOI,0BAAY,OAAkB;QAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAEM,oCAAS,GAAhB,UAAiB,MAAc,EAAE,YAAyC;QACtE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACrC,CAAC;IAEM,iCAAM,GAAb,UAAc,aAA6B;QACvC,aAAa,GAAG,aAAa,IAAI,EAAE,CAAC;QACpC,IAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,aAAa,EAAE,CAAC;QACxD,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC;QAEpC,IAAM,KAAK,GAAG,aAAa,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC7D,IAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC;QAEzC,IAAI,WAAW,GAAQ;YACnB,UAAU,EAAE,aAAa,CAAC,QAAQ;SACrC,CAAA;QAED,IAAI,OAAM,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,WAAW,EAAE;YAC/C,WAAW,CAAC,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC;SAC/C;aACI;YACD,WAAW,CAAC,KAAK,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC;SAC1C;QAED,IAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,cAAc,EAClD,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAC1C,IAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QAEtF,IAAM,OAAO,GAAG,YAAY,CAAC,UAAU,EAAE,CAAC;QAE1C,OAAO,YAAY,CAAC,IAAI,CAAC,UAAC,YAAY;YAClC,IAAM,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;YACtC,IAAM,QAAQ,GAAG,OAAO,CAAC,iBAAiB,EAAE;iBAC3B,iBAAiB,CAAC,qBAAqB,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;YAEtF,IAAI,MAAM,CAAC,SAAS,CAAC,gBAAgB,EAAE;gBACnC,oBAAoB;gBACpB,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;aACrD;iBAAM;gBACH,IAAI,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;gBACpC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBAC7B,CAAC,CAAC,KAAK,CAAE,OAAO,GAAE,MAAM,CAAC;gBACzB,CAAC,CAAC,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBAC1C,CAAC,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBACtB,CAAC,CAAC,KAAK,EAAE,CAAC;gBACV,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBACnC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;aAChC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IACL,uBAAC;AAAD,CAAC,AA7DD,IA6DC"}
+{"version":3,"file":"eqs_exporter.js","sourceRoot":"","sources":["../../../src/eqs/eqs_exporter.ts"],"names":[],"mappings":"AAGA;IAOI,0BAAY,OAAkB;QAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAEM,oCAAS,GAAhB,UAAiB,MAAc,EAAE,YAAyC;QACtE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACrC,CAAC;IAEM,iCAAM,GAAb,UAAc,aAA6B;QACvC,aAAa,GAAG,aAAa,IAAI,EAAE,CAAC;QACpC,IAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,aAAa,EAAE,CAAC;QACxD,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC;QAEpC,IAAM,KAAK,GAAG,aAAa,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC7D,IAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC;QAEzC,IAAI,WAAW,GAAQ;YACnB,UAAU,EAAE,aAAa,CAAC,QAAQ;SACrC,CAAA;QAED,IAAI,OAAM,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,WAAW,EAAE;YAC/C,WAAW,CAAC,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC;SAC/C;aACI;YACD,WAAW,CAAC,KAAK,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC;SAC1C;QAED,IAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,cAAc,EAClD,EAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAC1C,IAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,EAAE,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QAEtF,IAAM,OAAO,GAAG,YAAY,CAAC,UAAU,EAAE,CAAC;QAE1C,OAAO,YAAY,CAAC,IAAI,CAAC,UAAC,YAAY;YAClC,IAAM,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;YACtC,IAAM,QAAQ,GAAG,OAAO,CAAC,iBAAiB,EAAE;iBAC3B,iBAAiB,CAAC,qBAAqB,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;YAEtF,IAAI,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,EAAE;gBACtC,oBAAoB;gBACpB,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;aACxD;iBACI;gBACD,IAAI,CAAC,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;gBACpC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBAC7B,CAAC,CAAC,KAAK,CAAE,OAAO,GAAE,MAAM,CAAC;gBACzB,CAAC,CAAC,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBAC1C,CAAC,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBACtB,CAAC,CAAC,KAAK,EAAE,CAAC;gBACV,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBACnC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;aAChC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IACL,uBAAC;AAAD,CAAC,AA9DD,IA8DC"}

package/dist/lib/eqs/eqs_query_file_loader.js

@@ -19,9 +19,9 @@ var EqQueryFileLoader = /** @class */ (function () {
                 fileName = options.fileName
                     + fileName.substring(fileName.lastIndexOf('.'));
             }
-            if (window.navigator.msSaveOrOpenBlob) {
+            if (window.navigator['msSaveOrOpenBlob']) {
                 // Internet Explorer
-                window.navigator.msSaveOrOpenBlob(blob, fileName);
+                window.navigator['msSaveOrOpenBlob'](blob, fileName);
             }
             else {
                 var a = document.createElement("a");

package/dist/lib/eqs/eqs_query_file_loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"eqs_query_file_loader.js","sourceRoot":"","sources":["../../../src/eqs/eqs_query_file_loader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"eqs_query_file_loader.js","sourceRoot":"","sources":["../../../src/eqs/eqs_query_file_loader.ts"],"names":[],"mappings":"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"}

package/dist/lib/main/context.d.ts

@@ -55,6 +55,7 @@ export declare class EqContext {
     private beforeLoadQuery?;
     private beforeFetchData?;
     private beforeExportResult?;
+    private afterGroupFetch?;
     constructor();
     getServices(): EqServiceProvider;
     registerExporter(format: string, resolver: EqExporterResolver): void;
@@ -305,6 +306,7 @@ export declare class EqContext {
     getQueryFile(options?: ContextGetQueryFileOptions): void;
     uploadQueryFile(options?: ContextUploadQueryFileOptions): void;
     fetchDataChunk(options?: ContextFetchDataOptions): void;
+    protected onResultTableUpdate(): void;
     /**
      * Fetches the data for a drill-down query (if defined) and processes the result.
      * @param options

package/dist/lib/main/context.js

@@ -118,7 +118,8 @@ var EqContext = /** @class */ (function () {
         this.endpoints = new Map();
         this.dataLoader = new EasyQueryDataLoader(this);
         this.resultTable = new EasyDataTable({
-            loader: this.dataLoader
+            loader: this.dataLoader,
+            onUpdate: this.onResultTableUpdate.bind(this)
         });
         this.resultTable.id = 'ResultTable';
         this.errorHandlerId = this.addEventListener('error', function (context, status) {
@@ -239,10 +240,14 @@ var EqContext = /** @class */ (function () {
         }
         if (options.endpoint) {
             this.baseEndpoint = options.endpoint;
-            console.warn('The `endpoint` option is deprecated and will be ignored.\n'
+            console.warn('The `endpoint` option is deprecated.\n'
                 + 'Please use `context.useEndpoint(endpointURL)` function instead.');
         }
         this.setDefaultEndpoints(this.baseEndpoint);
+        if (options.modelStorageResolver) {
+            var eqServices = this.getServices();
+            eqServices.registerModelStorageResolver(options.modelStorageResolver);
+        }
         this.loadQueryOnStart = false;
         if (options.loadQueryOnStart) {
             this.loadQueryOnStart = options.loadQueryOnStart;
@@ -1094,17 +1099,24 @@ var EqContext = /** @class */ (function () {
         })) {
             return;
         }
+        //just to support the old way of catching "group fetch" operation finish
+        if (options.groupFetchSuccess) {
+            this.afterGroupFetch = options.groupFetchSuccess;
+        }
         if (this.resultTable.elasticChunks) {
             options.chunk.limit++;
         }
-        this.fetchDataChunk(__assign({}, options, { success: function (result) {
+        this.fetchDataChunk(__assign(__assign({}, options), { success: function (result) {
                 if (result.statement) {
                     _this.resultStatement = result.statement;
                     _this.refreshWidgets(WidgetGroup.Statement);
                 }
+                var aggrCalculator = _this.getServices().getAggregatesCalculator();
+                aggrCalculator.reset();
                 _this.resultContent = result;
                 if (result.resultSet) {
                     _this.resultTable.clear();
+                    _this.resultTable.id = _this.query.getId();
                     var resultSet = result.resultSet;
                     for (var _i = 0, _a = resultSet.cols; _i < _a.length; _i++) {
                         var col = _a[_i];
@@ -1126,6 +1138,7 @@ var EqContext = /** @class */ (function () {
                             ? resultSet.rows.length
                             : 0;
                     }
+                    _this.resultTable.fireUpdated();
                 }
                 if (options.success) {
                     options.success(result);
@@ -1201,55 +1214,30 @@ var EqContext = /** @class */ (function () {
     };
     EqContext.prototype.fetchDataChunk = function (options) {
         var _this = this;
-        if (this.beforeFetchData) {
-            this.beforeFetchData(this, options);
-        }
         var queryId = this.getQuery().getId();
         var fetchOptions = options || {};
         if (this.useStoredQueryOnFetch) {
             fetchOptions.queryId = this.query.getId();
         }
+        if (this.beforeFetchData) {
+            this.beforeFetchData(this, fetchOptions);
+        }
         this.startProcess({
             action: EqAction.FetchData,
             text: 'Fetching data for the query: ' + queryId
         }, WidgetGroup.Result);
         var dataFetcher = this.eqServices.getDataFetcher();
-        dataFetcher.fetchData(options)
+        dataFetcher.fetchData(fetchOptions)
             .then(function (result) {
             if (result.statement) {
                 _this.resultStatement = result.statement;
             }
             _this.resultContent = result;
-            if (!options.skipAggr) {
-                var aggrSettings = _this.query.getAggregationSettings();
-                if (aggrSettings.needAggrCalculation()) {
-                    var calculator = _this.getServices().getAggregatesCalculator();
-                    calculator.calculate({
-                        maxLevel: aggrSettings.getGroups().length + 1,
-                        resultObtained: function (result, level) {
-                            if (options.groupFetchSucess) {
-                                options.groupFetchSucess(result);
-                            }
-                        },
-                        errorOccurred: function (error) {
-                            var errorMessage = "Data fetching error on group level " + error.level + " query. \n" + error.message;
-                            _this.throwError({
-                                action: EqAction.FetchData,
-                                text: errorMessage,
-                                sourceError: error
-                            });
-                            if (options.error) {
-                                options.error(errorMessage, EqAction.FetchData);
-                            }
-                        }
-                    });
-                }
-            }
             // we need to call success callback before firing fetchData,
             // because otherwise, it won't update the result table 
             // in the context before afterFetchData callback is called.
-            if (options.success) {
-                options.success(result);
+            if (fetchOptions.success) {
+                fetchOptions.success(result);
             }
             _this.fireEvent('fetchData');
             _this.endProcess({
@@ -1266,11 +1254,34 @@ var EqContext = /** @class */ (function () {
                 text: errorMessage,
                 sourceError: error
             }, WidgetGroup.Result);
-            if (options.error) {
-                options.error(errorMessage, EqAction.FetchData);
+            if (fetchOptions.error) {
+                fetchOptions.error(errorMessage, EqAction.FetchData);
             }
         });
     };
+    EqContext.prototype.onResultTableUpdate = function () {
+        var _this = this;
+        var aggrSettings = this.query.getAggregationSettings();
+        var calculator = this.getServices().getAggregatesCalculator();
+        if (aggrSettings.needAggrCalculation() && calculator.needRecalculation()) {
+            calculator.calculate({
+                maxLevel: aggrSettings.getGroups().length + 1,
+                resultObtained: function (result, level) {
+                    if (_this.afterGroupFetch) {
+                        _this.afterGroupFetch(result);
+                    }
+                },
+                errorOccurred: function (error) {
+                    var errorMessage = "Data fetching error on group level " + error.level + " query. \n" + error.message;
+                    _this.throwError({
+                        action: EqAction.FetchData,
+                        text: errorMessage,
+                        sourceError: error
+                    });
+                }
+            });
+        }
+    };
     /**
      * Fetches the data for a drill-down query (if defined) and processes the result.
      * @param options