ng-ipa-library 1.4.5 → 1.4.6
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/esm2020/lib/core/interceptors/error.interceptor.mjs +24 -8
- package/esm2020/lib/models/apiResponse.mjs +1 -1
- package/fesm2015/ng-ipa-library.mjs +24 -8
- package/fesm2015/ng-ipa-library.mjs.map +1 -1
- package/fesm2020/ng-ipa-library.mjs +23 -7
- package/fesm2020/ng-ipa-library.mjs.map +1 -1
- package/lib/core/interceptors/error.interceptor.d.ts +3 -1
- package/lib/models/apiResponse.d.ts +1 -0
- package/package.json +1 -1
|
@@ -22,17 +22,13 @@ export class ErrorInterceptor {
|
|
|
22
22
|
};
|
|
23
23
|
switch (response.statusCode) {
|
|
24
24
|
case 500:
|
|
25
|
-
|
|
26
|
-
const toastr = this.toastrService.error(msg, response.message, toastrConfig);
|
|
27
|
-
toastr.onShown.subscribe(() => {
|
|
28
|
-
this.addCopyButton(response.message + '\n' + msg);
|
|
29
|
-
});
|
|
25
|
+
this.show500ErrorMsg(response, toastrConfig);
|
|
30
26
|
break;
|
|
31
27
|
default:
|
|
32
|
-
this.
|
|
28
|
+
this.showErrorMsg(response, toastrConfig);
|
|
33
29
|
break;
|
|
34
30
|
}
|
|
35
|
-
return throwError(error);
|
|
31
|
+
return throwError(() => error);
|
|
36
32
|
}));
|
|
37
33
|
}
|
|
38
34
|
isException(req) {
|
|
@@ -43,6 +39,26 @@ export class ErrorInterceptor {
|
|
|
43
39
|
}
|
|
44
40
|
return false;
|
|
45
41
|
}
|
|
42
|
+
showErrorMsg(response, toastrConfig) {
|
|
43
|
+
if (response.errors && response.errors.length > 0) {
|
|
44
|
+
toastrConfig.enableHtml = true;
|
|
45
|
+
let msg = '';
|
|
46
|
+
response.errors.forEach((error) => {
|
|
47
|
+
msg += `<li>${error}</li>`;
|
|
48
|
+
});
|
|
49
|
+
this.toastrService.error(`<ul>${msg}</ul>`, response.message, toastrConfig);
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
this.toastrService.error('', response.message, toastrConfig);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
show500ErrorMsg(response, toastrConfig) {
|
|
56
|
+
const msg = response.innerException + ' ' + (response.stackTrace ?? '');
|
|
57
|
+
const toastr = this.toastrService.error(msg, response.message, toastrConfig);
|
|
58
|
+
toastr.onShown.subscribe(() => {
|
|
59
|
+
this.addCopyButton(response.message + '\n' + msg);
|
|
60
|
+
});
|
|
61
|
+
}
|
|
46
62
|
addCopyButton(message) {
|
|
47
63
|
const messageToast = document.getElementsByClassName('toast-message')[0];
|
|
48
64
|
const icon = document.createElement('i');
|
|
@@ -64,4 +80,4 @@ ErrorInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", ver
|
|
|
64
80
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.2", ngImport: i0, type: ErrorInterceptor, decorators: [{
|
|
65
81
|
type: Injectable
|
|
66
82
|
}], ctorParameters: function () { return [{ type: i1.ErrorService }, { type: i2.ToastrService }]; } });
|
|
67
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
83
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"error.interceptor.js","sourceRoot":"","sources":["../../../../../../projects/ng-ipa-library/src/lib/core/interceptors/error.interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAO3C,OAAO,EAAc,UAAU,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;;;;AAO5C,MAAM,OAAO,gBAAgB;IAC3B,YACU,YAA0B,EAC1B,aAA4B;QAD5B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,kBAAa,GAAb,aAAa,CAAe;IACnC,CAAC;IAEJ,SAAS,CACP,GAAyB,EACzB,IAAiB;QAEjB,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE;YACzB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SACzB;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAC1B,UAAU,CAAC,CAAC,KAAK,EAAE,EAAE;YACnB,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAqB,CAAC;YAC7C,MAAM,YAAY,GAA8B;gBAC9C,cAAc,EAAE,IAAI;gBACpB,WAAW,EAAE,IAAI;gBACjB,YAAY,EAAE,KAAK;aACpB,CAAC;YACF,QAAQ,QAAQ,CAAC,UAAU,EAAE;gBAC3B,KAAK,GAAG;oBACN,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;oBAC7C,MAAM;gBAER;oBACE,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;oBAC1C,MAAM;aACT;YACD,OAAO,UAAU,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAEO,WAAW,CAAC,GAAqB;QACvC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE;YACxC,IAAI,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,CAAC,MAAM,EAAE;gBAC3D,OAAO,IAAI,CAAC;aACb;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,YAAY,CAClB,QAAqB,EACrB,YAAuC;QAEvC,IAAI,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACjD,YAAY,CAAC,UAAU,GAAG,IAAI,CAAC;YAC/B,IAAI,GAAG,GAAG,EAAE,CAAC;YACb,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBAChC,GAAG,IAAI,OAAO,KAAK,OAAO,CAAC;YAC7B,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,OAAO,GAAG,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;SAC7E;aAAM;YACL,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,EAAE,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;SAC9D;IACH,CAAC;IAEO,eAAe,CACrB,QAAsB,EACtB,YAAuC;QAEvC,MAAM,GAAG,GAAG,QAAQ,CAAC,cAAc,GAAG,GAAG,GAAG,CAAC,QAAQ,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;QACxE,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CACrC,GAAG,EACH,QAAQ,CAAC,OAAO,EAChB,YAAY,CACb,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,EAAE;YAC5B,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,GAAG,IAAI,GAAG,GAAG,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,aAAa,CAAC,OAAe;QACnC,MAAM,YAAY,GAAG,QAAQ,CAAC,sBAAsB,CAClD,eAAe,CAChB,CAAC,CAAC,CAAmB,CAAC;QACvB,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QAC7C,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;YAClC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAEO,eAAe,CAAC,OAAe;QACrC,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACvC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,4BAA4B,EAAE,EAAE,EAAE;YAC3D,aAAa,EAAE,oBAAoB;SACpC,CAAC,CAAC;IACL,CAAC;;6GA7FU,gBAAgB;iHAAhB,gBAAgB;2FAAhB,gBAAgB;kBAD5B,UAAU","sourcesContent":["import { Injectable } from '@angular/core';\r\nimport {\r\n  HttpRequest,\r\n  HttpHandler,\r\n  HttpEvent,\r\n  HttpInterceptor,\r\n} from '@angular/common/http';\r\nimport { Observable, throwError } from 'rxjs';\r\nimport { catchError } from 'rxjs/operators';\r\nimport { ErrorService } from '../services/error.service';\r\nimport { ApiException } from '../../models/apiException';\r\nimport { IndividualConfig, ToastrService } from 'ngx-toastr';\r\nimport { ApiResponse } from '../../models/apiResponse';\r\n\r\n@Injectable()\r\nexport class ErrorInterceptor implements HttpInterceptor {\r\n  constructor(\r\n    private errorService: ErrorService,\r\n    private toastrService: ToastrService\r\n  ) {}\r\n\r\n  intercept(\r\n    req: HttpRequest<unknown>,\r\n    next: HttpHandler\r\n  ): Observable<HttpEvent<unknown>> {\r\n    if (this.isException(req)) {\r\n      return next.handle(req);\r\n    }\r\n\r\n    return next.handle(req).pipe(\r\n      catchError((error) => {\r\n        const response = error.error as ApiException;\r\n        const toastrConfig: Partial<IndividualConfig> = {\r\n          disableTimeOut: true,\r\n          closeButton: true,\r\n          tapToDismiss: false,\r\n        };\r\n        switch (response.statusCode) {\r\n          case 500:\r\n            this.show500ErrorMsg(response, toastrConfig);\r\n            break;\r\n\r\n          default:\r\n            this.showErrorMsg(response, toastrConfig);\r\n            break;\r\n        }\r\n        return throwError(() => error);\r\n      })\r\n    );\r\n  }\r\n\r\n  private isException(req: HttpRequest<any>): boolean {\r\n    for (const url of this.errorService.urls) {\r\n      if (req.url.includes(url.path) && req.method === url.method) {\r\n        return true;\r\n      }\r\n    }\r\n    return false;\r\n  }\r\n\r\n  private showErrorMsg(\r\n    response: ApiResponse,\r\n    toastrConfig: Partial<IndividualConfig>\r\n  ) {\r\n    if (response.errors && response.errors.length > 0) {\r\n      toastrConfig.enableHtml = true;\r\n      let msg = '';\r\n      response.errors.forEach((error) => {\r\n        msg += `<li>${error}</li>`;\r\n      });\r\n      this.toastrService.error(`<ul>${msg}</ul>`, response.message, toastrConfig);\r\n    } else {\r\n      this.toastrService.error('', response.message, toastrConfig);\r\n    }\r\n  }\r\n\r\n  private show500ErrorMsg(\r\n    response: ApiException,\r\n    toastrConfig: Partial<IndividualConfig>\r\n  ) {\r\n    const msg = response.innerException + ' ' + (response.stackTrace ?? '');\r\n    const toastr = this.toastrService.error(\r\n      msg,\r\n      response.message,\r\n      toastrConfig\r\n    );\r\n    toastr.onShown.subscribe(() => {\r\n      this.addCopyButton(response.message + '\\n' + msg);\r\n    });\r\n  }\r\n\r\n  private addCopyButton(message: string) {\r\n    const messageToast = document.getElementsByClassName(\r\n      'toast-message'\r\n    )[0] as HTMLDivElement;\r\n    const icon = document.createElement('i');\r\n    icon.classList.add('ms-2', 'fas', 'fa-copy');\r\n    icon.addEventListener('click', () => {\r\n      this.copyToClipboard(message);\r\n    });\r\n    messageToast.appendChild(icon);\r\n  }\r\n\r\n  private copyToClipboard(message: string) {\r\n    navigator.clipboard.writeText(message);\r\n    this.toastrService.success('تم نسخ الرسالة إلى الحافظة', '', {\r\n      positionClass: 'toast-bottom-right',\r\n    });\r\n  }\r\n}\r\n"]}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBpUmVzcG9uc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9uZy1pcGEtbGlicmFyeS9zcmMvbGliL21vZGVscy9hcGlSZXNwb25zZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGludGVyZmFjZSBBcGlSZXNwb25zZSB7XHJcbiAgc3RhdHVzQ29kZTogbnVtYmVyO1xyXG4gIG1lc3NhZ2U6IHN0cmluZztcclxuICBlcnJvcnM/OiBzdHJpbmdbXTtcclxufVxyXG4iXX0=
|
|
@@ -1379,7 +1379,6 @@ class ErrorInterceptor {
|
|
|
1379
1379
|
return next.handle(req);
|
|
1380
1380
|
}
|
|
1381
1381
|
return next.handle(req).pipe(catchError((error) => {
|
|
1382
|
-
var _a;
|
|
1383
1382
|
const response = error.error;
|
|
1384
1383
|
const toastrConfig = {
|
|
1385
1384
|
disableTimeOut: true,
|
|
@@ -1388,17 +1387,13 @@ class ErrorInterceptor {
|
|
|
1388
1387
|
};
|
|
1389
1388
|
switch (response.statusCode) {
|
|
1390
1389
|
case 500:
|
|
1391
|
-
|
|
1392
|
-
const toastr = this.toastrService.error(msg, response.message, toastrConfig);
|
|
1393
|
-
toastr.onShown.subscribe(() => {
|
|
1394
|
-
this.addCopyButton(response.message + '\n' + msg);
|
|
1395
|
-
});
|
|
1390
|
+
this.show500ErrorMsg(response, toastrConfig);
|
|
1396
1391
|
break;
|
|
1397
1392
|
default:
|
|
1398
|
-
this.
|
|
1393
|
+
this.showErrorMsg(response, toastrConfig);
|
|
1399
1394
|
break;
|
|
1400
1395
|
}
|
|
1401
|
-
return throwError(error);
|
|
1396
|
+
return throwError(() => error);
|
|
1402
1397
|
}));
|
|
1403
1398
|
}
|
|
1404
1399
|
isException(req) {
|
|
@@ -1409,6 +1404,27 @@ class ErrorInterceptor {
|
|
|
1409
1404
|
}
|
|
1410
1405
|
return false;
|
|
1411
1406
|
}
|
|
1407
|
+
showErrorMsg(response, toastrConfig) {
|
|
1408
|
+
if (response.errors && response.errors.length > 0) {
|
|
1409
|
+
toastrConfig.enableHtml = true;
|
|
1410
|
+
let msg = '';
|
|
1411
|
+
response.errors.forEach((error) => {
|
|
1412
|
+
msg += `<li>${error}</li>`;
|
|
1413
|
+
});
|
|
1414
|
+
this.toastrService.error(`<ul>${msg}</ul>`, response.message, toastrConfig);
|
|
1415
|
+
}
|
|
1416
|
+
else {
|
|
1417
|
+
this.toastrService.error('', response.message, toastrConfig);
|
|
1418
|
+
}
|
|
1419
|
+
}
|
|
1420
|
+
show500ErrorMsg(response, toastrConfig) {
|
|
1421
|
+
var _a;
|
|
1422
|
+
const msg = response.innerException + ' ' + ((_a = response.stackTrace) !== null && _a !== void 0 ? _a : '');
|
|
1423
|
+
const toastr = this.toastrService.error(msg, response.message, toastrConfig);
|
|
1424
|
+
toastr.onShown.subscribe(() => {
|
|
1425
|
+
this.addCopyButton(response.message + '\n' + msg);
|
|
1426
|
+
});
|
|
1427
|
+
}
|
|
1412
1428
|
addCopyButton(message) {
|
|
1413
1429
|
const messageToast = document.getElementsByClassName('toast-message')[0];
|
|
1414
1430
|
const icon = document.createElement('i');
|