@easyquery/enterprise 7.2.1-rc03 → 7.2.2-rc01

package/dist/browser/eq.enterprise.js

@@ -1,5 +1,5 @@
 /** 
- * EasyQuery.JS Enterprise 7.2.1-rc03 (https://korzh.com/easyquery/javascript)
+ * EasyQuery.JS Enterprise 7.2.2-rc01 (https://korzh.com/easyquery/javascript)
  * Copyright 2022 Korzh.com. All rights reserved.
  * 
  * EasyQuery.JS commercial licenses may be obtained at
@@ -3222,7 +3222,6 @@ var context_EqContext = /** @class */ (function () {
     /**
      * If `defaultModelId` property is define - this method calls `loadModel` function in the broker
      * to load the model with such ID.
-     *
      */
     EqContext.prototype.loadDefaultModel = function () {
         var _this = this;
@@ -26007,6 +26006,7 @@ var PivotTableFacet = /** @class */ (function (_super) {
         var dataTable = this.getContextDataTable();
         var csb = Object(_easydata_ui__WEBPACK_IMPORTED_MODULE_0__["domel"])('select');
         var firstNumericColIndex = null;
+        var optionIndex = 0;
         var _loop_2 = function (i) {
             var column = dataTable.columns.get(i);
             var colLabel = column.label;
@@ -26015,13 +26015,14 @@ var PivotTableFacet = /** @class */ (function (_super) {
             if (allowedTypes && allowedTypes.indexOf(colType) < 0)
                 return "continue";
             if (firstNumericColIndex === null && _easydata_core__WEBPACK_IMPORTED_MODULE_1__["utils"].isNumericType(colType)) {
-                firstNumericColIndex = i;
+                firstNumericColIndex = optionIndex;
             }
             csb.addChild('option', function (b) {
                 b
                     .attr('value', colId)
                     .text(colLabel);
             });
+            optionIndex++;
         };
         for (var i = 0; i < dataTable.columns.count; i++) {
             _loop_2(i);
@@ -36280,13 +36281,12 @@ var data_filter_view_extends = (undefined && undefined.__extends) || (function (
 var data_filter_view_DataFilterView = /** @class */ (function (_super) {
     data_filter_view_extends(DataFilterView, _super);
     function DataFilterView() {
-        var _this = _super.call(this) || this;
-        _this.resultOptions.fetchEmptyQueries = true;
-        return _this;
+        return _super.call(this) || this;
     }
     DataFilterView.prototype.initOptions = function (options) {
         var _this = this;
         options = _super.prototype.initOptions.call(this, options);
+        options.result.fetchEmptyQueries = true;
         var query = this.context.getQuery();
         query.addChangedCallback(function () {
             if (_this.resultOptions.clearResultOnQueryChange) {
@@ -36360,9 +36360,7 @@ var html_data_filter_view_extends = (undefined && undefined.__extends) || (funct
 var html_data_filter_view_HtmlDataFilterView = /** @class */ (function (_super) {
     html_data_filter_view_extends(HtmlDataFilterView, _super);
     function HtmlDataFilterView() {
-        var _this = _super.call(this) || this;
-        _this.resultOptions.fetchEmptyQueries = true;
-        return _this;
+        return _super.call(this) || this;
     }
     /**
     * Creates the widget that represents Grid Widget.
@@ -37519,7 +37517,7 @@ Math.trunc = Math.trunc || function (x) {
     }
     return Math.ceil(x);
 };
-var lcv = {
+var lcv_lcv = {
     __kt: 0,
     ck: function (key) {
         if (!key || !key.length) {
@@ -37540,23 +37538,23 @@ var lcv = {
                 }
             }
             if (!ism) {
-                lcv.__kt = -1;
+                lcv_lcv.__kt = -1;
             }
             var idx = minVer % 4;
             var shift = majVer + minVer;
             if (part2[6 + idx] != encChar(shift, 19)) {
-                lcv.__kt = -2;
+                lcv_lcv.__kt = -2;
                 return;
             }
             if (part2[1] != encChar(infoBytes[3])) {
                 return;
             }
-            lcv.__kt = part2[3] != encChar(infoBytes[5]) ? 2 : 3;
-            if (lcv.__kt === 2) {
+            lcv_lcv.__kt = part2[3] != encChar(infoBytes[5]) ? 2 : 3;
+            if (lcv_lcv.__kt === 2) {
                 var eds = "" + f36(part2.substring(4, 6) + part2.substring(10));
                 var ed = new Date(2000 + Number.parseInt(eds.substring(0, 2)), Number.parseInt(eds.substring(2, 4)) - 1, Number.parseInt(eds.substring(4)), 0, 0, 0, 0);
                 if (Date.now() > ed.getTime()) {
-                    lcv.__kt = 1;
+                    lcv_lcv.__kt = 1;
                 }
             }
         }
@@ -37657,7 +37655,7 @@ var condition_ex_ConditionEx = /** @class */ (function (_super) {
     };
     ConditionEx.prototype.loadFromData = function (model, data) {
         _super.prototype.loadFromData.call(this, model, data);
-        if (lcv.__kt <= 1)
+        if (lcv_lcv.__kt <= 1)
             return;
         if (typeof data.readOnly !== 'undefined') {
             this.setReadOnly(data.readOnly);
@@ -37681,7 +37679,7 @@ var condition_ex_ConditionEx = /** @class */ (function (_super) {
     };
     ConditionEx.prototype.saveToData = function () {
         var obj = _super.prototype.saveToData.call(this);
-        if (lcv.__kt <= 1)
+        if (lcv_lcv.__kt <= 1)
             return obj;
         if (this.isReadOnly()) {
             obj.readOnly = this.isReadOnly();
@@ -37742,7 +37740,7 @@ var query_column_ex_QueryColumnEx = /** @class */ (function (_super) {
      */
     QueryColumnEx.prototype.loadFromData = function (model, colData) {
         _super.prototype.loadFromData.call(this, model, colData);
-        if (lcv.__kt <= 2)
+        if (lcv_lcv.__kt <= 2)
             return;
         if (colData) {
             if (typeof colData.readOnly != 'undefined') {
@@ -37752,7 +37750,7 @@ var query_column_ex_QueryColumnEx = /** @class */ (function (_super) {
     };
     QueryColumnEx.prototype.saveToData = function () {
         var colData = _super.prototype.saveToData.call(this);
-        if (lcv.__kt <= 2)
+        if (lcv_lcv.__kt <= 2)
             return colData;
         if (this.isReadOnly()) {
             colData.readOnly = this.isReadOnly();
@@ -37787,20 +37785,20 @@ var query_ex_QueryEx = /** @class */ (function (_super) {
         return _super.call(this, model) || this;
     }
     QueryEx.prototype.isEx = function () {
-        return lcv.__kt > 1;
+        return lcv_lcv.__kt > 1;
     };
     QueryEx.prototype.createSubQuery = function () {
         return new QueryEx(this.model);
     };
     QueryEx.prototype.createCondition = function (tag) {
         if (tag === void 0) { tag = public_api["CondTag"].Simple; }
-        if (lcv.__kt <= 1)
+        if (lcv_lcv.__kt <= 1)
             return _super.prototype.createCondition.call(this, tag);
         return new condition_ex_ConditionEx(this, tag);
     };
     QueryEx.prototype.createColumn = function (justsorted) {
         if (justsorted === void 0) { justsorted = false; }
-        if (lcv.__kt <= 1)
+        if (lcv_lcv.__kt <= 1)
             return _super.prototype.createColumn.call(this, justsorted);
         return new query_column_ex_QueryColumnEx(this, justsorted);
     };
@@ -37811,7 +37809,7 @@ var query_ex_QueryEx = /** @class */ (function (_super) {
      */
     QueryEx.prototype.addConditionGroup = function (descriptor, addChildCondition) {
         if (addChildCondition === void 0) { addChildCondition = true; }
-        if (lcv.__kt <= 1)
+        if (lcv_lcv.__kt <= 1)
             return _super.prototype.addConditionGroup.call(this, descriptor, addChildCondition);
         var parent = descriptor.parent || this.getRootCondition();
         var lType = descriptor.linking || (parent.linkType === public_api["LinkType"].All ? public_api["LinkType"].Any : public_api["LinkType"].All);
@@ -37830,7 +37828,7 @@ var query_ex_QueryEx = /** @class */ (function (_super) {
     QueryEx.prototype.addExtraConditionGroup = function (descriptor, addChildCondition) {
         if (addChildCondition === void 0) { addChildCondition = true; }
         descriptor.parent = descriptor.parent || this.extraConditions;
-        if (lcv.__kt <= 1)
+        if (lcv_lcv.__kt <= 1)
             return _super.prototype.addExtraConditionGroup.call(this, descriptor, addChildCondition);
         return this.addConditionGroup(descriptor);
     };
@@ -37864,7 +37862,7 @@ var model_ex_DataModelEx = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     DataModelEx.prototype.buildQueryPath = function (query) {
-        if (lcv.__kt <= 1)
+        if (lcv_lcv.__kt <= 1)
             return _super.prototype.buildQueryPath.call(this, query);
         if (this.mainEntity)
             return _super.prototype.buildQueryPath.call(this, query);
@@ -38022,7 +38020,7 @@ var lc_dialog_LCDialog = /** @class */ (function () {
                 closable: false,
                 cancelable: false,
                 submitOnEnter: true,
-                title: 'Incorrect license key for EasyQuery',
+                title: 'No license key for EasyQuery',
                 body: this.buildStartPage(),
                 submitButtonText: 'Submit',
                 onInput: this.validateForm.bind(this),
@@ -38107,7 +38105,7 @@ var lc_dialog_LCDialog = /** @class */ (function () {
         var formBuilder = Object(dist_lib_public_api["domel"])('div');
         formBuilder.addChild('div', function (b) { return b
             .html('<div style="font-size:1.2em">The EasyQuery license key is either absent, invalid or was issued for a different version of the library.</div>' +
-            '<div style="font-size:1.2em">Please fill out the form to obtain a valid license key.</div>'); });
+            '<div style="font-size:1.2em">Please fill out the form to obtain a valid trial license key.</div>'); });
         formBuilder
             .addClass('kfrm-form')
             .addChild('div', function (b) {
@@ -38140,7 +38138,7 @@ var lc_dialog_LCDialog = /** @class */ (function () {
         var formBuilder = Object(dist_lib_public_api["domel"])('div');
         formBuilder.addChild('div', function (b) { return b
             .html('<div style="font-size:1.2em">We sent a confirmation code to <strong>{{email}}</strong>.</div>' +
-            '<div style="font-size:1.2em">Please find it and enter the code in the input below</div>'); });
+            '<div style="font-size:1.2em">Please find it in the email and enter to the text box below</div>'); });
         formBuilder
             .addClass('kfrm-form')
             .addChild('div', function (b) {
@@ -38165,7 +38163,7 @@ var lc_dialog_LCDialog = /** @class */ (function () {
         var formBuilder = Object(dist_lib_public_api["domel"])('div');
         formBuilder.addChild('div', function (b) { return b
             .html('<div style="font-size:1.2em">You have successfully completed the registration process.</div>' +
-            '<div style="font-size:1.2em">Please restart web application to get the key applied.</div>'); });
+            '<div style="font-size:1.2em">Please restart your web application to get the key applied.</div>'); });
         form = formBuilder.toDOM();
         return form;
     };
@@ -38256,6 +38254,56 @@ var lc_dialog_LCDialog = /** @class */ (function () {
     return LCDialog;
 }());
 
+function showNoLicenseAlert(lcv) {
+    var title, body, buttonTitle, buttonUrl;
+    switch (lcv.__kt) {
+        case 1:
+            title = 'EasyQuery trial has expired';
+            body = "Your trial period for EasyQuery has expired. \n\tYou can send a request to <a href=\"https://korzh.com/account\">extend your trial</a> or <a href=\"https://korzh.com/easyquery/licensing\">buy a license</a> to get rid of all limitations.";
+            buttonTitle = 'Buy a license';
+            buttonUrl = 'https://korzh.com/easyquery/licensing';
+            break;
+        case -3:
+            title = 'No license key for EasyQuery';
+            body = "Please <a href=\"https://korzh.com/easyquery#get-started\">register for a trial</a> \n\tor <a href=\"https://korzh.com/easyquery/licensing\">purchase a license</a> to get a proper product key. <br />\n\tIf you already have a key, please follow <a href=\"https://korzh.com/easyquery/docs/getting-started/product-key\">this guide</a> to apply it.";
+            buttonTitle = 'Register trial';
+            buttonUrl = 'https://korzh.com/easyquery#get-started';
+            break;
+        default:
+            title = "Invalid key for EasyQuery!";
+            body = "The EasyQuery product key is either invalid or was issued for a different version of the library.\n    The version you are using now is 7.2,\n\tso please <a href=\"https://korzh.com/account\">login to your account</a> to get a proper key for version 7.2.";
+            buttonTitle = 'Get key';
+            buttonUrl = 'https://korzh.com/account';
+            break;
+    }
+    var ds = new dist_lib_public_api["DefaultDialogService"]();
+    var dlg = ds.open({
+        closable: false,
+        cancelable: false,
+        submitable: false,
+        title: title,
+        body: body
+    });
+    var footer = dlg.getRootElement().querySelector('footer');
+    Object(dist_lib_public_api["domel"])(footer)
+        .removeClass('align-right')
+        .setStyle('justify-content', 'center')
+        .addChild('button', function (b) { return b
+        .addClass('kfrm-button', 'is-info')
+        .addText(buttonTitle)
+        .on('click', function (e) {
+        window.location.href = buttonUrl;
+    }); });
+    if (lcv.__kt == 1) {
+        Object(dist_lib_public_api["domel"])(footer)
+            .addChild('button', function (b) { return b
+            .addClass('kfrm-button')
+            .addText('Extend trial')
+            .on('click', function (e) {
+            window.location.href = 'https://korzh.com/account';
+        }); });
+    }
+}
 //# sourceMappingURL=lc-dialog.js.map
 // CONCATENATED MODULE: ./dist/lib/extensions.js
 
@@ -38272,15 +38320,15 @@ public_api["EqContext"].prototype.setLicenseKeyEndpoint = function (endpoint) {
 };
 public_api["EqContext"].prototype.useEnterprise = function (keyOrInitCallback) {
     var _this = this;
-    var func = function (key) {
-        lcv.ck(key);
-        if (lcv.__kt > 1) {
+    var func = function (key, showAlert) {
+        lcv_lcv.ck(key);
+        if (lcv_lcv.__kt > 1) {
             var services = _this.getServices();
             services.registerDataModelResolver(function (context) { return new model_ex_DataModelEx(); });
             services.registerQueryResolver(function (context) { return new query_ex_QueryEx(context.getModel()); });
             services.registerQueryStorageResolver(function (context) { return new eqs_query_storage["a" /* EqServerQueryStorage */](context); });
             services.registerAggregatesCalculator(function (context) { return new data_table_aggr_calculator["a" /* DataTableAggregatesCalculator */](context); });
-            if (lcv.__kt === 2) {
+            if (lcv_lcv.__kt === 2) {
                 console.warn('EasyQuery.JS is working in the TRIAL MODE!\n'
                     + 'Please order a license (https://korzh.com/eq) to get a proper product key.');
                 createTrialWM();
@@ -38291,19 +38339,24 @@ public_api["EqContext"].prototype.useEnterprise = function (keyOrInitCallback) {
             }
         }
         else {
-            var lcd = new lc_dialog_LCDialog(_this);
-            lcd.show();
+            if (showAlert) {
+                showNoLicenseAlert(lcv_lcv);
+            }
+            else {
+                var lcd = new lc_dialog_LCDialog(_this);
+                lcd.show();
+            }
         }
     };
     if (typeof (keyOrInitCallback) === "string") {
-        func(keyOrInitCallback);
+        func(keyOrInitCallback, true);
     }
     else if (typeof (keyOrInitCallback) === "function") {
         var http_1 = this.getServices().getHttpClient();
         var url_1 = public_api["equtils"].combinePath(this.getBaseEndpoint(), 'lck2');
         http_1.get(url_1)
             .then(function (result) {
-            func(result.key.split("").reverse().join(""));
+            func(result.key.split("").reverse().join(""), false);
             _this.useBackend({
                 type: result.backendType,
                 subType: result.appType
@@ -38314,7 +38367,7 @@ public_api["EqContext"].prototype.useEnterprise = function (keyOrInitCallback) {
             url_1 = public_api["equtils"].combinePath(_this.getBaseEndpoint(), 'lck');
             http_1.get(url_1)
                 .then(function (result) {
-                func(result.split("").reverse().join(""));
+                func(result.split("").reverse().join(""), false);
                 keyOrInitCallback();
             })
                 .catch(function (error) { return _this.throwError({