@osovitny/anatoly 2.0.26 → 2.0.28
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/osovitny-anatoly.umd.js +8 -10
- package/bundles/osovitny-anatoly.umd.js.map +1 -1
- package/bundles/osovitny-anatoly.umd.min.js +1 -1
- package/bundles/osovitny-anatoly.umd.min.js.map +1 -1
- package/esm2015/lib/core/interceptors/httpInterceptor.js +1 -1
- package/esm2015/lib/core/notifications/alerts.js +5 -3
- package/esm2015/lib/data/base/base-api.service.js +7 -9
- package/fesm2015/osovitny-anatoly.js +8 -10
- package/fesm2015/osovitny-anatoly.js.map +1 -1
- package/lib/data/base/base-api.service.d.ts +1 -1
- package/osovitny-anatoly.metadata.json +1 -1
- package/package.json +1 -1
|
@@ -105,4 +105,4 @@ AnatolyHttpInterceptor.ctorParameters = () => [
|
|
|
105
105
|
{ type: LoadingService },
|
|
106
106
|
{ type: LoggingService }
|
|
107
107
|
];
|
|
108
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
108
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"httpInterceptor.js","sourceRoot":"","sources":["../../../../../../projects/anatoly/src/lib/core/interceptors/httpInterceptor.ts"],"names":[],"mappings":"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","sourcesContent":["/*\r\n<file>\r\n  Project:\r\n    @osovitny/anatoly\r\n\r\n  Authors:\r\n    Vadim Osovitny\r\n    Anatoly Osovitny\r\n\r\n  Created:\r\n    25 March 2020\r\n\r\n  Version:\r\n    1.0\r\n\r\n  Copyright (c) 2016-2020 Osovitny Inc. All rights reserved.\r\n</file>\r\n*/\r\n\r\n// Node\r\nimport {HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpResponse} from '@angular/common/http';\r\nimport {Injectable} from '@angular/core';\r\n\r\n// RxJS\r\nimport {tap} from 'rxjs/operators';\r\nimport {Observable} from 'rxjs';\r\n\r\n// App\r\nimport {AppCoreSettings} from '../consts/settings';\r\nimport {LoadingService} from '../services/loading.service';\r\nimport {LoggingService} from '../logging/logging.service';\r\n\r\n@Injectable()\r\nexport class AnatolyHttpInterceptor implements HttpInterceptor {\r\n  protected longRunningExceptionsList = [];\r\n  protected autoCDNSASTokenUrls = ['chunks', 'resources'];\r\n  protected externalSiteUrls = ['azurewebsites.net'];\r\n\r\n  constructor(protected loadingService: LoadingService, protected loggingService: LoggingService) {\r\n  }\r\n\r\n  intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {\r\n    const isCDNEnabled = AppCoreSettings.IsCDNEnabled;\r\n    const cdnSasToken = AppCoreSettings.CDNSASToken;\r\n\r\n    const isLoadingFreezed = this.loadingService.isFreezed;\r\n    let loadingRequired = !isLoadingFreezed;\r\n    const authorizationTokenRequired = true;\r\n    const url = req.url.toLowerCase();\r\n    const originalUrl = req.url;\r\n    let isExternalSite = false;\r\n\r\n    if (!isLoadingFreezed) {\r\n      for (const i of this.longRunningExceptionsList) {\r\n        if (url.indexOf(this.longRunningExceptionsList[i]) >= 0) {\r\n          loadingRequired = false;\r\n          break;\r\n        }\r\n      }\r\n    }\r\n\r\n    if (isCDNEnabled) {\r\n      for (const i of this.autoCDNSASTokenUrls) {\r\n        if (url.indexOf(this.autoCDNSASTokenUrls[i]) >= 0) {\r\n          req = req.clone({ url: originalUrl + cdnSasToken });\r\n          break;\r\n        }\r\n      }\r\n    }\r\n\r\n    for (const i of this.externalSiteUrls) {\r\n      if (url.indexOf(this.externalSiteUrls[i]) >= 0) {\r\n        isExternalSite = true;\r\n        break;\r\n      }\r\n    }\r\n\r\n    // VadimOS: IE11-fix\r\n    if (url.indexOf('/api/') > -1) {\r\n      let newUrl = '';\r\n      const t = new Date().getTime().toString();\r\n\r\n      if (url.indexOf('?') > -1) {\r\n        newUrl = originalUrl + '&t=' + t;\r\n      } else {\r\n        newUrl = originalUrl + '?t=' + t;\r\n      }\r\n\r\n      req = req.clone({ url: newUrl });\r\n    }\r\n\r\n    req = req.clone({ headers: req.headers.set('Accept', 'application/json') });\r\n\r\n    this.onRequestStart(loadingRequired);\r\n\r\n    return next.handle(req).pipe(\r\n      tap(\r\n        (event: HttpEvent<any>) => {\r\n          if (event instanceof HttpResponse) {\r\n            this.onRequestEnd(loadingRequired);\r\n          }\r\n        },\r\n        (err: any) => {\r\n          this.onRequestEnd(loadingRequired);\r\n          this.loggingService.logError(err);\r\n        }\r\n      )\r\n    );\r\n  }\r\n\r\n  onRequestStart(loadingRequired: boolean) {\r\n    if (loadingRequired) {\r\n      this.loadingService.show();\r\n    }\r\n  }\r\n\r\n  onRequestEnd(loadingRequired: boolean) {\r\n    if (loadingRequired) {\r\n      this.loadingService.hide();\r\n    }\r\n  }\r\n}\r\n"]}
|
|
@@ -80,12 +80,14 @@ export class Alerts {
|
|
|
80
80
|
static areYouSure(text, title, confirmButtonText, cancelButtonText, successAction, cancelAction) {
|
|
81
81
|
text = Utils.getLocalizedValue(text);
|
|
82
82
|
title = Utils.getLocalizedValue(title, null, 'AreYouSure');
|
|
83
|
+
confirmButtonText = Utils.getLocalizedValue(confirmButtonText, null, 'AreYouSure-ConfirmButtonText');
|
|
84
|
+
cancelButtonText = Utils.getLocalizedValue(cancelButtonText, null, 'AreYouSure-CancelButtonText');
|
|
83
85
|
Swal.fire({
|
|
84
86
|
text,
|
|
85
87
|
title,
|
|
86
88
|
icon: 'warning',
|
|
87
|
-
confirmButtonText
|
|
88
|
-
cancelButtonText
|
|
89
|
+
confirmButtonText,
|
|
90
|
+
cancelButtonText,
|
|
89
91
|
showCancelButton: true
|
|
90
92
|
})
|
|
91
93
|
.then((result) => {
|
|
@@ -104,4 +106,4 @@ export class Alerts {
|
|
|
104
106
|
}
|
|
105
107
|
;
|
|
106
108
|
}
|
|
107
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
109
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"alerts.js","sourceRoot":"","sources":["../../../../../../projects/anatoly/src/lib/core/notifications/alerts.ts"],"names":[],"mappings":"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","sourcesContent":["/*\r\n<file>\r\n  Project:\r\n    @osovitny/anatoly\r\n\r\n  Authors:\r\n    Vadim Osovitny\r\n    Anatoly Osovitny\r\n\r\n  Created:\r\n    3 March 2020\r\n\r\n  Version:\r\n    1.0\r\n\r\n  Copyright (c) 2016-2020 Osovitny Inc. All rights reserved.\r\n</file>\r\n*/\r\n\r\nimport Swal from 'sweetalert2';\r\nimport { Utils } from '../utils';\r\n\r\nexport class Alerts {\r\n  public static success(text?, params?: any[], title?, successAction?) {\r\n    text = Utils.getLocalizedValue(text, params, 'OperationSuccessFull');\r\n    title = Utils.getLocalizedValue(title, null, 'Success');\r\n\r\n    Swal.fire({\r\n      text,\r\n      title,\r\n      icon: 'success',\r\n      confirmButtonText: Utils.getLocalizedValue('Ok')\r\n    })\r\n    .then(() => {\r\n      if (successAction) {\r\n        successAction();\r\n      }\r\n    });\r\n  }\r\n\r\n  public static info(text, params?: any[], title?) {\r\n    text = Utils.getLocalizedValue(text, params);\r\n    title = Utils.getLocalizedValue(title, null, 'Info');\r\n\r\n    Swal.fire({\r\n      text,\r\n      title,\r\n      icon: 'info',\r\n      confirmButtonText: Utils.getLocalizedValue('Ok')\r\n    });\r\n  }\r\n\r\n  public static warning(text, params?: any[], title?) {\r\n    text = Utils.getLocalizedValue(text, params);\r\n    title = Utils.getLocalizedValue(title, null, 'Warning');\r\n\r\n    Swal.fire({\r\n      text,\r\n      title,\r\n      icon: 'warning',\r\n      confirmButtonText: Utils.getLocalizedValue('Ok')\r\n    });\r\n  }\r\n\r\n  public static error(text?, params?: any[], title?) {\r\n    text = Utils.getLocalizedValue(text, params, 'ErrorOccured');\r\n    title = Utils.getLocalizedValue(title, null, 'Error');\r\n\r\n    Swal.fire({\r\n      text,\r\n      title,\r\n      icon: 'error',\r\n      confirmButtonText: Utils.getLocalizedValue('Ok')\r\n    });\r\n  }\r\n\r\n  public static cancel(text?, params?: any[], title?) {\r\n    text = Utils.getLocalizedValue(text, params, 'OperationCancelled');\r\n    title = Utils.getLocalizedValue(title, null, 'Cancelled');\r\n\r\n    Swal.fire({\r\n      text,\r\n      title,\r\n      icon: 'info'\r\n    })\r\n  }\r\n\r\n  public static notImplemented() {\r\n    this.warning('Not Implemented Yet');\r\n  };\r\n\r\n  public static areYouSure(text, title?, confirmButtonText?, cancelButtonText?, successAction?, cancelAction?) {\r\n    text = Utils.getLocalizedValue(text);\r\n    title = Utils.getLocalizedValue(title, null, 'AreYouSure');\r\n    confirmButtonText = Utils.getLocalizedValue(confirmButtonText, null, 'AreYouSure-ConfirmButtonText');\r\n    cancelButtonText  = Utils.getLocalizedValue(cancelButtonText, null, 'AreYouSure-CancelButtonText');\r\n\r\n    Swal.fire({\r\n      text,\r\n      title,\r\n      icon: 'warning',\r\n      confirmButtonText,\r\n      cancelButtonText,\r\n      showCancelButton: true\r\n    })\r\n    .then((result) => {\r\n      if (result.value) {\r\n        if (successAction) {\r\n          successAction();\r\n        }\r\n      }\r\n      // result.dismiss can be 'cancel', 'overlay', 'close', and 'timer'\r\n      else if (result.dismiss == Swal.DismissReason.cancel || result.dismiss == Swal.DismissReason.close) {\r\n        if (cancelAction) {\r\n          cancelAction();\r\n        }\r\n      }\r\n    });\r\n  };\r\n}\r\n"]}
|
|
@@ -20,6 +20,8 @@
|
|
|
20
20
|
import { Injectable } from '@angular/core';
|
|
21
21
|
import { HttpClient } from '@angular/common/http';
|
|
22
22
|
import { map } from 'rxjs/operators';
|
|
23
|
+
//App
|
|
24
|
+
import { AppCoreSettings } from '../../core/consts/settings';
|
|
23
25
|
export class BaseApiService {
|
|
24
26
|
constructor(http) {
|
|
25
27
|
this.http = http;
|
|
@@ -66,14 +68,10 @@ export class BaseApiService {
|
|
|
66
68
|
getAll(data) {
|
|
67
69
|
return this.get('getall', data).pipe(map((res) => res));
|
|
68
70
|
}
|
|
69
|
-
getJsonFile(fileName
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
if (!jsonVersion) {
|
|
74
|
-
jsonVersion = '1.0';
|
|
75
|
-
}
|
|
76
|
-
const url = jsonUrl + '/' + fileName + '?' + jsonVersion;
|
|
71
|
+
getJsonFile(fileName) {
|
|
72
|
+
const jsonsUrl = AppCoreSettings.jsonsUrl;
|
|
73
|
+
const jsonVersion = AppCoreSettings.jsonVersion;
|
|
74
|
+
const url = jsonsUrl + '/' + fileName + '?' + jsonVersion;
|
|
77
75
|
return this.http.get(url).pipe(map((res) => res));
|
|
78
76
|
}
|
|
79
77
|
}
|
|
@@ -83,4 +81,4 @@ BaseApiService.decorators = [
|
|
|
83
81
|
BaseApiService.ctorParameters = () => [
|
|
84
82
|
{ type: HttpClient }
|
|
85
83
|
];
|
|
86
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
84
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS1hcGkuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2FuYXRvbHkvc3JjL2xpYi9kYXRhL2Jhc2UvYmFzZS1hcGkuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7Ozs7Ozs7RUFpQkU7QUFFRixPQUFPO0FBQ1AsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMzQyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFJbEQsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBRXJDLEtBQUs7QUFDTCxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFLN0QsTUFBTSxPQUFPLGNBQWM7SUFHekIsWUFBc0IsSUFBZ0I7UUFBaEIsU0FBSSxHQUFKLElBQUksQ0FBWTtRQUY1QixZQUFPLEdBQUcsRUFBRSxDQUFDO0lBR3ZCLENBQUM7SUFFTyxlQUFlLENBQUMsSUFBVTtRQUNoQyxPQUFPLElBQUksQ0FBQyxDQUFDLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztJQUN6QyxDQUFDO0lBRUQsTUFBTTtJQUNOLEdBQUcsQ0FBSSxNQUFjLEVBQUUsSUFBVSxFQUFFLFlBQWE7UUFDOUMsSUFBSSxDQUFDLFlBQVksRUFBRTtZQUNqQixZQUFZLEdBQUcsTUFBTSxDQUFDO1NBQ3ZCO1FBRUQsTUFBTSxHQUFHLEdBQUcsR0FBRyxJQUFJLENBQUMsT0FBTyxJQUFJLE1BQU0sR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7UUFDckUsT0FBTyxJQUFJLENBQUMsSUFBSTthQUNiLEdBQUcsQ0FBSSxHQUFHLEVBQUUsRUFBRSxZQUFZLEVBQUUsQ0FBQzthQUM3QixJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQyxHQUFRLENBQUMsQ0FBQyxDQUFDO0lBQ2xDLENBQUM7SUFFRCxJQUFJLENBQUMsTUFBYyxFQUFFLElBQVUsRUFBRSxZQUFhO1FBQzVDLElBQUksQ0FBQyxZQUFZLEVBQUU7WUFDakIsWUFBWSxHQUFHLE1BQU0sQ0FBQztTQUN2QjtRQUVELE1BQU0sR0FBRyxHQUFHLEdBQUcsSUFBSSxDQUFDLE9BQU8sSUFBSSxNQUFNLEVBQUUsQ0FBQztRQUN4QyxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxJQUFJLEVBQUUsRUFBRSxZQUFZLEVBQUUsQ0FBQyxDQUFDO0lBQ3JELENBQUM7SUFFRCxNQUFNLENBQUMsTUFBYyxFQUFFLElBQVUsRUFBRSxZQUFhO1FBQzlDLElBQUksQ0FBQyxZQUFZLEVBQUU7WUFDakIsWUFBWSxHQUFHLE1BQU0sQ0FBQztTQUN2QjtRQUVELE1BQU0sR0FBRyxHQUFHLEdBQUcsSUFBSSxDQUFDLE9BQU8sSUFBSSxNQUFNLEdBQUcsSUFBSSxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO1FBQ3JFLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLElBQUksRUFBRSxFQUFFLFlBQVksRUFBRSxDQUFDLENBQUM7SUFDckQsQ0FBQztJQUVELE1BQU0sQ0FBQyxNQUFjLEVBQUUsSUFBVSxFQUFFLFlBQWE7UUFDOUMsSUFBSSxDQUFDLFlBQVksRUFBRTtZQUNqQixZQUFZLEdBQUcsTUFBTSxDQUFDO1NBQ3ZCO1FBRUQsTUFBTSxHQUFHLEdBQUcsR0FBRyxJQUFJLENBQUMsT0FBTyxJQUFJLE1BQU0sR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7UUFDckUsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsRUFBRSxZQUFZLEVBQUUsQ0FBQyxDQUFDO0lBQ2pELENBQUM7SUFFRCxPQUFPO0lBQ1AsT0FBTyxDQUFJLEVBQU87UUFDaEIsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFJLFNBQVMsRUFBRSxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDeEMsQ0FBQztJQUVELE1BQU0sQ0FBSSxJQUFVO1FBQ2xCLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxRQUFRLEVBQUUsSUFBSSxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsR0FBVSxDQUFDLENBQUMsQ0FBQztJQUNqRSxDQUFDO0lBRUQsV0FBVyxDQUFDLFFBQWdCO1FBQzFCLE1BQU0sUUFBUSxHQUFHLGVBQWUsQ0FBQyxRQUFRLENBQUM7UUFDMUMsTUFBTSxXQUFXLEdBQUcsZUFBZSxDQUFDLFdBQVcsQ0FBQztRQUNoRCxNQUFNLEdBQUcsR0FBRyxRQUFRLEdBQUcsR0FBRyxHQUFHLFFBQVEsR0FBRyxHQUFHLEdBQUcsV0FBVyxDQUFDO1FBRTFELE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsR0FBWSxDQUFDLENBQUMsQ0FBQztJQUM3RCxDQUFDOzs7WUFqRUYsVUFBVTs7O1lBWEYsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbIi8qXHJcbjxmaWxlPlxyXG4gIFByb2plY3Q6XHJcbiAgICBAb3Nvdml0bnkvYW5hdG9seVxyXG5cclxuICBBdXRob3JzOlxyXG4gICAgVmFkaW0gT3Nvdml0bnlcclxuICAgIEFuYXRvbHkgT3Nvdml0bnlcclxuXHJcbiAgQ3JlYXRlZDpcclxuICAgICAxMyBOb3YgMjAxN1xyXG5cclxuICBWZXJzaW9uOlxyXG4gICAgMS4wXHJcblxyXG4gIENvcHlyaWdodCAoYykgMjAxNi0yMDIwIE9zb3ZpdG55IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC5cclxuPC9maWxlPlxyXG4qL1xyXG5cclxuLy8gTm9kZVxyXG5pbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XHJcbmltcG9ydCB7IEh0dHBDbGllbnQgfSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XHJcblxyXG4vLyBSeEpzXHJcbmltcG9ydCB7IE9ic2VydmFibGUgfSBmcm9tICdyeGpzJztcclxuaW1wb3J0IHsgbWFwIH0gZnJvbSAncnhqcy9vcGVyYXRvcnMnO1xyXG5cclxuLy9BcHBcclxuaW1wb3J0IHsgQXBwQ29yZVNldHRpbmdzIH0gZnJvbSAnLi4vLi4vY29yZS9jb25zdHMvc2V0dGluZ3MnO1xyXG5cclxuZGVjbGFyZSB2YXIgJDogYW55O1xyXG5cclxuQEluamVjdGFibGUoKVxyXG5leHBvcnQgY2xhc3MgQmFzZUFwaVNlcnZpY2Uge1xyXG4gIHByb3RlY3RlZCBiYXNlVXJsID0gJyc7XHJcblxyXG4gIGNvbnN0cnVjdG9yKHByb3RlY3RlZCBodHRwOiBIdHRwQ2xpZW50KSB7XHJcbiAgfVxyXG5cclxuICBwcml2YXRlIHNlcmlhbGl6ZVBhcmFtcyhkYXRhPzogYW55KTogc3RyaW5nIHtcclxuICAgIHJldHVybiBkYXRhID8gJz8nICsgJC5wYXJhbShkYXRhKSA6ICcnO1xyXG4gIH1cclxuXHJcbiAgLy8gYXBpXHJcbiAgZ2V0PFQ+KGFjdGlvbjogc3RyaW5nLCBkYXRhPzogYW55LCByZXNwb25zZVR5cGU/KTogT2JzZXJ2YWJsZTxUPiB7XHJcbiAgICBpZiAoIXJlc3BvbnNlVHlwZSkge1xyXG4gICAgICByZXNwb25zZVR5cGUgPSAnanNvbic7XHJcbiAgICB9XHJcblxyXG4gICAgY29uc3QgdXJsID0gYCR7dGhpcy5iYXNlVXJsfS8ke2FjdGlvbn0ke3RoaXMuc2VyaWFsaXplUGFyYW1zKGRhdGEpfWA7XHJcbiAgICByZXR1cm4gdGhpcy5odHRwXHJcbiAgICAgIC5nZXQ8VD4odXJsLCB7IHJlc3BvbnNlVHlwZSB9KVxyXG4gICAgICAucGlwZShtYXAoKHJlcykgPT4gcmVzIGFzIFQpKTtcclxuICB9XHJcblxyXG4gIHBvc3QoYWN0aW9uOiBzdHJpbmcsIGRhdGE/OiBhbnksIHJlc3BvbnNlVHlwZT8pOiBPYnNlcnZhYmxlPGFueT4ge1xyXG4gICAgaWYgKCFyZXNwb25zZVR5cGUpIHtcclxuICAgICAgcmVzcG9uc2VUeXBlID0gJ3RleHQnO1xyXG4gICAgfVxyXG5cclxuICAgIGNvbnN0IHVybCA9IGAke3RoaXMuYmFzZVVybH0vJHthY3Rpb259YDtcclxuICAgIHJldHVybiB0aGlzLmh0dHAucG9zdCh1cmwsIGRhdGEsIHsgcmVzcG9uc2VUeXBlIH0pO1xyXG4gIH1cclxuXHJcbiAgcG9zdFFTKGFjdGlvbjogc3RyaW5nLCBkYXRhPzogYW55LCByZXNwb25zZVR5cGU/KTogT2JzZXJ2YWJsZTxhbnk+IHtcclxuICAgIGlmICghcmVzcG9uc2VUeXBlKSB7XHJcbiAgICAgIHJlc3BvbnNlVHlwZSA9ICd0ZXh0JztcclxuICAgIH1cclxuXHJcbiAgICBjb25zdCB1cmwgPSBgJHt0aGlzLmJhc2VVcmx9LyR7YWN0aW9ufSR7dGhpcy5zZXJpYWxpemVQYXJhbXMoZGF0YSl9YDtcclxuICAgIHJldHVybiB0aGlzLmh0dHAucG9zdCh1cmwsIG51bGwsIHsgcmVzcG9uc2VUeXBlIH0pO1xyXG4gIH1cclxuXHJcbiAgZGVsZXRlKGFjdGlvbjogc3RyaW5nLCBkYXRhPzogYW55LCByZXNwb25zZVR5cGU/KTogT2JzZXJ2YWJsZTxhbnk+IHtcclxuICAgIGlmICghcmVzcG9uc2VUeXBlKSB7XHJcbiAgICAgIHJlc3BvbnNlVHlwZSA9ICd0ZXh0JztcclxuICAgIH1cclxuXHJcbiAgICBjb25zdCB1cmwgPSBgJHt0aGlzLmJhc2VVcmx9LyR7YWN0aW9ufSR7dGhpcy5zZXJpYWxpemVQYXJhbXMoZGF0YSl9YDtcclxuICAgIHJldHVybiB0aGlzLmh0dHAuZGVsZXRlKHVybCwgeyByZXNwb25zZVR5cGUgfSk7XHJcbiAgfVxyXG5cclxuICAvLyBnZXRzXHJcbiAgZ2V0QnlJZDxUPihpZDogYW55KTogT2JzZXJ2YWJsZTxUPiB7XHJcbiAgICByZXR1cm4gdGhpcy5nZXQ8VD4oJ2dldEJ5SWQnLCB7IGlkIH0pO1xyXG4gIH1cclxuXHJcbiAgZ2V0QWxsPFQ+KGRhdGE/OiBhbnkpOiBPYnNlcnZhYmxlPFRbXT4ge1xyXG4gICAgcmV0dXJuIHRoaXMuZ2V0KCdnZXRhbGwnLCBkYXRhKS5waXBlKG1hcCgocmVzKSA9PiByZXMgYXMgVFtdKSk7XHJcbiAgfVxyXG5cclxuICBnZXRKc29uRmlsZShmaWxlTmFtZTogc3RyaW5nKTogT2JzZXJ2YWJsZTxhbnlbXT4ge1xyXG4gICAgY29uc3QganNvbnNVcmwgPSBBcHBDb3JlU2V0dGluZ3MuanNvbnNVcmw7XHJcbiAgICBjb25zdCBqc29uVmVyc2lvbiA9IEFwcENvcmVTZXR0aW5ncy5qc29uVmVyc2lvbjtcclxuICAgIGNvbnN0IHVybCA9IGpzb25zVXJsICsgJy8nICsgZmlsZU5hbWUgKyAnPycgKyBqc29uVmVyc2lvbjtcclxuXHJcbiAgICByZXR1cm4gdGhpcy5odHRwLmdldCh1cmwpLnBpcGUobWFwKChyZXMpID0+IHJlcyBhcyBhbnlbXSkpO1xyXG4gIH1cclxufVxyXG4iXX0=
|
|
@@ -698,14 +698,10 @@ class BaseApiService {
|
|
|
698
698
|
getAll(data) {
|
|
699
699
|
return this.get('getall', data).pipe(map((res) => res));
|
|
700
700
|
}
|
|
701
|
-
getJsonFile(fileName
|
|
702
|
-
|
|
703
|
-
|
|
704
|
-
|
|
705
|
-
if (!jsonVersion) {
|
|
706
|
-
jsonVersion = '1.0';
|
|
707
|
-
}
|
|
708
|
-
const url = jsonUrl + '/' + fileName + '?' + jsonVersion;
|
|
701
|
+
getJsonFile(fileName) {
|
|
702
|
+
const jsonsUrl = AppCoreSettings.jsonsUrl;
|
|
703
|
+
const jsonVersion = AppCoreSettings.jsonVersion;
|
|
704
|
+
const url = jsonsUrl + '/' + fileName + '?' + jsonVersion;
|
|
709
705
|
return this.http.get(url).pipe(map((res) => res));
|
|
710
706
|
}
|
|
711
707
|
}
|
|
@@ -1214,12 +1210,14 @@ class Alerts {
|
|
|
1214
1210
|
static areYouSure(text, title, confirmButtonText, cancelButtonText, successAction, cancelAction) {
|
|
1215
1211
|
text = Utils.getLocalizedValue(text);
|
|
1216
1212
|
title = Utils.getLocalizedValue(title, null, 'AreYouSure');
|
|
1213
|
+
confirmButtonText = Utils.getLocalizedValue(confirmButtonText, null, 'AreYouSure-ConfirmButtonText');
|
|
1214
|
+
cancelButtonText = Utils.getLocalizedValue(cancelButtonText, null, 'AreYouSure-CancelButtonText');
|
|
1217
1215
|
Swal.fire({
|
|
1218
1216
|
text,
|
|
1219
1217
|
title,
|
|
1220
1218
|
icon: 'warning',
|
|
1221
|
-
confirmButtonText
|
|
1222
|
-
cancelButtonText
|
|
1219
|
+
confirmButtonText,
|
|
1220
|
+
cancelButtonText,
|
|
1223
1221
|
showCancelButton: true
|
|
1224
1222
|
})
|
|
1225
1223
|
.then((result) => {
|