@easyquery/enterprise 7.2.1-rc03 → 7.2.2-rc01

package/dist/bundles/easyquery.enterprise.js

@@ -207,7 +207,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) {
@@ -228,23 +228,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;
                 }
             }
         }
@@ -345,7 +345,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);
@@ -369,7 +369,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();
@@ -430,7 +430,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') {
@@ -440,7 +440,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();
@@ -475,20 +475,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 = external_easyqueryCore_["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);
     };
@@ -499,7 +499,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 === external_easyqueryCore_["LinkType"].All ? external_easyqueryCore_["LinkType"].Any : external_easyqueryCore_["LinkType"].All);
@@ -518,7 +518,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);
     };
@@ -656,7 +656,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);
@@ -7492,7 +7492,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),
@@ -7577,7 +7577,7 @@ var lc_dialog_LCDialog = /** @class */ (function () {
         var formBuilder = 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) {
@@ -7610,7 +7610,7 @@ var lc_dialog_LCDialog = /** @class */ (function () {
         var formBuilder = 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) {
@@ -7635,7 +7635,7 @@ var lc_dialog_LCDialog = /** @class */ (function () {
         var formBuilder = 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;
     };
@@ -7726,6 +7726,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 DefaultDialogService();
+    var dlg = ds.open({
+        closable: false,
+        cancelable: false,
+        submitable: false,
+        title: title,
+        body: body
+    });
+    var footer = dlg.getRootElement().querySelector('footer');
+    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) {
+        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';
+        }); });
+    }
+}
 
 // CONCATENATED MODULE: ./src/extensions.ts
 
@@ -7742,15 +7792,15 @@ external_easyqueryCore_["EqContext"].prototype.setLicenseKeyEndpoint = function
 };
 external_easyqueryCore_["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 EqServerQueryStorage(context); });
             services.registerAggregatesCalculator(function (context) { return new data_table_aggr_calculator_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();
@@ -7761,19 +7811,24 @@ external_easyqueryCore_["EqContext"].prototype.useEnterprise = function (keyOrIn
             }
         }
         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 = external_easyqueryCore_["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
@@ -7784,7 +7839,7 @@ external_easyqueryCore_["EqContext"].prototype.useEnterprise = function (keyOrIn
             url_1 = external_easyqueryCore_["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({