Minor updates to leverage functionality

Author: jweisman

cloudapp/src/app/configuration/configuration.component.ts

@@ -65,15 +65,7 @@ export class ConfigurationGuard implements CanActivate {
 
   canActivate(): Observable<boolean> {
     return this.eventsService.getInitData().pipe(
-      /* Until primaryId is available: */
-      switchMap(data => iif(() => 
-        data.user.primaryId==null,
-        this.restService.call(`/users?q=${query(data)}`).pipe(
-          map( resp => resp.user[0].primary_id )
-        ),
-        of(data.user.primaryId)
-      )),
-      switchMap( primaryId => this.restService.call(`/users/${primaryId}`)),
+      switchMap( initData => this.restService.call(`/users/${initData.user.primaryId}`)),
       map( user => {
         if (!user.user_role.some(role=>role.role_type.value=='221')) {
           this.router.navigate(['/error'], 
@@ -84,7 +76,4 @@ export class ConfigurationGuard implements CanActivate {
       })
     );
   }
-}
-
-const query = (data: InitData) => `first_name~${q(data.user.firstName)}+AND+last_name~${q(data.user.lastName)}`;
-const q = val => encodeURIComponent(val.replace(' ', '+'));
+}

cloudapp/src/app/xml/bib-utils.ts

@@ -19,13 +19,13 @@ export class BibUtils {
   }
 
   /** Retrieve a single BIB record */
-  getBib (mmsId: string): Observable<Bib> {
-    return this._restService.call(`/bibs/${mmsId}`);
+  getBib (mmsId: string) {
+    return this._restService.call<Bib>(`/bibs/${mmsId}`);
   }   
 
   /** Update a BIB record with the specified MARCXML */
-  updateBib( bib: Bib ): Observable<Bib> {
-    return this._restService.call( {
+  updateBib( bib: Bib ) {
+    return this._restService.call<Bib>( {
       url: `/bibs/${bib.mms_id}`,
       headers: { 
         "Content-Type": "application/xml",