@csmart/ngc-smart-core 1.13.2 → 1.13.4

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

@@ -16,8 +16,8 @@ import * as i2$2 from '@angular/material/snack-bar';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { MatMenuModule } from '@angular/material/menu';
 import * as i1 from '@angular/common/http';
-import { HttpClientModule } from '@angular/common/http';
-import { Subject, of, from, throwError, EMPTY, concat } from 'rxjs';
+import { HttpHeaders, HttpClientModule } from '@angular/common/http';
+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';
@@ -847,9 +847,12 @@ class SmartAuthService {
         }
     }
     async setSelectedOffender(selectedOffender) {
+        if (!this.loginStaff) {
+            return;
+        }
         if (selectedOffender) {
             // if (!selectedOffender.assignmentStaffRelationId) {
-            const relation = await this.getStaffOffenderRelation(this.loginStaff.staffId, selectedOffender.offenderId).toPromise();
+            const relation = await lastValueFrom(this.getStaffOffenderRelation(this.loginStaff.staffId, selectedOffender.offenderId));
             if (relation) {
                 selectedOffender.assignmentStaffRelationId = relation;
             }
@@ -1108,6 +1111,12 @@ class SmartAuthService {
         element.setAttribute('style', 'display: none;');
     }
     getStaff(userName) {
+        const httpOptions = {
+            headers: new HttpHeaders({
+                'Content-Type': 'application/json',
+                'No-Auth': 'True',
+            }),
+        };
         const queryString = `
             {
               findvStaffs(input: {where: {userName: "${userName}", activeFlag: true}}) {
@@ -1148,7 +1157,7 @@ class SmartAuthService {
               }
             }`;
         return this.http
-            .post(this.smartDataServiceUrl, { query: queryString })
+            .post(this.smartDataServiceUrl, { query: queryString }, httpOptions)
             .pipe(take(1), map((result) => {
             if (isDevMode) {
                 console.log('##### getStaff() from service ', result);
@@ -1160,12 +1169,12 @@ class SmartAuthService {
                 return data;
             }
             else {
-                return null;
+                return of(null);
                 // return throwError('No access right.');
             }
         }), catchError((error) => {
             console.log('error ' + error);
-            return null;
+            return of(null);
         }));
     }
     getStaffOffenderRelation(staffId, offenderId) {