@energycap/components 0.39.14-ECAP-23962-Powerview-Commodity-Selector.20240405-1037 → 0.39.14-ECAP-24583-parse-bc-api-errors.20240409-1017
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.
|
@@ -5,6 +5,10 @@ export function isApiError(errorResponse) {
|
|
|
5
5
|
if (errorResponse.error && errorResponse.error.hasOwnProperty('status') && errorResponse.error.status.hasOwnProperty('message')) {
|
|
6
6
|
return true;
|
|
7
7
|
}
|
|
8
|
+
// BillCAPture APIs return errors in a different format
|
|
9
|
+
if (errorResponse.error && errorResponse.error.hasOwnProperty('message')) {
|
|
10
|
+
return true;
|
|
11
|
+
}
|
|
8
12
|
return false;
|
|
9
13
|
}
|
|
10
14
|
export class ErrorService {
|
|
@@ -25,7 +29,7 @@ export class ErrorService {
|
|
|
25
29
|
let apiErrorMessage = unknownErrorDefault || 'DefaultUnknownError_SC';
|
|
26
30
|
if (errorResponse && isApiError(errorResponse)) {
|
|
27
31
|
try {
|
|
28
|
-
apiErrorMessage = errorResponse.error.status.message;
|
|
32
|
+
apiErrorMessage = errorResponse.error.status?.message || errorResponse.error.message;
|
|
29
33
|
}
|
|
30
34
|
catch (error) {
|
|
31
35
|
//log the real error to the console (for developers) but just return the generic error to the user
|
|
@@ -54,4 +58,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
|
|
|
54
58
|
providedIn: 'root'
|
|
55
59
|
}]
|
|
56
60
|
}], ctorParameters: function () { return []; } });
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3Iuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2NvbXBvbmVudHMvc3JjL2xpYi9jb3JlL2Vycm9yLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQzs7QUFHM0MsTUFBTSxVQUFVLFVBQVUsQ0FBQyxhQUFrQjtJQUMzQyx1RUFBdUU7SUFDdkUsSUFBSSxhQUFhLENBQUMsS0FBSyxJQUFJLGFBQWEsQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLFFBQVEsQ0FBQyxJQUFJLGFBQWEsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLGNBQWMsQ0FBQyxTQUFTLENBQUMsRUFBRTtRQUMvSCxPQUFPLElBQUksQ0FBQztLQUNiO0lBRUQsdURBQXVEO0lBQ3ZELElBQUksYUFBYSxDQUFDLEtBQUssSUFBSSxhQUFhLENBQUMsS0FBSyxDQUFDLGNBQWMsQ0FBQyxTQUFTLENBQUMsRUFBRTtRQUN4RSxPQUFPLElBQUksQ0FBQztLQUNiO0lBRUQsT0FBTyxLQUFLLENBQUM7QUFDZixDQUFDO0FBS0QsTUFBTSxPQUFPLFlBQVk7SUFFdkIsZ0JBQWdCLENBQUM7SUFFakI7Ozs7Ozs7T0FPRztJQUNJLGFBQWEsQ0FBQyxhQUFrQixFQUFFLG1CQUE0QjtRQUNuRSxJQUFJLE9BQU8sYUFBYSxLQUFLLFFBQVEsRUFBRTtZQUNyQyxPQUFPLGFBQWEsQ0FBQztTQUN0QjtRQUVELHVFQUF1RTtRQUN2RSxJQUFJLGVBQWUsR0FBVyxtQkFBbUIsSUFBSSx3QkFBd0IsQ0FBQztRQUU5RSxJQUFJLGFBQWEsSUFBSSxVQUFVLENBQUMsYUFBYSxDQUFDLEVBQUU7WUFDOUMsSUFBSTtnQkFDRixlQUFlLEdBQUcsYUFBYSxDQUFDLEtBQUssQ0FBQyxNQUFNLEVBQUUsT0FBTyxJQUFJLGFBQWEsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDO2FBQ3RGO1lBQUMsT0FBTyxLQUFLLEVBQUU7Z0JBQ2Qsa0dBQWtHO2dCQUNsRyxJQUFJLENBQUMsZUFBZSxDQUFDLEtBQUssQ0FBQyxDQUFDO2FBQzdCO1NBQ0Y7YUFBTTtZQUNMLElBQUksQ0FBQyxlQUFlLENBQUMsYUFBYSxDQUFDLENBQUM7U0FDckM7UUFFRCxPQUFPLGVBQWUsQ0FBQztJQUN6QixDQUFDO0lBRUQ7O09BRUc7SUFDSSxlQUFlLENBQUMsS0FBVTtRQUMvQixJQUFJLE9BQU8sSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxLQUFLLFVBQVUsRUFBRTtZQUNwRCxPQUFPLENBQUMsS0FBSyxDQUFDLGdCQUFnQixFQUFFLEtBQUssQ0FBQyxDQUFDO1NBQ3hDO0lBQ0gsQ0FBQzs7eUdBekNVLFlBQVk7NkdBQVosWUFBWSxjQUZYLE1BQU07MkZBRVAsWUFBWTtrQkFIeEIsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsTUFBTTtpQkFDbkIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XHJcblxyXG5cclxuZXhwb3J0IGZ1bmN0aW9uIGlzQXBpRXJyb3IoZXJyb3JSZXNwb25zZTogYW55KTogYm9vbGVhbiB7XHJcbiAgLy8gZXJyb3JSZXNwb25zZSBpcyB0eXBlZCBIdHRwRXJyb3JSZXNwb25zZSBpZiB0aGUgYXBpIHJldHVybnMgYW4gZXJyb3JcclxuICBpZiAoZXJyb3JSZXNwb25zZS5lcnJvciAmJiBlcnJvclJlc3BvbnNlLmVycm9yLmhhc093blByb3BlcnR5KCdzdGF0dXMnKSAmJiBlcnJvclJlc3BvbnNlLmVycm9yLnN0YXR1cy5oYXNPd25Qcm9wZXJ0eSgnbWVzc2FnZScpKSB7XHJcbiAgICByZXR1cm4gdHJ1ZTtcclxuICB9XHJcblxyXG4gIC8vIEJpbGxDQVB0dXJlIEFQSXMgcmV0dXJuIGVycm9ycyBpbiBhIGRpZmZlcmVudCBmb3JtYXRcclxuICBpZiAoZXJyb3JSZXNwb25zZS5lcnJvciAmJiBlcnJvclJlc3BvbnNlLmVycm9yLmhhc093blByb3BlcnR5KCdtZXNzYWdlJykpIHtcclxuICAgIHJldHVybiB0cnVlO1xyXG4gIH1cclxuXHJcbiAgcmV0dXJuIGZhbHNlO1xyXG59XHJcblxyXG5ASW5qZWN0YWJsZSh7XHJcbiAgcHJvdmlkZWRJbjogJ3Jvb3QnXHJcbn0pXHJcbmV4cG9ydCBjbGFzcyBFcnJvclNlcnZpY2Uge1xyXG5cclxuICBjb25zdHJ1Y3RvcigpIHsgfVxyXG5cclxuICAvKipcclxuICAgKiBQYXJzZSBhbiBlcnJvciB0aGF0IGNvbWVzIGZyb20gdGhlIEFQSSBmb3IgdXNlIGluc2lkZSB0aGUgZm9ybXNcclxuICAgKiBJbiBtb3N0IGNhc2VzIHRoaXMgaXNuJ3QgcmVxdWlyZWQgYmVjYXVzZSB0aGUgZXJyb3IgaGFuZGxlciB3aWxsIGRvIGl0IGF1dG9tYXRpY2FsbHksXHJcbiAgICogYnV0IGlmIHlvdSBuZWVkIHRvIGFuYWx5emUgdGhlIGVycm9yIG1lc3NhZ2UgeW91IGNhbiB1c2UgdGhpcyB0byBleHRyYWN0IGl0IHNhZmVseS5cclxuICAgKiBOT1RFOiBCZWNhdXNlIGl0IGNhbiBiZSB1c2VkIGZvciBjb21wYXJpc29uIHRoZSByZXN1bHQgaXMgbm90IHRyYW5zbGF0ZWQuIFlvdSBtdXN0IHRyYW5zbGF0ZVxyXG4gICAqIGl0IGJlZm9yZSBwcm92aWRpbmcgaXQgdG8gdGhlIHVzZXIuXHJcbiAgICogQHBhcmFtIGVycm9yIFRoZSBlcnJvciBvYmplY3QgZnJvbSB0aGUgQVBJXHJcbiAgICovXHJcbiAgcHVibGljIHBhcnNlQXBpRXJyb3IoZXJyb3JSZXNwb25zZTogYW55LCB1bmtub3duRXJyb3JEZWZhdWx0Pzogc3RyaW5nKTogc3RyaW5nIHtcclxuICAgIGlmICh0eXBlb2YgZXJyb3JSZXNwb25zZSA9PT0gJ3N0cmluZycpIHtcclxuICAgICAgcmV0dXJuIGVycm9yUmVzcG9uc2U7XHJcbiAgICB9XHJcblxyXG4gICAgLy8gZXJyb3JSZXNwb25zZSBpcyB0eXBlZCBIdHRwRXJyb3JSZXNwb25zZSBpZiB0aGUgYXBpIHJldHVybnMgYW4gZXJyb3JcclxuICAgIGxldCBhcGlFcnJvck1lc3NhZ2U6IHN0cmluZyA9IHVua25vd25FcnJvckRlZmF1bHQgfHwgJ0RlZmF1bHRVbmtub3duRXJyb3JfU0MnO1xyXG5cclxuICAgIGlmIChlcnJvclJlc3BvbnNlICYmIGlzQXBpRXJyb3IoZXJyb3JSZXNwb25zZSkpIHtcclxuICAgICAgdHJ5IHtcclxuICAgICAgICBhcGlFcnJvck1lc3NhZ2UgPSBlcnJvclJlc3BvbnNlLmVycm9yLnN0YXR1cz8ubWVzc2FnZSB8fCBlcnJvclJlc3BvbnNlLmVycm9yLm1lc3NhZ2U7XHJcbiAgICAgIH0gY2F0Y2ggKGVycm9yKSB7XHJcbiAgICAgICAgLy9sb2cgdGhlIHJlYWwgZXJyb3IgdG8gdGhlIGNvbnNvbGUgKGZvciBkZXZlbG9wZXJzKSBidXQganVzdCByZXR1cm4gdGhlIGdlbmVyaWMgZXJyb3IgdG8gdGhlIHVzZXJcclxuICAgICAgICB0aGlzLmxvZ0NvbnNvbGVFcnJvcihlcnJvcik7XHJcbiAgICAgIH1cclxuICAgIH0gZWxzZSB7XHJcbiAgICAgIHRoaXMubG9nQ29uc29sZUVycm9yKGVycm9yUmVzcG9uc2UpO1xyXG4gICAgfVxyXG5cclxuICAgIHJldHVybiBhcGlFcnJvck1lc3NhZ2U7XHJcbiAgfVxyXG5cclxuICAvKipcclxuICAgKiBKdXN0IGEgc2FmZSB3cmFwcGVyIGFyb3VuZCBjb25zb2xlLmVycm9yIGluIGNhc2UgdGhlIGJyb3dzZXIgZG9lc24ndCBoYXZlIG9uZSBleHBvc2VkXHJcbiAgICovXHJcbiAgcHVibGljIGxvZ0NvbnNvbGVFcnJvcihlcnJvcjogYW55KTogdm9pZCB7XHJcbiAgICBpZiAoY29uc29sZSAmJiB0eXBlb2YgKGNvbnNvbGUuZXJyb3IpID09PSAnZnVuY3Rpb24nKSB7XHJcbiAgICAgIGNvbnNvbGUuZXJyb3IoJ3Vua25vd24gZXJyb3I6JywgZXJyb3IpO1xyXG4gICAgfVxyXG4gIH1cclxufVxyXG4iXX0=
|
|
@@ -6654,6 +6654,10 @@ function isApiError(errorResponse) {
|
|
|
6654
6654
|
if (errorResponse.error && errorResponse.error.hasOwnProperty('status') && errorResponse.error.status.hasOwnProperty('message')) {
|
|
6655
6655
|
return true;
|
|
6656
6656
|
}
|
|
6657
|
+
// BillCAPture APIs return errors in a different format
|
|
6658
|
+
if (errorResponse.error && errorResponse.error.hasOwnProperty('message')) {
|
|
6659
|
+
return true;
|
|
6660
|
+
}
|
|
6657
6661
|
return false;
|
|
6658
6662
|
}
|
|
6659
6663
|
class ErrorService {
|
|
@@ -6667,6 +6671,7 @@ class ErrorService {
|
|
|
6667
6671
|
* @param error The error object from the API
|
|
6668
6672
|
*/
|
|
6669
6673
|
parseApiError(errorResponse, unknownErrorDefault) {
|
|
6674
|
+
var _a;
|
|
6670
6675
|
if (typeof errorResponse === 'string') {
|
|
6671
6676
|
return errorResponse;
|
|
6672
6677
|
}
|
|
@@ -6674,7 +6679,7 @@ class ErrorService {
|
|
|
6674
6679
|
let apiErrorMessage = unknownErrorDefault || 'DefaultUnknownError_SC';
|
|
6675
6680
|
if (errorResponse && isApiError(errorResponse)) {
|
|
6676
6681
|
try {
|
|
6677
|
-
apiErrorMessage = errorResponse.error.status.message;
|
|
6682
|
+
apiErrorMessage = ((_a = errorResponse.error.status) === null || _a === void 0 ? void 0 : _a.message) || errorResponse.error.message;
|
|
6678
6683
|
}
|
|
6679
6684
|
catch (error) {
|
|
6680
6685
|
//log the real error to the console (for developers) but just return the generic error to the user
|