@easyquery/enterprise 7.2.4-rc04 → 7.2.4

package/dist/bundles/easyquery.enterprise.js

@@ -183,6 +183,7 @@ Math.trunc = Math.trunc || function (x) {
 };
 var lcv = {
     __kt: 0,
+    versionNum: '' + majVer + '.' + minVer,
     ck: function (key) {
         if (!key || !key.length) {
             this.__kt = -3;
@@ -7486,6 +7487,7 @@ var dialogs = new DefaultDialogService();
 
 
 
+
 function strIsEmpty(str) {
     if (str) {
         return str.trim() === '';
@@ -7494,8 +7496,7 @@ function strIsEmpty(str) {
         return true;
 }
 var baseLicApiUrl = 'https://account.korzh.com/api/license';
-//const baseLicApiUrl = 'https://localhost:44301/api/license';
-var eqVersion = '7.2';
+var eqVersion = lcv.versionNum;
 var LCDialog = /** @class */ (function () {
     function LCDialog(context) {
         this.http = new HttpClient();
@@ -7541,7 +7542,6 @@ var LCDialog = /** @class */ (function () {
             },
         ]);
         var dialog1 = this.dialogSet.open(0);
-        //dialog1.getRootElement();
         setTimeout(function () {
             _this.validateForm(dialog1);
             var emailInput = document.getElementById('eqAuthEmail');
@@ -7651,10 +7651,9 @@ var LCDialog = /** @class */ (function () {
         var form;
         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 your web application to get the key applied.</div>'); });
+            .html('<div style="font-size:1.2em">You have successfully completed the registration.</div>' + '{{message}}'); });
         form = formBuilder.toDOM();
-        return form;
+        return form.outerHTML;
     };
     LCDialog.prototype.buildFailurePage = function () {
         var form;
@@ -7716,7 +7715,13 @@ var LCDialog = /** @class */ (function () {
                         version: eqVersion,
                         key: result.key
                     }, { dataType: 'json' })
-                        .then(function (_) { return _this.dialogSet.openNext(); });
+                        .then(function (_) { return _this.dialogSet.open(2, {
+                        message: '<div style="font-size:1.2em">Please restart your web application to get the key applied.</div>'
+                    }); }, function (_) { return _this.dialogSet.open(2, {
+                        message: '<div style="font-size:1.2em">' +
+                            'Please visit <a href="https://account.korzh.com">your account page on Korzh.com</a> to get the key ' +
+                            'and then add it to the <i>appsettings.json</i> file (in the <i>EasyQuery/LicenseKey</i> option).</div>'
+                    }); });
                     break;
                 case 2:
                     _this.dialogSet.open(3, {
@@ -7726,8 +7731,8 @@ var LCDialog = /** @class */ (function () {
                     break;
                 case 3:
                     _this.dialogSet.open(3, {
-                        message: '<div style="font-size:1.2em">Your purchased license for EasyQuery has expired.</div>' +
-                            '<div style="font-size:1.2em">You need to <a href="https://korzh.com/account">renew the subscription</a> to get a valid license.</div>'
+                        message: '<div style="font-size:1.2em">The maintenance subscription for your EasyQuery license has expired.</div>' +
+                            '<div style="font-size:1.2em">You need to <a href="https://account.korzh.com">renew the subscription</a> to get a valid license.</div>'
                     });
                     break;
                 default:
@@ -7743,54 +7748,54 @@ var 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;
+function showNoLicenseAlert(context) {
+    if (lcv.__kt == -3) {
+        var lcd = new LCDialog(context);
+        lcd.show();
     }
-    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) {
+    else {
+        var title = void 0, body = void 0, buttonTitle_1, buttonUrl_1;
+        switch (lcv.__kt) {
+            case 1:
+                title = 'EasyQuery trial has expired';
+                body = "Your trial period for EasyQuery has expired. \n        You can <a href=\"https://korzh.com/support\">submit a request to extend your trial</a> or <a href=\"https://korzh.com/easyquery#licensing\">buy a license</a> to get rid of all limitations.";
+                buttonTitle_1 = 'Buy a license';
+                buttonUrl_1 = '#licensing';
+                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 ".concat(eqVersion, ",\n        so please <a href=\"https://account.korzh.com\">login to your account</a> to get a proper key for version ").concat(eqVersion);
+                buttonTitle_1 = 'Get key';
+                buttonUrl_1 = 'https://account.korzh.com';
+                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')
-            .addText('Extend trial')
+            .addClass('kfrm-button', 'is-info')
+            .addText(buttonTitle_1)
             .on('click', function (e) {
-            window.location.href = 'https://korzh.com/account';
+            window.location.href = buttonUrl_1;
         }); });
+        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://account.korzh.com';
+            }); });
+        }
     }
 }
 
@@ -7809,7 +7814,7 @@ external_easyqueryCore_.EqContext.prototype.setLicenseKeyEndpoint = function (en
 };
 external_easyqueryCore_.EqContext.prototype.useEnterprise = function (keyOrInitCallback) {
     var _this = this;
-    var func = function (key, showAlert) {
+    var func = function (key) {
         lcv.ck(key);
         if (lcv.__kt > 1) {
             var services = _this.getServices();
@@ -7828,24 +7833,18 @@ external_easyqueryCore_.EqContext.prototype.useEnterprise = function (keyOrInitC
             }
         }
         else {
-            if (showAlert) {
-                showNoLicenseAlert(lcv);
-            }
-            else {
-                var lcd = new LCDialog(_this);
-                lcd.show();
-            }
+            showNoLicenseAlert(_this);
         }
     };
     if (typeof (keyOrInitCallback) === "string") {
-        func(keyOrInitCallback, true);
+        func(keyOrInitCallback);
     }
     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(""), false);
+            func(result.key.split("").reverse().join(""));
             _this.useBackend({
                 type: result.backendType,
                 subType: result.appType
@@ -7856,7 +7855,7 @@ external_easyqueryCore_.EqContext.prototype.useEnterprise = function (keyOrInitC
             url_1 = external_easyqueryCore_.equtils.combinePath(_this.getBaseEndpoint(), 'lck');
             http_1.get(url_1)
                 .then(function (result) {
-                func(result.split("").reverse().join(""), false);
+                func(result.split("").reverse().join(""));
                 keyOrInitCallback();
             })
                 .catch(function (error) { return _this.throwError({