Merge pull request DSpace#1848 from atmire/w2p-94485_Fix-regressions

Regression fixes

Author: tdonohue

src/app/core/auth/auth-request.service.spec.ts

@@ -111,7 +111,6 @@ describe(`AuthRequestService`, () => {
             body: undefined,
             options,
           }));
-          expect((service as any).fetchRequest).toHaveBeenCalledWith(requestID);
         });
       });
     });
@@ -151,7 +150,6 @@ describe(`AuthRequestService`, () => {
             body: { content: 'something' },
             options,
           }));
-          expect((service as any).fetchRequest).toHaveBeenCalledWith(requestID);
         });
       });
     });

src/app/core/auth/auth-request.service.ts

@@ -58,7 +58,9 @@ export abstract class AuthRequestService {
   public postToEndpoint(method: string, body?: any, options?: HttpOptions): Observable<RemoteData<AuthStatus>> {
     const requestId = this.requestService.generateRequestId();
 
-    this.halService.getEndpoint(this.linkName).pipe(
+    const endpoint$ = this.halService.getEndpoint(this.linkName);
+
+    endpoint$.pipe(
       filter((href: string) => isNotEmpty(href)),
       map((endpointURL) => this.getEndpointByMethod(endpointURL, method)),
       distinctUntilChanged(),
@@ -68,7 +70,9 @@ export abstract class AuthRequestService {
       this.requestService.send(request);
     });
 
-    return this.fetchRequest(requestId);
+    return endpoint$.pipe(
+      switchMap(() => this.fetchRequest(requestId)),
+    );
   }
 
   /**
@@ -79,7 +83,9 @@ export abstract class AuthRequestService {
   public getRequest(method: string, options?: HttpOptions, ...linksToFollow: FollowLinkConfig<any>[]): Observable<RemoteData<AuthStatus>> {
     const requestId = this.requestService.generateRequestId();
 
-    this.halService.getEndpoint(this.linkName).pipe(
+    const endpoint$ = this.halService.getEndpoint(this.linkName);
+
+    endpoint$.pipe(
       filter((href: string) => isNotEmpty(href)),
       map((endpointURL) => this.getEndpointByMethod(endpointURL, method, ...linksToFollow)),
       distinctUntilChanged(),
@@ -89,7 +95,9 @@ export abstract class AuthRequestService {
       this.requestService.send(request);
     });
 
-    return this.fetchRequest(requestId, ...linksToFollow);
+    return endpoint$.pipe(
+      switchMap(() => this.fetchRequest(requestId, ...linksToFollow)),
+    );
   }
   /**
    * Factory function to create the request object to send. This needs to be a POST client side and

src/app/page-error/themed-page-error.component.ts

@@ -6,7 +6,7 @@ import { PageErrorComponent } from './page-error.component';
  * Themed wrapper for PageErrorComponent
  */
 @Component({
-  selector: 'ds-themed-search-page',
+  selector: 'ds-themed-page-error',
   styleUrls: [],
   templateUrl: '../shared/theme-support/themed.component.html',
 })

src/app/page-internal-server-error/themed-page-internal-server-error.component.ts

@@ -6,7 +6,7 @@ import { PageInternalServerErrorComponent } from './page-internal-server-error.c
  * Themed wrapper for PageInternalServerErrorComponent
  */
 @Component({
-  selector: 'ds-themed-search-page',
+  selector: 'ds-themed-page-internal-server-error',
   styleUrls: [],
   templateUrl: '../shared/theme-support/themed.component.html',
 })

src/app/pagenotfound/themed-pagenotfound.component.ts

@@ -6,7 +6,7 @@ import { PageNotFoundComponent } from './pagenotfound.component';
  * Themed wrapper for PageNotFoundComponent
  */
 @Component({
-  selector: 'ds-themed-search-page',
+  selector: 'ds-themed-pagenotfound',
   styleUrls: [],
   templateUrl: '../shared/theme-support/themed.component.html',
 })

src/app/shared/theme-support/theme.service.spec.ts

@@ -413,7 +413,7 @@ describe('ThemeService', () => {
       link.setAttribute('rel', 'stylesheet');
       link.setAttribute('type', 'text/css');
       link.setAttribute('class', 'theme-css');
-      link.setAttribute('href', '/custom-theme.css');
+      link.setAttribute('href', 'custom-theme.css');
 
       expect(headSpy.appendChild).toHaveBeenCalledWith(link);
     });

src/app/shared/theme-support/theme.service.ts

@@ -182,7 +182,7 @@ export class ThemeService {
     link.setAttribute('rel', 'stylesheet');
     link.setAttribute('type', 'text/css');
     link.setAttribute('class', 'theme-css');
-    link.setAttribute('href', `/${encodeURIComponent(themeName)}-theme.css`);
+    link.setAttribute('href', `${encodeURIComponent(themeName)}-theme.css`);
     // wait for the new css to download before removing the old one to prevent a
     // flash of unstyled content
     link.onload = () => {