[DSC-1437] Fixes wrong behavior in SSR

Author: vins01-4science

src/app/lucky-search/search/lucky-search.component.html

@@ -30,7 +30,7 @@ <h5 class="text-center">{{'lucky.search.results.notfound' | translate}} {{curren
   </div>
 </div>
 
-<div class="w-100" *ngIf="bitstreamFilters?.length">
+<div class="w-100" *ngIf="(bitstreamFilters$ | async)?.length">
     <div *ngFor="let attachment of (bitstreams$ | async)" class="mb-3 mx-auto" [style.width]="'33%'">
       <ds-truncatable [id]="attachment.id">
         <ds-file-download-link [bitstream]="attachment" [enableRequestACopy]="true" [item]="(item$ | async)" [showIcon]="true">

src/app/lucky-search/search/lucky-search.component.spec.ts

@@ -19,6 +19,7 @@ import { BitstreamDataService, MetadataFilter } from '../../core/data/bitstream-
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { RouterMock } from '../../shared/mocks/router.mock';
 import { MetadataMap, MetadataValue } from '../../core/shared/metadata.models';
+import { FileSizePipe } from '../../shared/utils/file-size-pipe';
 
 describe('SearchComponent', () => {
   let fixture: ComponentFixture<LuckySearchComponent>;
@@ -67,7 +68,7 @@ describe('SearchComponent', () => {
   const routerStub = new RouterMock();
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [LuckySearchComponent],
+      declarations: [LuckySearchComponent, FileSizePipe],
       imports: [TranslateModule.forRoot()],
       providers: [
         {provide: Router, useValue: routerStub},
@@ -187,7 +188,7 @@ describe('SearchComponent', () => {
       });
       const data = createSuccessfulRemoteDataObject(createPaginatedList([firstSearchResult]));
       const metadataFilters = [{ metadataName: 'dc.title', metadataValue: 'test.pdf' }] as MetadataFilter[];
-      component.bitstreamFilters = metadataFilters;
+      component.bitstreamFilters$.next(metadataFilters);
       bitstreamDataService.findByItem.withArgs(itemUUID, 'ORIGINAL', metadataFilters, {})
         .and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList([bitstream])));
 

src/app/lucky-search/search/lucky-search.component.ts

@@ -9,7 +9,7 @@ import { getFirstCompletedRemoteData, getFirstSucceededRemoteData } from '../../
 import { SearchFilter } from '../../shared/search/models/search-filter.model';
 import { LuckySearchService } from '../lucky-search.service';
 import { Params, Router } from '@angular/router';
-import { filter, map, switchMap, tap } from 'rxjs/operators';
+import { filter, map, switchMap, tap, withLatestFrom } from 'rxjs/operators';
 import { Context } from '../../core/shared/context.model';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
 import { Item } from '../../core/shared/item.model';
@@ -54,17 +54,18 @@ export class LuckySearchComponent implements OnInit, OnDestroy {
   private SOURCE_METADATA = 'dc.source';
   private DESCRIPTION_METADATA = 'dc.description';
 
-  bitstreamFilters: MetadataFilter[];
-  bitstreams$ = new Subject<Bitstream[]>();
+  bitstreamFilters$ = new BehaviorSubject<MetadataFilter[]>(null);
+  bitstreams$ = new BehaviorSubject<Bitstream[]>(null);
   item$ = new Subject<Item>();
 
   private readonly subscription = new Subscription();
 
-  constructor(private luckySearchService: LuckySearchService,
-              private router: Router,
-              private bitstreamDataService: BitstreamDataService,
-              public searchConfigService: SearchConfigurationService) {
-  }
+  constructor(
+    private luckySearchService: LuckySearchService,
+    private router: Router,
+    private bitstreamDataService: BitstreamDataService,
+    public searchConfigService: SearchConfigurationService
+  ) {}
 
   ngOnInit(): void {
     this.searchOptions$ = this.getSearchOptions();
@@ -81,7 +82,8 @@ export class LuckySearchComponent implements OnInit, OnDestroy {
           this.currentFilter.value = queryParams[key];
         }
       });
-      this.bitstreamFilters = this.parseBitstreamFilters(queryParams);
+      const value = this.parseBitstreamFilters(queryParams);
+      this.bitstreamFilters$.next(value);
     }
     if (!(this.currentFilter.value !== '' && this.currentFilter.identifier !== '')) {
       this.showEmptySearchSection = true;
@@ -101,11 +103,6 @@ export class LuckySearchComponent implements OnInit, OnDestroy {
         map(bitstreams => getBitstreamDownloadRoute(bitstreams[0]))
       ).subscribe(bitstreamRoute => this.redirect(bitstreamRoute))
     );
-    this.subscription.add(
-      this.bitstreams$.pipe(
-        filter(isEmpty)
-      ).subscribe(bitstreamRoute => this.showEmptySearchSection = true)
-    );
   }
 
   private getLuckySearchResults(options: PaginatedSearchOptions) {
@@ -141,17 +138,21 @@ export class LuckySearchComponent implements OnInit, OnDestroy {
     this.subscription.add(
         this.resultsRD$.pipe(
           filter(results =>
-            this.isBitstreamSearch() && results?.payload?.totalElements === 1
+            this.hasBitstreamFilters() && results?.payload?.totalElements === 1
           ),
           map(results => results.payload.page[0].indexableObject as Item),
           tap(item => this.item$.next(item)),
-          mergeMap(item => this.loadBitstreamsAndRedirectIfNeeded(item))
-        ).subscribe(results => this.bitstreams$.next(results))
+          withLatestFrom(this.bitstreamFilters$),
+          mergeMap(([item, bitstreamFilters]) => this.loadBitstreamsAndRedirectIfNeeded(item, bitstreamFilters)),
+        ).subscribe(results => {
+          this.showEmptySearchSection = isEmpty(results);
+          this.bitstreams$.next(results);
+        })
     );
     this.subscription.add(
         this.resultsRD$.pipe(
           filter(results =>
-            !this.isBitstreamSearch() && results?.payload?.totalElements === 1
+            !this.hasBitstreamFilters() && results?.payload?.totalElements === 1
           ),
           map(results => results.payload.page[0].indexableObject as Item),
           tap(item => this.item$.next(item)),
@@ -165,8 +166,8 @@ export class LuckySearchComponent implements OnInit, OnDestroy {
     );
   }
 
-  private isBitstreamSearch() {
-    return this.bitstreamFilters?.length;
+  private hasBitstreamFilters(): boolean {
+    return this.bitstreamFilters$.getValue()?.length > 0;
   }
 
   private getSearchOptions(): Observable<PaginatedSearchOptions> {
@@ -193,11 +194,11 @@ export class LuckySearchComponent implements OnInit, OnDestroy {
     return [];
   }
 
-  private loadBitstreamsAndRedirectIfNeeded(item: Item): Observable<Bitstream[]> {
-    return this.bitstreamDataService.findByItem(item.uuid, 'ORIGINAL', this.bitstreamFilters, {})
+  private loadBitstreamsAndRedirectIfNeeded(item: Item, bitstreamFilters: MetadataFilter[]): Observable<Bitstream[]> {
+    return this.bitstreamDataService.findByItem(item.uuid, 'ORIGINAL', bitstreamFilters, {})
       .pipe(
         getFirstCompletedRemoteData(),
-        map(bitstreamsResult => bitstreamsResult.payload?.page)
+        map(bitstreamsResult => bitstreamsResult.payload?.page),
       );
   }