Merge pull request #4102 from atmire/edit-bitstream-page-refactor-9.0

Edit bitstream page refactor

Author: tdonohue

src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html

@@ -1,6 +1,6 @@
 <ng-container *ngVar="(bitstreamRD$ | async) as bitstreamRD">
   <div class="container">
-    @if (bitstreamRD?.hasSucceeded) {
+    @if (bitstreamRD?.hasSucceeded && (isLoading$ | async) === false) {
       <div class="row">
         <div class="col-md-2">
           <ds-thumbnail [thumbnail]="bitstreamRD?.payload"></ds-thumbnail>
@@ -33,9 +33,8 @@ <h1 class="h2 dont-break-out">{{dsoNameService.getName(bitstreamRD?.payload)}} <
     @if (bitstreamRD?.hasFailed) {
       <ds-error message="{{'error.bitstream' | translate}}"></ds-error>
     }
-    @if (!bitstreamRD || bitstreamRD?.isLoading) {
-      <ds-loading
-      message="{{'loading.bitstream' | translate}}"></ds-loading>
+    @if (!bitstreamRD || bitstreamRD?.isLoading || (isLoading$ | async)) {
+      <ds-loading message="{{'loading.bitstream' | translate}}"></ds-loading>
     }
   </div>
 </ng-container>

src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts

@@ -126,6 +126,7 @@ describe('EditBitstreamPageComponent', () => {
 
     bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
       findAll: createSuccessfulRemoteDataObject$(createPaginatedList(allFormats)),
+      findByHref: createSuccessfulRemoteDataObject$(selectedFormat),
     });
 
     notificationsService = jasmine.createSpyObj('notificationsService',
@@ -161,6 +162,7 @@ describe('EditBitstreamPageComponent', () => {
   });
 
   describe('EditBitstreamPageComponent no IIIF fields', () => {
+    const dsoNameServiceReturnValue = 'ORIGINAL';
 
     beforeEach(waitForAsync(() => {
       bundle = {
@@ -176,7 +178,6 @@ describe('EditBitstreamPageComponent', () => {
           },
         })),
       };
-      const bundleName = 'ORIGINAL';
 
       bitstream = Object.assign(new Bitstream(), {
         uuid: bitstreamID,
@@ -196,6 +197,7 @@ describe('EditBitstreamPageComponent', () => {
         format: createSuccessfulRemoteDataObject$(selectedFormat),
         _links: {
           self: 'bitstream-selflink',
+          format: 'format-link',
         },
         bundle: createSuccessfulRemoteDataObject$(bundle),
       });
@@ -209,9 +211,10 @@ describe('EditBitstreamPageComponent', () => {
       });
       bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
         findAll: createSuccessfulRemoteDataObject$(createPaginatedList(allFormats)),
+        findByHref: createSuccessfulRemoteDataObject$(selectedFormat),
       });
       dsoNameService = jasmine.createSpyObj('dsoNameService', {
-        getName: bundleName,
+        getName: dsoNameServiceReturnValue,
       });
 
       TestBed.configureTestingModule({
@@ -253,7 +256,7 @@ describe('EditBitstreamPageComponent', () => {
       });
 
       it('should fill in the bitstream\'s title', () => {
-        expect(rawForm.fileNamePrimaryContainer.fileName).toEqual(bitstream.name);
+        expect(rawForm.fileNamePrimaryContainer.fileName).toEqual(dsoNameServiceReturnValue);
       });
 
       it('should fill in the bitstream\'s description', () => {
@@ -432,7 +435,7 @@ describe('EditBitstreamPageComponent', () => {
     });
     describe('when navigateToItemEditBitstreams is called', () => {
       it('should redirect to the item edit page on the bitstreams tab with the itemId from the component', () => {
-        comp.itemId = 'some-uuid1';
+        comp.item.uuid = 'some-uuid1';
         comp.navigateToItemEditBitstreams();
         expect(router.navigate).toHaveBeenCalledWith([getEntityEditRoute(null, 'some-uuid1'), 'bitstreams']);
       });
@@ -481,6 +484,7 @@ describe('EditBitstreamPageComponent', () => {
         format: createSuccessfulRemoteDataObject$(allFormats[1]),
         _links: {
           self: 'bitstream-selflink',
+          format: 'format-link',
         },
         bundle: createSuccessfulRemoteDataObject$({
           _links: {
@@ -605,7 +609,7 @@ describe('EditBitstreamPageComponent', () => {
         format: createSuccessfulRemoteDataObject$(allFormats[2]),
         _links: {
           self: 'bitstream-selflink',
-        },
+          format: 'format-link' },
         bundle: createSuccessfulRemoteDataObject$({
           _links: {
             primaryBitstream: {