Refresh file listings on breadcrumb navigation after bitstream upload

src/app/item-page/bitstreams/upload/upload-bitstream.component.spec.ts

@@ -67,6 +67,11 @@ describe('UploadBitstreamComponent', () => {
   const mockItem = Object.assign(new Item(), {
     id: 'fake-id',
     handle: 'fake/handle',
+    _links: {
+      self: {
+        href: '/api/core/items/fake-id'
+      }
+    },
     metadata: {
       'dc.title': [
         {
@@ -83,6 +88,7 @@ describe('UploadBitstreamComponent', () => {
   const restEndpoint = 'fake-rest-endpoint';
   const mockItemDataService = jasmine.createSpyObj('mockItemDataService', {
     getBitstreamsEndpoint: observableOf(restEndpoint),
+    getBundlesEndpoint: observableOf('/api/core/items/fake-id/bundles'),
     createBundle: createSuccessfulRemoteDataObject$(createdBundle),
     getBundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [bundle])),
   });
@@ -131,6 +137,18 @@ describe('UploadBitstreamComponent', () => {
       it('should navigate the user to the next page', () => {
         expect(routerStub.navigate).toHaveBeenCalled();
       });
+
+      it('should clear cached requests for the selected bundle bitstreams endpoint', () => {
+        expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(restEndpoint);
+      });
+
+      it('should clear cached requests for the item bundles endpoint', () => {
+        expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith('/api/core/items/fake-id/bundles');
+      });
+
+      it('should clear cached requests for the item self endpoint', () => {
+        expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith('/api/core/items/fake-id');
+      });
     });
   });
 

src/app/item-page/bitstreams/upload/upload-bitstream.component.ts

@@ -212,6 +212,27 @@ export class UploadBitstreamComponent implements OnInit, OnDestroy {
       this.requestService.removeByHrefSubstring(href);
     });
 
+    // Clear cached requests for this item's bundles to ensure bundle resolution uses fresh data
+    this.itemService.getBundlesEndpoint(this.itemId).pipe(take(1)).subscribe((href: string) => {
+      this.requestService.removeByHrefSubstring(href);
+    });
+
+    // Clear cached requests for this item to ensure breadcrumb navigation resolves a fresh item
+    this.itemRD$.pipe(
+      getFirstSucceededRemoteDataPayload(),
+      take(1),
+    ).subscribe((item: Item) => {
+      this.requestService.removeByHrefSubstring(item._links.self.href);
+
+      // Clear metadatabitstreams search cache used by preview and CLARIN files sections
+      this.requestService.removeByHrefSubstring('/api/core/metadatabitstreams/search/byHandle');
+      if (item?.handle) {
+        this.requestService.removeByHrefSubstring(`handle=${encodeURIComponent(item.handle)}`);
+        this.requestService.removeByHrefSubstring(`handle=${item.handle}`);
+      }
+      this.requestService.removeByHrefSubstring('fileGrpType=ORIGINAL');
+    });
+
     // Bring over the item ID as a query parameter
     const queryParams = { itemId: this.itemId, entityType: this.entityType };
     this.router.navigate([getBitstreamModuleRoute(), bitstream.id, 'edit'], { queryParams: queryParams });

src/app/item-page/clarin-files-section/clarin-files-section.component.ts

@@ -1,4 +1,4 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core';
 import { Item } from '../../core/shared/item.model';
 import { getAllSucceededRemoteListPayload, getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
 import { getItemPageRoute } from '../item-page-routing-paths';
@@ -7,14 +7,14 @@ import { RegistryService } from '../../core/registry/registry.service';
 import { Router } from '@angular/router';
 import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
 import { ConfigurationDataService } from '../../core/data/configuration-data.service';
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, Subscription } from 'rxjs';
 
 @Component({
   selector: 'ds-clarin-files-section',
   templateUrl: './clarin-files-section.component.html',
   styleUrls: ['./clarin-files-section.component.scss']
 })
-export class ClarinFilesSectionComponent implements OnInit {
+export class ClarinFilesSectionComponent implements OnInit, OnChanges, OnDestroy {
 
   /**
    * The item to display files for
@@ -71,6 +71,9 @@ export class ClarinFilesSectionComponent implements OnInit {
    */
   downloadZipMinFileCount: BehaviorSubject<number> = new BehaviorSubject<number>(-1);
 
+  private currentItemHandle: string;
+  private filesSubscription?: Subscription;
+
 
   constructor(protected registryService: RegistryService,
               protected router: Router,
@@ -79,15 +82,18 @@ export class ClarinFilesSectionComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.registryService
-      .getMetadataBitstream(this.itemHandle, 'ORIGINAL')
-      .pipe(getAllSucceededRemoteListPayload())
-      .subscribe((data: MetadataBitstream[]) => {
-        this.listOfFiles.next(data);
-        this.generateCurlCommand();
-      });
-    this.totalFileSizes.next(Number(this.item.firstMetadataValue('local.files.size')));
     this.loadDownloadZipConfigProperties();
+    this.refreshFromInputs(true);
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes.item || changes.itemHandle) {
+      this.refreshFromInputs(true);
+    }
+  }
+
+  ngOnDestroy(): void {
+    this.filesSubscription?.unsubscribe();
   }
 
   setCommandline() {
@@ -138,4 +144,29 @@ export class ClarinFilesSectionComponent implements OnInit {
         this.downloadZipMinFileSize.next(Number(config.values[0]));
       });
   }
+
+  private refreshFromInputs(force = false): void {
+    if (this.item) {
+      this.totalFileSizes.next(Number(this.item.firstMetadataValue('local.files.size')));
+    }
+
+    const handle = this.itemHandle || this.item?.handle;
+    if (!handle) {
+      return;
+    }
+
+    if (!force && handle === this.currentItemHandle) {
+      return;
+    }
+
+    this.currentItemHandle = handle;
+    this.filesSubscription?.unsubscribe();
+    this.filesSubscription = this.registryService
+      .getMetadataBitstream(handle, 'ORIGINAL')
+      .pipe(getAllSucceededRemoteListPayload())
+      .subscribe((data: MetadataBitstream[]) => {
+        this.listOfFiles.next(data);
+        this.generateCurlCommand();
+      });
+  }
 }

src/app/item-page/item.resolver.ts

@@ -52,7 +52,7 @@ export class ItemResolver implements Resolve<RemoteData<Item>> {
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<Item>> {
     const itemRD$ = this.itemService.findById(route.params.id,
       true,
-      false,
+      true,
       ...getItemPageLinksToFollow(),
     ).pipe(
       getFirstCompletedRemoteData(),

src/app/item-page/simple/field-components/preview-section/preview-section.component.ts

@@ -1,5 +1,5 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { BehaviorSubject } from 'rxjs';
+import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core';
+import { BehaviorSubject, Subscription } from 'rxjs';
 import { MetadataBitstream } from 'src/app/core/metadata/metadata-bitstream.model';
 import { RegistryService } from 'src/app/core/registry/registry.service';
 import { Item } from 'src/app/core/shared/item.model';
@@ -11,26 +11,54 @@ import { ConfigurationDataService } from '../../../../core/data/configuration-da
   templateUrl: './preview-section.component.html',
   styleUrls: ['./preview-section.component.scss'],
 })
-export class PreviewSectionComponent implements OnInit {
+export class PreviewSectionComponent implements OnInit, OnChanges, OnDestroy {
   @Input() item: Item;
 
   listOfFiles: BehaviorSubject<MetadataBitstream[]> = new BehaviorSubject<MetadataBitstream[]>([] as any);
   emailToContact: string;
   hasNoFiles: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
 
+  private currentItemHandle: string;
+  private filesSubscription?: Subscription;
+
   constructor(protected registryService: RegistryService,
-              private configService: ConfigurationDataService) {} // Modified
+              private configService: ConfigurationDataService) {}
 
   ngOnInit(): void {
-    this.registryService
-      .getMetadataBitstream(this.item.handle, 'ORIGINAL')
+    this.configService.findByPropertyName('lr.help.mail')?.subscribe(remoteData => {
+      this.emailToContact = remoteData.payload?.values?.[0];
+    });
+    this.refreshFiles(true);
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes.item) {
+      this.refreshFiles(true);
+    }
+  }
+
+  ngOnDestroy(): void {
+    this.filesSubscription?.unsubscribe();
+  }
+
+  private refreshFiles(force = false): void {
+    const handle = this.item?.handle;
+    if (!handle) {
+      return;
+    }
+
+    if (!force && handle === this.currentItemHandle) {
+      return;
+    }
+
+    this.currentItemHandle = handle;
+    this.filesSubscription?.unsubscribe();
+    this.filesSubscription = this.registryService
+      .getMetadataBitstream(handle, 'ORIGINAL')
       .pipe(getAllSucceededRemoteListPayload())
       .subscribe((data: MetadataBitstream[]) => {
         this.listOfFiles.next(data);
         this.hasNoFiles.next(!Array.isArray(data) || data.length === 0);
       });
-    this.configService.findByPropertyName('lr.help.mail')?.subscribe(remoteData => {
-      this.emailToContact = remoteData.payload?.values?.[0];
-    });
   }
 }