[DSC-1875] Port of [CST-16286] Handle results with 1 item & 0 bitstreams in lucky-search (fix)

alisaismailati · alisaismailati · commit efba631beba3 · 2024-08-28T17:08:33.000+02:00
diff --git a/src/app/lucky-search/search/lucky-search.component.html b/src/app/lucky-search/search/lucky-search.component.html
@@ -23,7 +23,7 @@ <h5 class="text-center">{{'lucky.search.results.notfound' | translate}} {{curren
   <div class="col-md-12 d-flex justify-content-center">
     <div class="col-md-8">
       <ds-search-form [inPlaceSearch]="false"
-                      [query]="currentFilter.value"
+                      [query]="currentFilter.bitstreamValue ? currentFilter.value + ' OR ' + currentFilter.bitstreamValue : currentFilter.value"
                       [searchPlaceholder]="'search.search-form.placeholder' | translate">
       </ds-search-form>
     </div>
diff --git a/src/app/lucky-search/search/lucky-search.component.spec.ts b/src/app/lucky-search/search/lucky-search.component.spec.ts
@@ -23,6 +23,8 @@ import {FileSizePipe} from '../../shared/utils/file-size-pipe';
 import {HardRedirectService} from '../../core/services/hard-redirect.service';
 import {getBitstreamDownloadRoute} from '../../app-routing-paths';
 import {PLATFORM_ID} from '@angular/core';
+import {NotificationsService} from '../../shared/notifications/notifications.service';
+import {NotificationsServiceStub} from '../../shared/testing/notifications-service.stub';
 
 describe('LuckySearchComponent', () => {
   let fixture: ComponentFixture<LuckySearchComponent>;
@@ -98,6 +100,7 @@ describe('LuckySearchComponent', () => {
         {provide: BitstreamDataService, useValue: bitstreamDataService},
         {provide: HardRedirectService, useValue: hardRedirectService},
         {provide: PLATFORM_ID, useValue: 'browser'},
+        {provide: NotificationsService, useValue: new NotificationsServiceStub()},
       ],
     })
       .compileComponents();
@@ -195,7 +198,7 @@ describe('LuckySearchComponent', () => {
       bitstreamDataService.findByItem.withArgs(itemUUID, 'ORIGINAL', metadataFilters, {})
         .and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList([bitstream])));
 
-      component.currentFilter = {identifier: 'test', value: 'test'};
+      component.currentFilter = {identifier: 'test', value: 'test', bitstreamValue: 'test'};
       component.searchOptions$ = observableOf(defaultPagination);
 
       spyOn((component as any), 'getLuckySearchResults').and.returnValue(observableOf(data));
@@ -227,94 +230,81 @@ describe('LuckySearchComponent', () => {
   });
 
   describe('one item is available', () => {
-      beforeEach(() => {
-        fixture = TestBed.createComponent(LuckySearchComponent);
-        component = fixture.componentInstance;
-
-        const bitstreamSearchTree = new UrlTree();
-        bitstreamSearchTree.queryParams = {
-          index: 'testIndex',
-          value: 'testValue',
-          bitstreamMetadata: 'testMetadata',
-          bitstreamValue: 'testMetadataValue'
-        };
-
-        const itemUUID = 'd317835d-7b06-4219-91e2-1191900cb897';
-        const firstSearchResult = Object.assign(new SearchResult(), {
-          indexableObject: Object.assign(new DSpaceObject(), {
-            id: 'd317835d-7b06-4219-91e2-1191900cb897',
-            uuid: itemUUID,
-            name: 'My first publication',
-            metadata: {
-              'dspace.entity.type': [
-                {value: 'Publication'}
-              ]
-            }
-          })
-        });
-        const data = createSuccessfulRemoteDataObject(createPaginatedList([firstSearchResult]));
-        const metadataFilters = [{metadataName: 'dc.title', metadataValue: 'test.pdf'}] as MetadataFilter[];
-        component.bitstreamFilters$.next(metadataFilters);
-        bitstreamDataService.findByItem.withArgs(itemUUID, 'ORIGINAL', metadataFilters, {})
-          .and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList([bitstream])));
-
-        component.currentFilter = {identifier: 'test', value: 'test'};
-        component.searchOptions$ = observableOf(defaultPagination);
-
-        spyOn((component as any), 'getLuckySearchResults').and.returnValue(observableOf(data));
-        spyOn((component as any), 'loadBitstreamsAndRedirectIfNeeded').and.returnValue(observableOf([bitstream]));
-        spyOn((component as any), 'hasBitstreamFilters').and.returnValue(true);
-        spyOn(component, 'redirect');
-        spyOn(routerStub, 'parseUrl').and.returnValue(bitstreamSearchTree);
-
-        component.resultsRD$.next(data);
-
-        fixture.detectChanges();
-      });
+    beforeEach(() => {
+      fixture = TestBed.createComponent(LuckySearchComponent);
+      component = fixture.componentInstance;
 
-      it('should create', () => {
-        expect(component).toBeTruthy();
-      });
+      const bitstreamSearchTree = new UrlTree();
+      bitstreamSearchTree.queryParams = {
+        index: 'testIndex',
+        value: 'testValue',
+        bitstreamMetadata: 'testMetadata',
+        bitstreamValue: 'testMetadataValue'
+      };
 
-      it('should redirect to item page when only one result is found', () => {
-        expect(component.redirect).toHaveBeenCalled();
+      const itemUUID = 'd317835d-7b06-4219-91e2-1191900cb897';
+      const firstSearchResult = Object.assign(new SearchResult(), {
+        indexableObject: Object.assign(new DSpaceObject(), {
+          id: 'd317835d-7b06-4219-91e2-1191900cb897',
+          uuid: itemUUID,
+          name: 'My first publication',
+          metadata: {
+            'dspace.entity.type': [
+              {value: 'Publication'}
+            ]
+          }
+        })
       });
-    });
+      const data = createSuccessfulRemoteDataObject(createPaginatedList([firstSearchResult]));
+      const metadataFilters = [{metadataName: 'dc.title', metadataValue: 'test.pdf'}] as MetadataFilter[];
+      component.bitstreamFilters$.next(metadataFilters);
+      bitstreamDataService.findByItem.withArgs(itemUUID, 'ORIGINAL', metadataFilters, {})
+        .and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList([bitstream])));
 
-    it('should not redirect when no bitstreams are found', () => {
-      const item = Object.assign(new Item(), {uuid: 'item-uuid-1', name: 'Test item 1'});
-      const data = createSuccessfulRemoteDataObject(createPaginatedList([
-        {indexableObject: item, hitHighlights: {}}
-      ])) as any;
-      component.resultsRD$.next(data);
-      component.bitstreamFilters$.next([{metadataName: 'dc.title', metadataValue: 'Non-existent bitstream'}]);
-      bitstreamDataService.findByItem.and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList([])));
+      component.currentFilter = {identifier: 'test', value: 'test', bitstreamValue: 'test'};
+      component.searchOptions$ = observableOf(defaultPagination);
+
+      spyOn((component as any), 'getLuckySearchResults').and.returnValue(observableOf(data));
+      spyOn((component as any), 'loadBitstreamsAndRedirectIfNeeded').and.returnValue(observableOf([bitstream]));
+      spyOn((component as any), 'hasBitstreamFilters').and.returnValue(true);
       spyOn(component, 'redirect');
+      spyOn(routerStub, 'parseUrl').and.returnValue(bitstreamSearchTree);
+
+      component.resultsRD$.next(data);
+
       fixture.detectChanges();
-      expect(component.redirect).not.toHaveBeenCalled();
     });
 
-  it('should update showEmptySearchSection$ and showMultipleSearchSection$ based on search results', () => {
+    it('should create', () => {
+      expect(component).toBeTruthy();
+    });
+
+    it('should redirect to item page when only one result is found', () => {
+      expect(component.redirect).toHaveBeenCalled();
+    });
+  });
+
+  it('should not redirect when no bitstreams are found', () => {
+    const item = Object.assign(new Item(), {uuid: 'item-uuid-1', name: 'Test item 1'});
+    const data = createSuccessfulRemoteDataObject(createPaginatedList([
+      {indexableObject: item, hitHighlights: {}}
+    ])) as any;
+    component.resultsRD$.next(data);
+    component.bitstreamFilters$.next([{metadataName: 'dc.title', metadataValue: 'Non-existent bitstream'}]);
+    bitstreamDataService.findByItem.and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList([])));
+    spyOn(component, 'redirect');
+    fixture.detectChanges();
+    expect(component.redirect).not.toHaveBeenCalled();
+  });
+
+  it('should update showEmptySearchSection$ when no results are found', () => {
     const emptyResults = createSuccessfulRemoteDataObject(createPaginatedList([]));
-    const multipleResults = createSuccessfulRemoteDataObject(createPaginatedList([
-      new SearchResult<DSpaceObject>(),
-      new SearchResult<DSpaceObject>()
-    ]));
 
     spyOn(component as any, 'getLuckySearchResults').and.returnValue(observableOf(emptyResults));
     spyOn(component as any, 'processSearchResults').and.returnValue(observableOf(emptyResults));
 
     component.getSearchResults();
 
     expect(component.showEmptySearchSection$.getValue()).toBe(true);
-    expect(component.showMultipleSearchSection$.getValue()).toBe(false);
-
-    (component as any).getLuckySearchResults.and.returnValue(observableOf(multipleResults));
-    (component as any).processSearchResults.and.returnValue(observableOf(multipleResults));
-
-    component.getSearchResults();
-
-    expect(component.showEmptySearchSection$.getValue()).toBe(false);
-    expect(component.showMultipleSearchSection$.getValue()).toBe(true);
   });
 });
diff --git a/src/app/lucky-search/search/lucky-search.component.ts b/src/app/lucky-search/search/lucky-search.component.ts
@@ -18,11 +18,13 @@ import { SearchConfigurationService } from '../../core/shared/search/search-conf
 import { Item } from '../../core/shared/item.model';
 import { BitstreamDataService, MetadataFilter } from '../../core/data/bitstream-data.service';
 import { Bitstream } from '../../core/shared/bitstream.model';
-import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
+import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
 import { getBitstreamDownloadRoute } from '../../app-routing-paths';
 import {HardRedirectService} from '../../core/services/hard-redirect.service';
 import {isPlatformServer} from '@angular/common';
+import {NotificationsService} from '../../shared/notifications/notifications.service';
+import {TranslateService} from '@ngx-translate/core';
 
 @Component({
   selector: 'ds-lucky-search',
@@ -51,7 +53,8 @@ export class LuckySearchComponent implements OnInit {
    */
   currentFilter = {
     identifier: '',
-    value: ''
+    value: '',
+    bitstreamValue: '',
   };
   context: Context = Context.ItemPage;
 
@@ -71,6 +74,8 @@ export class LuckySearchComponent implements OnInit {
     public searchConfigService: SearchConfigurationService,
     @Inject(PLATFORM_ID) private platformId: Object,
     private hardRedirectService: HardRedirectService,
+    private notificationService: NotificationsService,
+    private translateService: TranslateService,
   ) {}
 
   ngOnInit(): void {
@@ -105,8 +110,6 @@ export class LuckySearchComponent implements OnInit {
       switchMap(results => this.processSearchResults(results))
     ).subscribe(results => {
       this.resultsRD$.next(results);
-      this.showEmptySearchSection$.next(results?.payload?.page?.length === 0);
-      this.showMultipleSearchSection$.next(results?.payload?.page?.length > 1);
     });
   }
 
@@ -117,12 +120,16 @@ export class LuckySearchComponent implements OnInit {
       return this.bitstreamFilters$.pipe(
         withLatestFrom(of(item)),
         mergeMap(([bitstreamFilters, itemOb]) => this.loadBitstreamsAndRedirectIfNeeded(itemOb, bitstreamFilters)),
-        tap(bitstreams => {
+        tap((bitstreams: Bitstream[]) => {
           this.bitstreams$.next(bitstreams);
-          this.showEmptySearchSection$.next(isEmpty(bitstreams));
-          if (isNotEmpty(bitstreams) && bitstreams.length === 1) {
+          this.showEmptySearchSection$.next(bitstreams.length === 0);
+          if (bitstreams?.length === 1) {
             const bitstreamRoute = getBitstreamDownloadRoute(bitstreams[0]);
             this.redirect(bitstreamRoute);
+          } else if (bitstreams?.length === 0) {
+            const route = getItemPageRoute(item);
+            this.redirect(route);
+            this.notificationService.info(null, this.translateService.get('lucky.search.bitstream.notfound'));
           }
         }),
         map(() => results)
@@ -133,6 +140,13 @@ export class LuckySearchComponent implements OnInit {
       const route = getItemPageRoute(item);
       this.redirect(route);
     }
+
+    if (results?.payload?.totalElements === 0) {
+      this.showEmptySearchSection$.next(true);
+    } else if (results?.payload?.totalElements > 1) {
+      this.showMultipleSearchSection$.next(true);
+    }
+
     return of(results);
   }
 
@@ -179,6 +193,7 @@ export class LuckySearchComponent implements OnInit {
   private parseBitstreamFilters(queryParams: Params): MetadataFilter[] {
     const metadataName = queryParams?.bitstreamMetadata;
     const metadataValue = queryParams?.bitstreamValue;
+    this.currentFilter.bitstreamValue = metadataValue ?? null;
     if (!!metadataName && !!metadataValue) {
 
       const metadataNames = Array.isArray(metadataName) ? metadataName : [metadataName];
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
@@ -7238,6 +7238,8 @@
 
   "lucky.search.multiple.records": "may refer to multiple records",
 
+  "lucky.search.bitstream.notfound": "We are unable to find the file that you have mentioned but it seems to be related to this item.",
+
   "invitation.group.msg": "You have been invited to join the following groups",
 
   "invitation.accept-btn": "Accept",
