@easyquery/core 7.2.0-rc03 → 7.2.0-rc07

package/dist/bundles/easyquery.core.js

@@ -1570,6 +1570,7 @@ var meta_entity_MetaEntityAttr = /** @class */ (function () {
             this.lookupEntity = dto.lent;
             this.dataAttr = dto.dattr;
             this.lookupDataAttr = dto.ldattr;
+            this.defaultValue = dto.defVal;
             this.isNullable = utils_utils.getIfDefined(dto.nul, this.isNullable);
             this.isEditable = utils_utils.getIfDefined(dto.ied, this.isEditable);
             this.showOnView = utils_utils.getIfDefined(dto.ivis || dto.sov, this.showOnView);
@@ -3164,6 +3165,7 @@ __webpack_require__.d(__webpack_exports__, "Operand", function() { return /* ree
 __webpack_require__.d(__webpack_exports__, "EqValueEditor", function() { return /* reexport */ EqValueEditor; });
 __webpack_require__.d(__webpack_exports__, "EqAction", function() { return /* reexport */ EqAction; });
 __webpack_require__.d(__webpack_exports__, "EqModelLoader", function() { return /* reexport */ EqModelLoader; });
+__webpack_require__.d(__webpack_exports__, "InMemoryModelStorage", function() { return /* reexport */ model_storage_InMemoryModelStorage; });
 __webpack_require__.d(__webpack_exports__, "BrowserQueryStorage", function() { return /* reexport */ query_storage_BrowserQueryStorage; });
 __webpack_require__.d(__webpack_exports__, "EqContext", function() { return /* reexport */ context_EqContext; });
 __webpack_require__.d(__webpack_exports__, "Widget", function() { return /* reexport */ widget_Widget; });
@@ -5593,8 +5595,6 @@ var query_Query = /** @class */ (function () {
         }
         this.setDefaultName();
         this.description = "";
-        this.modelId = "";
-        this.modelName = "";
         this.model = (model) ? model : new data_model_DataModel();
         if (data) {
             this.loadFromData(data);
@@ -5608,10 +5608,14 @@ var query_Query = /** @class */ (function () {
             this.parentQuery = options.parent;
         }
         this.addChangedCallback(function (ev) {
-            if (ev.data && ev.data.part === QueryChangePart.Columns
-                && ev.data.action !== QueryChangeAction.Modify
+            if (ev.data
+                && ((ev.data.part & QueryChangePart.Columns) > 0)
                 && !ev.data.aggregation) {
-                _this.aggrSettings.clear();
+                if (_this._enableAggregation && _this.updateAggregationSettings()) {
+                    _this.fireChangedEvent({
+                        part: QueryChangePart.Aggregation
+                    });
+                }
             }
         });
     }
@@ -5632,19 +5636,6 @@ var query_Query = /** @class */ (function () {
                 this.processQueryForAggregation();
                 var aggrCols = this.columns.filter(function (c) { return c.enabled
                     && c.expr.tag == ExprTag.AggregateFunction; });
-                // // query contains aggregate columns
-                // if (aggrCols.length) {
-                //     for (const col of aggrCols) {
-                //         const attr = this.model.getAttributeById(col.expr.args[0].value);
-                //         this.changeColumnType(col, ExprTag.EntityAttribute, {
-                //             caption: this.model.getAttributeText(attr, `{attr}`)
-                //         });
-                //     }
-                //     this.fireChangedEvent({
-                //         part: QueryChangePart.Columns,
-                //         wasModified: true
-                //     });
-                // }    
             }
             if (!this._enableAggregation) {
                 this.aggrSettings.clear();
@@ -5653,6 +5644,40 @@ var query_Query = /** @class */ (function () {
         enumerable: true,
         configurable: true
     });
+    Query.prototype.updateAggregationSettings = function () {
+        var hasChanged = false;
+        var aggrSettings = this.getAggregationSettings();
+        for (var i = aggrSettings.groups.length - 1; i >= 0; i--) {
+            var group = aggrSettings.groups[i];
+            var _loop_1 = function (j) {
+                var colId = group.columns[j];
+                if (!this_1.columns.find(function (col) { return col.id === colId; })) {
+                    group.columns.splice(j, 1);
+                    hasChanged = true;
+                }
+            };
+            var this_1 = this;
+            for (var j = group.columns.length - 1; j >= 0; j--) {
+                _loop_1(j);
+            }
+            if (group.columns.length == 0) {
+                aggrSettings.groups.slice(i, 1);
+            }
+        }
+        var aggregates = aggrSettings.getAggregates();
+        var _loop_2 = function (i) {
+            var aggr = aggregates[i];
+            if (!this_2.columns.find(function (col) { return col.id === aggr.colId; })) {
+                aggregates.splice(i, 1);
+                hasChanged = true;
+            }
+        };
+        var this_2 = this;
+        for (var i = aggregates.length - 1; i >= 0; i--) {
+            _loop_2(i);
+        }
+        return hasChanged;
+    };
     Query.prototype.createSubQuery = function () {
         return new Query(this.model);
     };
@@ -7359,6 +7384,7 @@ var eq_services_EqServiceProvider = /** @class */ (function () {
         this.httpClient = new public_api["f" /* HttpClient */]();
         this.httpClient.defaultHeaders['x-eqjs-version'] = '7.2.0';
         this.modelResolver = function (_) { return new data_model_DataModel(); };
+        this.modelStorageResolver = null;
         this.queryResolver = function (context) { return new query_Query(context.getModel()); };
         this.modelLoaderResolver = function (context) { return new EqServerModelLoader(context); };
         this.queryStorageResolver = function (context) { return new query_storage_BrowserQueryStorage(context); };
@@ -7369,6 +7395,7 @@ var eq_services_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;
@@ -7397,6 +7424,15 @@ var eq_services_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) {
@@ -7460,6 +7496,9 @@ var eq_services_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;
     };
@@ -7573,6 +7612,25 @@ var EqAction;
     EqAction["UploadQueryFile"] = "UploadQueryFile";
 })(EqAction || (EqAction = {}));
 
+// CONCATENATED MODULE: ./src/main/model_storage.ts
+
+var model_storage_InMemoryModelStorage = /** @class */ (function () {
+    function InMemoryModelStorage(models) {
+        this.models = [];
+        if (models) {
+            public_api["l" /* utils */].assign(this.models, [], models);
+        }
+    }
+    InMemoryModelStorage.prototype.getModels = function () {
+        var _this = this;
+        return new Promise(function (resolve, reject) {
+            resolve(_this.models);
+        });
+    };
+    return InMemoryModelStorage;
+}());
+
+
 // CONCATENATED MODULE: ./src/main/action.ts
 var EqActionResult;
 (function (EqActionResult) {
@@ -7874,10 +7932,14 @@ var context_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;
@@ -9211,6 +9273,7 @@ addEasyQueryCoreTexts();
 
 
 
+
 
 
 //for backward compatibility