@csmart/ngc-smart-core 1.14.25 → 1.14.26
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 +8 -4
- package/esm2020/lib/smart-storage/xdm.service.mjs +3 -2
- package/fesm2015/csmart-ngc-smart-core.mjs +9 -4
- package/fesm2015/csmart-ngc-smart-core.mjs.map +1 -1
- package/fesm2020/csmart-ngc-smart-core.mjs +9 -4
- package/fesm2020/csmart-ngc-smart-core.mjs.map +1 -1
- package/lib/smart-storage/xdm.service.d.ts +1 -1
- package/package.json +1 -1
|
@@ -198,7 +198,7 @@ class XdmService {
|
|
|
198
198
|
getOffenderQueryUpdate() {
|
|
199
199
|
return this.offenderQuerySubject.asObservable();
|
|
200
200
|
}
|
|
201
|
-
setSelectedOffenderFromRoute(offenderId) {
|
|
201
|
+
setSelectedOffenderFromRoute(offenderId, intakeFlag) {
|
|
202
202
|
return this.getStaffUpdate().pipe(switchMap(loginStaff => {
|
|
203
203
|
const queryString = `{
|
|
204
204
|
getSelectedOffender(input: {
|
|
@@ -216,6 +216,7 @@ class XdmService {
|
|
|
216
216
|
}`;
|
|
217
217
|
return this.httpClient.post(this.smartDataServiceUrl, { query: queryString }).pipe(map(({ data }) => data.getSelectedOffender.data));
|
|
218
218
|
}), map(selectedOffender => {
|
|
219
|
+
selectedOffender.intakeFlag = intakeFlag;
|
|
219
220
|
this.setSelectedOffender(selectedOffender);
|
|
220
221
|
this.setOffenderQuery({ offenders: [selectedOffender] });
|
|
221
222
|
return selectedOffender;
|
|
@@ -1553,8 +1554,12 @@ class SelectedOffenderResolverService {
|
|
|
1553
1554
|
}
|
|
1554
1555
|
resolve(route, state) {
|
|
1555
1556
|
let offenderId = null;
|
|
1556
|
-
|
|
1557
|
-
|
|
1557
|
+
let intakeFlag = false;
|
|
1558
|
+
if (route) {
|
|
1559
|
+
if (route.queryParams["offenderId"])
|
|
1560
|
+
offenderId = parseInt(route.queryParams["offenderId"]);
|
|
1561
|
+
if (route.queryParams["intakeFlag"])
|
|
1562
|
+
intakeFlag = route.queryParams["intakeFlag"] == "true";
|
|
1558
1563
|
}
|
|
1559
1564
|
return from(this.service.getSelectedOffender()).pipe(mergeMap((selectedOffender) => {
|
|
1560
1565
|
if (isDevMode) {
|
|
@@ -1562,7 +1567,7 @@ class SelectedOffenderResolverService {
|
|
|
1562
1567
|
}
|
|
1563
1568
|
if (!selectedOffender) {
|
|
1564
1569
|
if (offenderId) {
|
|
1565
|
-
return this.service.setSelectedOffenderFromRoute(offenderId);
|
|
1570
|
+
return this.service.setSelectedOffenderFromRoute(offenderId, intakeFlag);
|
|
1566
1571
|
}
|
|
1567
1572
|
else {
|
|
1568
1573
|
return throwError(() => new Error('No offender selected.'));
|