@csmart/ngc-smart-core 1.14.21 → 1.14.23

package/fesm2020/csmart-ngc-smart-core.mjs

@@ -17,8 +17,8 @@ import { MatSnackBar } from '@angular/material/snack-bar';
 import { MatMenuModule } from '@angular/material/menu';
 import * as i1 from '@angular/common/http';
 import { HttpHeaders, HttpClientModule } from '@angular/common/http';
-import { Subject, throwError, of, from, lastValueFrom, EMPTY, concat } from 'rxjs';
-import { map, switchMap, catchError, take, mergeMap, retryWhen, delay } from 'rxjs/operators';
+import { Subject, of, from, lastValueFrom, throwError, EMPTY, concat } from 'rxjs';
+import { map, switchMap, take, catchError, mergeMap, retryWhen, delay } from 'rxjs/operators';
 import { connectToChild } from 'penpal';
 import * as i2 from '@azure/msal-angular';
 import * as i8$1 from '@angular/forms';
@@ -216,12 +216,10 @@ class XdmService {
         }`;
             return this.httpClient.post(this.smartDataServiceUrl, { query: queryString }).pipe(map(({ data }) => data.getSelectedOffender.data));
         }), map(selectedOffender => {
+            console.log(selectedOffender);
             this.setSelectedOffender(selectedOffender);
             this.setOffenderQuery({ offenders: [selectedOffender] });
             return selectedOffender;
-        }), catchError(error => {
-            console.log(error);
-            return throwError(() => error);
         }));
     }
 }
@@ -1406,7 +1404,13 @@ class SmartOffenderRedirectGuard {
     canActivate(route, state) {
         const targetRoute = route.data['routeTo'];
         const queryParams = route.parent?.queryParams;
-        if (targetRoute) {
+        const offenderId = route.queryParams['offenderId'];
+        const routeTo = route.queryParams['routeTo'];
+        if (routeTo && offenderId) {
+            this.router.navigate([routeTo], { queryParams: { 'offenderId': offenderId } });
+            return false;
+        }
+        else if (targetRoute && queryParams) {
             this.router.navigate([targetRoute], { queryParams: queryParams });
             return false;
         }