rewrite tests and fix observable state

Author: tinsch

src/app/shared/file-download-link/file-download-link.component.spec.ts

@@ -117,9 +117,11 @@ describe('FileDownloadLinkComponent', () => {
           component.item = item;
           fixture.detectChanges();
         });
+        it('should return canDownload truthy', () => {
+          expect(component.canDownload$).toBeObservable(cold('-a', { a: true }));
+        });
         it('should return the bitstreamPath based on the input bitstream', () => {
           expect(component.bitstreamPath$).toBeObservable(cold('-a', { a: { routerLink: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString(), queryParams: {} } }));
-          expect(component.canDownload$).toBeObservable(cold('--a', { a: true }));
 
         });
         it('should init the component', () => {
@@ -151,9 +153,11 @@ describe('FileDownloadLinkComponent', () => {
           component.bitstream = bitstream;
           fixture.detectChanges();
         });
+        it('should return canDownload falsy', () => {
+          expect(component.canDownload$).toBeObservable(cold('-a', { a: false }));
+        });
         it('should return the bitstreamPath based on the input bitstream', () => {
-          expect(component.bitstreamPath$).toBeObservable(cold('-a', { a: { routerLink: new URLCombiner(getItemModuleRoute(), item.uuid, 'request-a-copy').toString(), queryParams: { bitstream: bitstream.uuid } } }));
-          expect(component.canDownload$).toBeObservable(cold('--a', { a: false }));
+          expect(component.bitstreamPath$).toBeObservable(cold('--a', { a: { routerLink: new URLCombiner(getItemModuleRoute(), item.uuid, 'request-a-copy').toString(), queryParams: { bitstream: bitstream.uuid } } }));
 
         });
         it('should init the component', () => {
@@ -180,9 +184,11 @@ describe('FileDownloadLinkComponent', () => {
           component.item = item;
           fixture.detectChanges();
         });
+        it('should return canDownload falsy', () => {
+          expect(component.canDownload$).toBeObservable(cold('-a', { a: false }));
+        });
         it('should return the bitstreamPath based on the input bitstream', () => {
-          expect(component.bitstreamPath$).toBeObservable(cold('-a', { a: { routerLink: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString(), queryParams: {} } }));
-          expect(component.canDownload$).toBeObservable(cold('--a', { a: false }));
+          expect(component.bitstreamPath$).toBeObservable(cold('--a', { a: { routerLink: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString(), queryParams: {} } }));
 
         });
         it('should init the component and show the locked icon', () => {
@@ -209,9 +215,11 @@ describe('FileDownloadLinkComponent', () => {
           component.item = item;
           fixture.detectChanges();
         });
+        it('should return canDownload falsy', () => {
+          expect(component.canDownload$).toBeObservable(cold('-a', { a: false }));
+        });
         it('should return the bitstreamPath based on the access token and request-a-copy path', () => {
-          expect(component.bitstreamPath$).toBeObservable(cold('-a', { a: { routerLink: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString(), queryParams: { accessToken: 'abc123' } } }));
-          expect(component.canDownload$).toBeObservable(cold('--a', { a: false }));
+          expect(component.bitstreamPath$).toBeObservable(cold('--a', { a: { routerLink: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString(), queryParams: { accessToken: 'abc123' } } }));
 
         });
         it('should init the component and show an open lock', () => {

src/app/shared/file-download-link/file-download-link.component.ts

@@ -115,17 +115,19 @@ export class FileDownloadLinkComponent implements OnInit {
     if (this.enableRequestACopy) {
       // Obtain item request data from the route snapshot
       this.itemRequest = this.route.snapshot.data.itemRequest;
-      // Set up observable to test access rights for a normal download
+      // Set up observable to evaluate access rights for a normal download
       this.canDownload$ = this.authorizationService.isAuthorized(FeatureID.CanDownload, isNotEmpty(this.bitstream) ? this.bitstream.self : undefined);
       // Only set up and execute other observables if canDownload emits false
       this.bitstreamPath$ = this.canDownload$.pipe(
         switchMap(canDownload => {
           if (canDownload) {
             return of(this.getBitstreamDownloadPath());
           }
-          // Set up and combine observables to test access rights to a valid token download and the request-a-copy feature
+          // Set up and combine observables to evaluate access rights to a valid token download and the request-a-copy feature
           this.canDownloadWithToken$ = of((this.itemRequest && this.itemRequest.acceptRequest && !this.itemRequest.accessExpired) ? (this.itemRequest.allfiles !== false || this.itemRequest.bitstreamId === this.bitstream.uuid) : false);
           this.canRequestACopy$ = this.authorizationService.isAuthorized(FeatureID.CanRequestACopy, isNotEmpty(this.bitstream) ? this.bitstream.self : undefined);
+          // Set up canDownload observable so the template can read the state
+          this.canDownload$ = of(false);
           return observableCombineLatest([this.canDownloadWithToken$, this.canRequestACopy$]).pipe(
             map(([canDownloadWithToken, canRequestACopy]) => this.getBitstreamPathForRequestACopy(canDownloadWithToken, canRequestACopy)),
           );