@csmart/ngc-smart-core 1.14.29 → 1.14.30
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/smart-auth/smart-selected-offender-resolver.service.mjs +7 -9
- package/fesm2015/csmart-ngc-smart-core.mjs +6 -8
- package/fesm2015/csmart-ngc-smart-core.mjs.map +1 -1
- package/fesm2020/csmart-ngc-smart-core.mjs +6 -8
- package/fesm2020/csmart-ngc-smart-core.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -25,15 +25,13 @@ export class SelectedOffenderResolverService {
|
|
|
25
25
|
if (isDevMode) {
|
|
26
26
|
console.log(selectedOffender);
|
|
27
27
|
}
|
|
28
|
-
if (!selectedOffender) {
|
|
29
|
-
|
|
30
|
-
return this.service.setSelectedOffenderFromRoute(offenderId, intakeFlag);
|
|
31
|
-
}
|
|
32
|
-
else {
|
|
33
|
-
return throwError(() => new Error('No offender selected.'));
|
|
34
|
-
}
|
|
28
|
+
if (offenderId && offenderId > 0 && (!selectedOffender || (selectedOffender && selectedOffender.offenderId !== offenderId))) {
|
|
29
|
+
return this.service.setSelectedOffenderFromRoute(offenderId, intakeFlag);
|
|
35
30
|
}
|
|
36
|
-
|
|
31
|
+
if (selectedOffender) {
|
|
32
|
+
return of(selectedOffender);
|
|
33
|
+
}
|
|
34
|
+
return throwError(() => new Error('No offender selected.'));
|
|
37
35
|
}), retryWhen((errors) => errors.pipe(
|
|
38
36
|
// tap(() => console.log('Retry getting selected offender.')),
|
|
39
37
|
delay(1000), take(5), (o) => concat(o, throwError(() => new Error('No offender selected (failed after retries).'))))), catchError((error) => {
|
|
@@ -59,4 +57,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.3.0", ngImpor
|
|
|
59
57
|
providedIn: 'root',
|
|
60
58
|
}]
|
|
61
59
|
}], ctorParameters: function () { return [{ type: i1.XdmService }, { type: i0.NgZone }, { type: i2.Router }]; } });
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
60
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnQtc2VsZWN0ZWQtb2ZmZW5kZXItcmVzb2x2ZXIuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2NzbWFydC9uZ2Mtc21hcnQtY29yZS9zcmMvbGliL3NtYXJ0LWF1dGgvc21hcnQtc2VsZWN0ZWQtb2ZmZW5kZXItcmVzb2x2ZXIuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDOUQsT0FBTyxFQUlMLE1BQU0sR0FDUCxNQUFNLGlCQUFpQixDQUFDO0FBQ3pCLE9BQU8sRUFBYyxJQUFJLEVBQUUsRUFBRSxFQUFFLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ3ZFLE9BQU8sRUFDTCxVQUFVLEVBQ1YsUUFBUSxFQUNSLElBQUksRUFDSixTQUFTLEVBQ1QsS0FBSyxHQUNOLE1BQU0sZ0JBQWdCLENBQUM7QUFFeEIsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDhCQUE4QixDQUFDOzs7O0FBSzFELE1BQU0sT0FBTywrQkFBK0I7SUFFMUMsWUFDVSxPQUFtQixFQUNuQixJQUFZLEVBQ1osTUFBYztRQUZkLFlBQU8sR0FBUCxPQUFPLENBQVk7UUFDbkIsU0FBSSxHQUFKLElBQUksQ0FBUTtRQUNaLFdBQU0sR0FBTixNQUFNLENBQVE7SUFDckIsQ0FBQztJQUNKLE9BQU8sQ0FDTCxLQUE2QixFQUM3QixLQUEwQjtRQUUxQixJQUFJLFVBQVUsR0FBa0IsSUFBSSxDQUFDO1FBQ3JDLElBQUksVUFBVSxHQUFZLEtBQUssQ0FBQztRQUNoQyxJQUFHLEtBQUssRUFBRTtZQUNSLElBQUcsS0FBSyxDQUFDLFdBQVcsQ0FBQyxZQUFZLENBQUM7Z0JBQ2hDLFVBQVUsR0FBRyxRQUFRLENBQUMsS0FBSyxDQUFDLFdBQVcsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDO1lBQ3pELElBQUcsS0FBSyxDQUFDLFdBQVcsQ0FBQyxZQUFZLENBQUM7Z0JBQ2hDLFVBQVUsR0FBRyxLQUFLLENBQUMsV0FBVyxDQUFDLFlBQVksQ0FBQyxJQUFJLE1BQU0sQ0FBQztTQUMxRDtRQUNELE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsbUJBQW1CLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FDbEQsUUFBUSxDQUFDLENBQUMsZ0JBQWdCLEVBQUUsRUFBRTtZQUM1QixJQUFJLFNBQVMsRUFBRTtnQkFDYixPQUFPLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLENBQUM7YUFDL0I7WUFDRCxJQUFHLFVBQVUsSUFBSSxVQUFVLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxnQkFBZ0IsSUFBSSxDQUFDLGdCQUFnQixJQUFJLGdCQUFnQixDQUFDLFVBQVUsS0FBSyxVQUFVLENBQUMsQ0FBQyxFQUFFO2dCQUMxSCxPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsNEJBQTRCLENBQUMsVUFBVSxFQUFFLFVBQVUsQ0FBQyxDQUFDO2FBQzFFO1lBQ0QsSUFBRyxnQkFBZ0IsRUFBRTtnQkFDbkIsT0FBTyxFQUFFLENBQUMsZ0JBQWdCLENBQUMsQ0FBQzthQUM3QjtZQUNELE9BQU8sVUFBVSxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksS0FBSyxDQUFDLHVCQUF1QixDQUFDLENBQUMsQ0FBQztRQUM5RCxDQUFDLENBQUMsRUFDRixTQUFTLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUNuQixNQUFNLENBQUMsSUFBSTtRQUNULDhEQUE4RDtRQUM5RCxLQUFLLENBQUMsSUFBSSxDQUFDLEVBQ1gsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUNQLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FDSixNQUFNLENBQ0osQ0FBQyxFQUNELFVBQVUsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLEtBQUssQ0FBQyw4Q0FBOEMsQ0FBQyxDQUFDLENBQzVFLENBQ0osQ0FDRixFQUNELFVBQVUsQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFO1lBQ25COzs7Ozs7Y0FNRTtZQUNGLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsY0FBYyxDQUFDLEVBQUU7Z0JBQ3JDLFdBQVcsRUFBRSxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRTthQUNsRCxDQUFDLENBQUM7WUFDSCxPQUFPLEtBQUssQ0FBQztRQUNmLENBQUMsQ0FBQyxDQUNILENBQUM7SUFDSixDQUFDOzsrSUExRFUsK0JBQStCO21KQUEvQiwrQkFBK0IsY0FGOUIsTUFBTTsyRkFFUCwrQkFBK0I7a0JBSDNDLFVBQVU7bUJBQUM7b0JBQ1YsVUFBVSxFQUFFLE1BQU07aUJBQ25CIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSwgTmdab25lLCBpc0Rldk1vZGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IHtcclxuICBSZXNvbHZlLFxyXG4gIEFjdGl2YXRlZFJvdXRlU25hcHNob3QsXHJcbiAgUm91dGVyU3RhdGVTbmFwc2hvdCxcclxuICBSb3V0ZXIsXHJcbn0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcclxuaW1wb3J0IHsgT2JzZXJ2YWJsZSwgZnJvbSwgb2YsIEVNUFRZLCB0aHJvd0Vycm9yLCBjb25jYXQgfSBmcm9tICdyeGpzJztcclxuaW1wb3J0IHtcclxuICBjYXRjaEVycm9yLFxyXG4gIG1lcmdlTWFwLFxyXG4gIHRha2UsXHJcbiAgcmV0cnlXaGVuLFxyXG4gIGRlbGF5LFxyXG59IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcclxuaW1wb3J0IHsgU2VsZWN0ZWRPZmZlbmRlciB9IGZyb20gJy4uL3NtYXJ0LXN0b3JhZ2Uvc21hcnQtc3RvcmFnZS1tb2RlbCc7XHJcbmltcG9ydCB7IFhkbVNlcnZpY2UgfSBmcm9tICcuLi9zbWFydC1zdG9yYWdlL3hkbS5zZXJ2aWNlJztcclxuXHJcbkBJbmplY3RhYmxlKHtcclxuICBwcm92aWRlZEluOiAncm9vdCcsXHJcbn0pXHJcbmV4cG9ydCBjbGFzcyBTZWxlY3RlZE9mZmVuZGVyUmVzb2x2ZXJTZXJ2aWNlXHJcbiAgaW1wbGVtZW50cyBSZXNvbHZlPFNlbGVjdGVkT2ZmZW5kZXI+IHtcclxuICBjb25zdHJ1Y3RvcihcclxuICAgIHByaXZhdGUgc2VydmljZTogWGRtU2VydmljZSxcclxuICAgIHByaXZhdGUgem9uZTogTmdab25lLFxyXG4gICAgcHJpdmF0ZSByb3V0ZXI6IFJvdXRlcixcclxuICApIHt9XHJcbiAgcmVzb2x2ZShcclxuICAgIHJvdXRlOiBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LFxyXG4gICAgc3RhdGU6IFJvdXRlclN0YXRlU25hcHNob3QsXHJcbiAgKTogT2JzZXJ2YWJsZTxTZWxlY3RlZE9mZmVuZGVyPiB8IE9ic2VydmFibGU8bmV2ZXI+IHtcclxuICAgIGxldCBvZmZlbmRlcklkOiBudW1iZXIgfCBudWxsID0gbnVsbDtcclxuICAgIGxldCBpbnRha2VGbGFnOiBib29sZWFuID0gZmFsc2U7XHJcbiAgICBpZihyb3V0ZSkge1xyXG4gICAgICBpZihyb3V0ZS5xdWVyeVBhcmFtc1tcIm9mZmVuZGVySWRcIl0pXHJcbiAgICAgICAgb2ZmZW5kZXJJZCA9IHBhcnNlSW50KHJvdXRlLnF1ZXJ5UGFyYW1zW1wib2ZmZW5kZXJJZFwiXSk7XHJcbiAgICAgIGlmKHJvdXRlLnF1ZXJ5UGFyYW1zW1wiaW50YWtlRmxhZ1wiXSlcclxuICAgICAgICBpbnRha2VGbGFnID0gcm91dGUucXVlcnlQYXJhbXNbXCJpbnRha2VGbGFnXCJdID09IFwidHJ1ZVwiO1xyXG4gICAgfVxyXG4gICAgcmV0dXJuIGZyb20odGhpcy5zZXJ2aWNlLmdldFNlbGVjdGVkT2ZmZW5kZXIoKSkucGlwZShcclxuICAgICAgbWVyZ2VNYXAoKHNlbGVjdGVkT2ZmZW5kZXIpID0+IHtcclxuICAgICAgICBpZiAoaXNEZXZNb2RlKSB7XHJcbiAgICAgICAgICBjb25zb2xlLmxvZyhzZWxlY3RlZE9mZmVuZGVyKTtcclxuICAgICAgICB9XHJcbiAgICAgICAgaWYob2ZmZW5kZXJJZCAmJiBvZmZlbmRlcklkID4gMCAmJiAoIXNlbGVjdGVkT2ZmZW5kZXIgfHwgKHNlbGVjdGVkT2ZmZW5kZXIgJiYgc2VsZWN0ZWRPZmZlbmRlci5vZmZlbmRlcklkICE9PSBvZmZlbmRlcklkKSkpIHtcclxuICAgICAgICAgIHJldHVybiB0aGlzLnNlcnZpY2Uuc2V0U2VsZWN0ZWRPZmZlbmRlckZyb21Sb3V0ZShvZmZlbmRlcklkLCBpbnRha2VGbGFnKTtcclxuICAgICAgICB9XHJcbiAgICAgICAgaWYoc2VsZWN0ZWRPZmZlbmRlcikge1xyXG4gICAgICAgICAgcmV0dXJuIG9mKHNlbGVjdGVkT2ZmZW5kZXIpO1xyXG4gICAgICAgIH1cclxuICAgICAgICByZXR1cm4gdGhyb3dFcnJvcigoKSA9PiBuZXcgRXJyb3IoJ05vIG9mZmVuZGVyIHNlbGVjdGVkLicpKTtcclxuICAgICAgfSksXHJcbiAgICAgIHJldHJ5V2hlbigoZXJyb3JzKSA9PlxyXG4gICAgICAgIGVycm9ycy5waXBlKFxyXG4gICAgICAgICAgLy8gdGFwKCgpID0+IGNvbnNvbGUubG9nKCdSZXRyeSBnZXR0aW5nIHNlbGVjdGVkIG9mZmVuZGVyLicpKSxcclxuICAgICAgICAgIGRlbGF5KDEwMDApLFxyXG4gICAgICAgICAgdGFrZSg1KSxcclxuICAgICAgICAgIChvKSA9PlxyXG4gICAgICAgICAgICBjb25jYXQoXHJcbiAgICAgICAgICAgICAgbyxcclxuICAgICAgICAgICAgICB0aHJvd0Vycm9yKCgpID0+IG5ldyBFcnJvcignTm8gb2ZmZW5kZXIgc2VsZWN0ZWQgKGZhaWxlZCBhZnRlciByZXRyaWVzKS4nKSksXHJcbiAgICAgICAgICAgICksXHJcbiAgICAgICAgKSxcclxuICAgICAgKSxcclxuICAgICAgY2F0Y2hFcnJvcigoZXJyb3IpID0+IHtcclxuICAgICAgICAvKlxyXG4gICAgICAgIHRoaXMuem9uZS5ydW4oKCkgPT4ge1xyXG4gICAgICAgICAgdGhpcy5yb3V0ZXIubmF2aWdhdGUoWycvc21hcnQtZXJyb3InXSwge1xyXG4gICAgICAgICAgICBxdWVyeVBhcmFtczogeyB0eXBlOiAnb2ZmZW5kZXInLCBtZXNzYWdlOiBlcnJvciB9XHJcbiAgICAgICAgICB9KTtcclxuICAgICAgICB9KTtcclxuICAgICAgICAqL1xyXG4gICAgICAgIHRoaXMucm91dGVyLm5hdmlnYXRlKFsnL3NtYXJ0LWVycm9yJ10sIHtcclxuICAgICAgICAgIHF1ZXJ5UGFyYW1zOiB7IHR5cGU6ICdvZmZlbmRlcicsIG1lc3NhZ2U6IGVycm9yIH0sXHJcbiAgICAgICAgfSk7XHJcbiAgICAgICAgcmV0dXJuIEVNUFRZO1xyXG4gICAgICB9KSxcclxuICAgICk7XHJcbiAgfVxyXG59XHJcbiJdfQ==
|
|
@@ -1582,15 +1582,13 @@ class SelectedOffenderResolverService {
|
|
|
1582
1582
|
if (isDevMode) {
|
|
1583
1583
|
console.log(selectedOffender);
|
|
1584
1584
|
}
|
|
1585
|
-
if (!selectedOffender) {
|
|
1586
|
-
|
|
1587
|
-
|
|
1588
|
-
|
|
1589
|
-
|
|
1590
|
-
return throwError(() => new Error('No offender selected.'));
|
|
1591
|
-
}
|
|
1585
|
+
if (offenderId && offenderId > 0 && (!selectedOffender || (selectedOffender && selectedOffender.offenderId !== offenderId))) {
|
|
1586
|
+
return this.service.setSelectedOffenderFromRoute(offenderId, intakeFlag);
|
|
1587
|
+
}
|
|
1588
|
+
if (selectedOffender) {
|
|
1589
|
+
return of(selectedOffender);
|
|
1592
1590
|
}
|
|
1593
|
-
return
|
|
1591
|
+
return throwError(() => new Error('No offender selected.'));
|
|
1594
1592
|
}), retryWhen((errors) => errors.pipe(
|
|
1595
1593
|
// tap(() => console.log('Retry getting selected offender.')),
|
|
1596
1594
|
delay(1000), take(5), (o) => concat(o, throwError(() => new Error('No offender selected (failed after retries).'))))), catchError((error) => {
|