Completed edit page and tests.

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

@@ -30,8 +30,10 @@ const successNotification: INotification = new Notification('id', NotificationTy
 let notificationsService: NotificationsService;
 let formService: DynamicFormService;
 let bitstreamService: BitstreamDataService;
+let bitstreamServiceIIIF: BitstreamDataService;
 let bitstreamFormatService: BitstreamFormatDataService;
 let bitstream: Bitstream;
+let bitstreamIIIFItem: Bitstream;
 let selectedFormat: BitstreamFormat;
 let allFormats: BitstreamFormat[];
 let router: Router;
@@ -48,7 +50,7 @@ describe('EditBitstreamPageComponent', () => {
         description: 'Unknown format',
         supportLevel: BitstreamFormatSupportLevel.Unknown,
         _links: {
-          self: { href: 'format-selflink-1' }
+          self: {href: 'format-selflink-1'}
         }
       }),
       Object.assign({
@@ -57,7 +59,7 @@ describe('EditBitstreamPageComponent', () => {
         description: 'Portable Network Graphics',
         supportLevel: BitstreamFormatSupportLevel.Known,
         _links: {
-          self: { href: 'format-selflink-2' }
+          self: {href: 'format-selflink-2'}
         }
       }),
       Object.assign({
@@ -66,7 +68,7 @@ describe('EditBitstreamPageComponent', () => {
         description: 'Graphics Interchange Format',
         supportLevel: BitstreamFormatSupportLevel.Known,
         _links: {
-          self: { href: 'format-selflink-3' }
+          self: {href: 'format-selflink-3'}
         }
       })
     ] as BitstreamFormat[];
@@ -90,156 +92,265 @@ describe('EditBitstreamPageComponent', () => {
         return undefined;
       }
     });
-    bitstream = Object.assign(new Bitstream(), {
+
-      metadata: {
+    describe('EditBitstreamPageComponent without IIIF fields', () => {
-        'dc.description': [
+      beforeEach(waitForAsync(() => {
-          {
+        bitstream = Object.assign(new Bitstream(), {
-            value: 'Bitstream description'
+          metadata: {
-          }
+            'dc.description': [
-        ],
+              {
-        'dc.title': [
+                value: 'Bitstream description'
-          {
+              }
-            value: 'Bitstream title'
+            ],
-          }
+            'dc.title': [
-        ]
+              {
-      },
+                value: 'Bitstream title'
-      format: createSuccessfulRemoteDataObject$(selectedFormat),
+              }
-      _links: {
+            ]
-        self: 'bitstream-selflink'
+          },
-      },
+          format: createSuccessfulRemoteDataObject$(selectedFormat),
-      bundle: createSuccessfulRemoteDataObject$({
+          _links: {
-        item: createSuccessfulRemoteDataObject$(Object.assign(new Item(), {
+            self: 'bitstream-selflink'
-          uuid: 'some-uuid'
+          },
-        }))
+          bundle: createSuccessfulRemoteDataObject$({
-      })
+            item: createSuccessfulRemoteDataObject$(Object.assign(new Item(), {
-    });
+              uuid: 'some-uuid',
-    bitstreamService = jasmine.createSpyObj('bitstreamService', {
+              firstMetadataValue: () => '',
-      findById: createSuccessfulRemoteDataObject$(bitstream),
+            }))
-      update: createSuccessfulRemoteDataObject$(bitstream),
+          })
-      updateFormat: createSuccessfulRemoteDataObject$(bitstream),
+        });
-      commitUpdates: {},
+
-      patch: {}
+        bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
-    });
+          findAll: createSuccessfulRemoteDataObject$(createPaginatedList(allFormats))
-    bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
+        });
-      findAll: createSuccessfulRemoteDataObject$(createPaginatedList(allFormats))
+
+        TestBed.configureTestingModule({
+          imports: [TranslateModule.forRoot(), RouterTestingModule],
+          declarations: [EditBitstreamPageComponent, FileSizePipe, VarDirective],
+          providers: [
+            {provide: NotificationsService, useValue: notificationsService},
+            {provide: DynamicFormService, useValue: formService},
+            {provide: ActivatedRoute,
+              useValue: {
+                data: observableOf({bitstream: createSuccessfulRemoteDataObject(bitstream)}),
+                snapshot: {queryParams: {}}
+              }
+            },
+            {provide: BitstreamDataService, useValue: bitstreamService},
+            {provide: BitstreamFormatDataService, useValue: bitstreamFormatService},
+            ChangeDetectorRef
+          ],
+          schemas: [NO_ERRORS_SCHEMA]
+        }).compileComponents();
+      }));
+
+      beforeEach(() => {
+        fixture = TestBed.createComponent(EditBitstreamPageComponent);
+        comp = fixture.componentInstance;
+        fixture.detectChanges();
+        router = TestBed.inject(Router);
+        spyOn(router, 'navigate');
+      });
+
+      describe('on startup', () => {
+        let rawForm;
+
+        beforeEach(() => {
+          rawForm = comp.formGroup.getRawValue();
+        });
+
+        it('should fill in the bitstream\'s title', () => {
+          expect(rawForm.fileNamePrimaryContainer.fileName).toEqual(bitstream.name);
+        });
+
+        it('should fill in the bitstream\'s description', () => {
+          expect(rawForm.descriptionContainer.description).toEqual(bitstream.firstMetadataValue('dc.description'));
+        });
+
+        it('should select the correct format', () => {
+          expect(rawForm.formatContainer.selectedFormat).toEqual(selectedFormat.id);
+        });
+
+        it('should put the \"New Format\" input on invisible', () => {
+          expect(comp.formLayout.newFormat.grid.host).toContain('invisible');
+        });
+        it('should put the \"IIIF Label\" input to be display: none', () => {
+          expect(comp.formLayout.iiifLabel.grid.host).toContain('d-none');
+        });
+        it('should set isIIIF to false', () => {
+          expect(comp.isIIIF).toBeFalse();
+        });
+      });
+
+      describe('when an unknown format is selected', () => {
+        beforeEach(() => {
+          comp.updateNewFormatLayout(allFormats[0].id);
+        });
+
+        it('should remove the invisible class from the \"New Format\" input', () => {
+          expect(comp.formLayout.newFormat.grid.host).not.toContain('invisible');
+        });
+      });
+
+      describe('onSubmit', () => {
+        describe('when selected format hasn\'t changed', () => {
+          beforeEach(() => {
+            comp.onSubmit();
+          });
+
+          it('should call update', () => {
+            expect(bitstreamService.update).toHaveBeenCalled();
+          });
+
+          it('should commit the updates', () => {
+            expect(bitstreamService.commitUpdates).toHaveBeenCalled();
+          });
+        });
+
+        describe('when selected format has changed', () => {
+          beforeEach(() => {
+            comp.formGroup.patchValue({
+              formatContainer: {
+                selectedFormat: allFormats[2].id
+              }
+            });
+            fixture.detectChanges();
+            comp.onSubmit();
+          });
+
+          it('should call update', () => {
+            expect(bitstreamService.update).toHaveBeenCalled();
+          });
+
+          it('should call updateFormat', () => {
+            expect(bitstreamService.updateFormat).toHaveBeenCalled();
+          });
+
+          it('should commit the updates', () => {
+            expect(bitstreamService.commitUpdates).toHaveBeenCalled();
+          });
+        });
+      });
+      describe('when the cancel button is clicked', () => {
+        it('should call navigateToItemEditBitstreams method', () => {
+          spyOn(comp, 'navigateToItemEditBitstreams');
+          comp.onCancel();
+          expect(comp.navigateToItemEditBitstreams).toHaveBeenCalled();
+        });
+      });
+      describe('when navigateToItemEditBitstreams is called, and the component has an itemId', () => {
+        it('should redirect to the item edit page on the bitstreams tab with the itemId from the component', () => {
+          comp.itemId = 'some-uuid1';
+          comp.navigateToItemEditBitstreams();
+          expect(router.navigate).toHaveBeenCalledWith([getEntityEditRoute(null, 'some-uuid1'), 'bitstreams']);
+        });
+      });
+      describe('when navigateToItemEditBitstreams is called, and the component does not have an itemId', () => {
+        it('should redirect to the item edit page on the bitstreams tab with the itemId from the bundle links ', () => {
+          comp.itemId = undefined;
+          comp.navigateToItemEditBitstreams();
+          expect(router.navigate).toHaveBeenCalledWith([getEntityEditRoute(null, 'some-uuid'), 'bitstreams']);
+        });
+      });
+
     });
 
-    TestBed.configureTestingModule({
+    describe('EditBitstreamPageComponent with IIIF', () => {
-      imports: [TranslateModule.forRoot(), RouterTestingModule],
+
-      declarations: [EditBitstreamPageComponent, FileSizePipe, VarDirective],
+      beforeEach(waitForAsync(() => {
-      providers: [
+        bitstreamService = jasmine.createSpyObj('bitstreamService', {
-        { provide: NotificationsService, useValue: notificationsService },
+          findById: createSuccessfulRemoteDataObject$(bitstream),
-        { provide: DynamicFormService, useValue: formService },
+          update: createSuccessfulRemoteDataObject$(bitstream),
-        { provide: ActivatedRoute, useValue: { data: observableOf({ bitstream: createSuccessfulRemoteDataObject(bitstream) }), snapshot: { queryParams: {} } } },
+          updateFormat: createSuccessfulRemoteDataObject$(bitstream),
-        { provide: BitstreamDataService, useValue: bitstreamService },
+          commitUpdates: {},
-        { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
+          patch: {}
-        ChangeDetectorRef
+        });
-      ],
+        bitstreamIIIFItem = Object.assign(new Bitstream(), {
-      schemas: [NO_ERRORS_SCHEMA]
+          metadata: {
-    }).compileComponents();
+            'dc.description': [
+              {
+                value: 'Bitstream description'
+              }
+            ],
+            'dc.title': [
+              {
+                value: 'Bitstream title'
+              }
+            ]
+          },
+          format: createSuccessfulRemoteDataObject$(selectedFormat),
+          _links: {
+            self: 'bitstream-selflink'
+          },
+          bundle: createSuccessfulRemoteDataObject$({
+            item: createSuccessfulRemoteDataObject$(Object.assign(new Item(), {
+              uuid: 'some-uuid',
+              firstMetadataValue: () => 'true',
+              metadata: {
+                'dspace.iiif.enabled': [
+                  {
+                    language: null,
+                    value: 'true'
+                  }
+                ]
+              }
+            }))
+          })
+        });
+        bitstreamServiceIIIF = jasmine.createSpyObj('bitstreamService', {
+          findById: createSuccessfulRemoteDataObject$(bitstreamIIIFItem),
+          update: createSuccessfulRemoteDataObject$(bitstreamIIIFItem),
+          updateFormat: createSuccessfulRemoteDataObject$(bitstreamIIIFItem),
+          commitUpdates: {},
+          patch: {}
+        });
+
+        TestBed.configureTestingModule({
+          imports: [TranslateModule.forRoot(), RouterTestingModule],
+          declarations: [EditBitstreamPageComponent, FileSizePipe, VarDirective],
+          providers: [
+            {provide: NotificationsService, useValue: notificationsService},
+            {provide: DynamicFormService, useValue: formService},
+            {provide: ActivatedRoute,
+              useValue: {
+                data: observableOf({bitstream: createSuccessfulRemoteDataObject(bitstream)}),
+                snapshot: {queryParams: {}}
+              }
+            },
+            {provide: BitstreamDataService, useValue: bitstreamServiceIIIF},
+            {provide: BitstreamFormatDataService, useValue: bitstreamFormatService},
+            ChangeDetectorRef
+          ],
+          schemas: [NO_ERRORS_SCHEMA]
+        }).compileComponents();
+      }));
+      beforeEach(() => {
+        fixture = TestBed.createComponent(EditBitstreamPageComponent);
+        comp = fixture.componentInstance;
+        fixture.detectChanges();
+        router = TestBed.inject(Router);
+        spyOn(router, 'navigate');
+      });
+
+    });
+    describe('on startup', () => {
+      it('should set isIIIF to true', () => {
+        expect(comp.isIIIF).toBeTrue();
+      });
+      it('should put the \"IIIF Label\" input to be shown', () => {
+        expect(comp.formLayout.iiifLabel.grid.host).toContain('col');
+      });
+      it('should put the \"IIIF Toc\" input to be shown', () => {
+        expect(comp.formLayout.iiifToc.grid.host).toContain('col');
+      });
+      it('should put the \"IIIF width\" input to be shown', () => {
+        expect(comp.formLayout.iiifWidth.grid.host).toContain('col');
+      });
+      it('should put the \"IIIF Height\" input to be shown', () => {
+        expect(comp.formLayout.iiifHeight.grid.host).toContain('col');
+      });
+    });
 
   }));
 
-  beforeEach(() => {
-    fixture = TestBed.createComponent(EditBitstreamPageComponent);
-    comp = fixture.componentInstance;
-    fixture.detectChanges();
-    router = TestBed.inject(Router);
-    spyOn(router, 'navigate');
-  });
-
-  describe('on startup', () => {
-    let rawForm;
-
-    beforeEach(() => {
-      rawForm = comp.formGroup.getRawValue();
-    });
-
-    it('should fill in the bitstream\'s title', () => {
-      expect(rawForm.fileNamePrimaryContainer.fileName).toEqual(bitstream.name);
-    });
-
-    it('should fill in the bitstream\'s description', () => {
-      expect(rawForm.descriptionContainer.description).toEqual(bitstream.firstMetadataValue('dc.description'));
-    });
-
-    it('should select the correct format', () => {
-      expect(rawForm.formatContainer.selectedFormat).toEqual(selectedFormat.id);
-    });
-
-    it('should put the \"New Format\" input on invisible', () => {
-      expect(comp.formLayout.newFormat.grid.host).toContain('invisible');
-    });
-  });
-
-  describe('when an unknown format is selected', () => {
-    beforeEach(() => {
-      comp.updateNewFormatLayout(allFormats[0].id);
-    });
-
-    it('should remove the invisible class from the \"New Format\" input', () => {
-      expect(comp.formLayout.newFormat.grid.host).not.toContain('invisible');
-    });
-  });
-
-  describe('onSubmit', () => {
-    describe('when selected format hasn\'t changed', () => {
-      beforeEach(() => {
-        comp.onSubmit();
-      });
-
-      it('should call update', () => {
-        expect(bitstreamService.update).toHaveBeenCalled();
-      });
-
-      it('should commit the updates', () => {
-        expect(bitstreamService.commitUpdates).toHaveBeenCalled();
-      });
-    });
-
-    describe('when selected format has changed', () => {
-      beforeEach(() => {
-        comp.formGroup.patchValue({
-          formatContainer: {
-            selectedFormat: allFormats[2].id
-          }
-        });
-        fixture.detectChanges();
-        comp.onSubmit();
-      });
-
-      it('should call update', () => {
-        expect(bitstreamService.update).toHaveBeenCalled();
-      });
-
-      it('should call updateFormat', () => {
-        expect(bitstreamService.updateFormat).toHaveBeenCalled();
-      });
-
-      it('should commit the updates', () => {
-        expect(bitstreamService.commitUpdates).toHaveBeenCalled();
-      });
-    });
-  });
-  describe('when the cancel button is clicked', () => {
-    it('should call navigateToItemEditBitstreams method', () => {
-      spyOn(comp, 'navigateToItemEditBitstreams');
-      comp.onCancel();
-      expect(comp.navigateToItemEditBitstreams).toHaveBeenCalled();
-    });
-  });
-  describe('when navigateToItemEditBitstreams is called, and the component has an itemId', () => {
-    it('should redirect to the item edit page on the bitstreams tab with the itemId from the component', () => {
-      comp.itemId = 'some-uuid1';
-      comp.navigateToItemEditBitstreams();
-      expect(router.navigate).toHaveBeenCalledWith([getEntityEditRoute(null, 'some-uuid1'), 'bitstreams']);
-    });
-  });
-  describe('when navigateToItemEditBitstreams is called, and the component does not have an itemId', () => {
-    it('should redirect to the item edit page on the bitstreams tab with the itemId from the bundle links ', () => {
-      comp.itemId = undefined;
-      comp.navigateToItemEditBitstreams();
-      expect(router.navigate).toHaveBeenCalledWith([getEntityEditRoute(null, 'some-uuid'), 'bitstreams']);
-    });
-  });
 });

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

@@ -342,7 +342,10 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   entityType: string;
 
-  isIIIF: boolean;
+  /**
+   * Set to true when the parent item supports IIIF.
+   */
+  isIIIF = false;
 
   /**
    * Array to track all subscriptions and unsubscribe them onDestroy