Reabsed from main and fixed broken code from rebase

samvera-labs · Jul 18, 2023 · dfbd016 · dfbd016
1 parent 42caf74
commit dfbd016
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/src/components/SupplementalFiles/SupplementalFiles.js b/src/components/SupplementalFiles/SupplementalFiles.js
@@ -33,7 +33,7 @@ const SupplementalFiles = ({ itemHeading = "Item files", sectionHeading = "Secti
 
   const handleDownload = (event, file) => {
     event.preventDefault();
-    fileDownload(file.id, file.filename);
+    fileDownload(file.id, file.filename, file.fileExt);
   };
 
   return (

diff --git a/src/components/SupplementalFiles/SupplementalFiles.test.js b/src/components/SupplementalFiles/SupplementalFiles.test.js
@@ -21,13 +21,13 @@ describe('SupplementalFiles', () => {
       expect(screen.queryByTestId('supplemental-files-empty')).not.toBeInTheDocument();
     });
     test('renders file labels', () => {
-      expect(screen.getByText('Captions in WebVTT format (.vtt)')).toBeInTheDocument();
+      expect(screen.queryAllByText('Captions in WebVTT format (.vtt)')).toHaveLength(2);
       expect(screen.getByText('Transcript file (.vtt)')).toBeInTheDocument();
     });
     test('file download is invoked by clicking on links', () => {
       let fileDownloadMock = jest.spyOn(utils, 'fileDownload')
         .mockImplementation(jest.fn());
-      let fileLink = screen.getByText('Captions in WebVTT format (.vtt)');
+      let fileLink = screen.getAllByText('Captions in WebVTT format (.vtt)')[0];
       expect(fileLink.getAttribute('href')).toEqual('https://example.com/manifest/lunchroom_manners.vtt');
 
       // Click on file link
@@ -36,7 +36,8 @@ describe('SupplementalFiles', () => {
       expect(fileDownloadMock).toHaveBeenCalledTimes(1);
       expect(fileDownloadMock).toHaveBeenCalledWith(
         'https://example.com/manifest/lunchroom_manners.vtt',
-        'Captions in WebVTT format'
+        'Captions in WebVTT format',
+        'vtt'
       );
     });
   });

diff --git a/src/services/iiif-parser.js b/src/services/iiif-parser.js
@@ -409,6 +409,7 @@ export function getRenderingFiles(manifest) {
       id: id,
       label: `${filename} (.${extension})`,
       filename: filename,
+      fileExt: extension,
     };
     return file;
   };
@@ -429,7 +430,7 @@ export function getRenderingFiles(manifest) {
     }
     // Use label of canvas or fallback to canvas id
     let canvasLabel = canvas.getLabel().getValues()[0] || "Section " + (index + 1);
-    canvasFiles.push({label: getLabelValue(canvasLabel), files: files});
+    canvasFiles.push({ label: getLabelValue(canvasLabel), files: files });
   });
 
   return { manifest: manifestFiles, canvas: canvasFiles };
@@ -448,6 +449,7 @@ export function getSupplementingFiles(manifest) {
       id: id,
       label: `${filename} (.${extension})`,
       filename: filename,
+      fileExt: extension,
     };
     return file;
   };
@@ -459,7 +461,7 @@ export function getSupplementingFiles(manifest) {
     if (annotationJSON?.length) {
       const annotationPage = annotationJSON[0];
       if (annotationPage) {
-        annotations = annotationPage.items.filter( annotation => annotation.motivation == "supplementing" && annotation.body.id );
+        annotations = annotationPage.items.filter(annotation => annotation.motivation == "supplementing" && annotation.body.id);
       }
     }
 
@@ -471,7 +473,7 @@ export function getSupplementingFiles(manifest) {
 
     // Use label of canvas or fallback to canvas id
     let canvasLabel = canvas.getLabel().getValues()[0] || "Section " + (index + 1);
-    canvasFiles.push({label: getLabelValue(canvasLabel), files: files});
+    canvasFiles.push({ label: getLabelValue(canvasLabel), files: files });
   });
 
   return canvasFiles;

diff --git a/src/services/iiif-parser.test.js b/src/services/iiif-parser.test.js
@@ -382,7 +382,7 @@ describe('iiif-parser', () => {
 
   describe('getSupplementingFiles()', () => {
     it('with `TextualBody` supplementing annotations', () => {
-      const files = iiifParser.getSupplementingFiles(manifest, 0);
+      const files = iiifParser.getSupplementingFiles(manifest);
       expect(files.length).toBe(2);
       expect(files[0].label).toBe('Section 1');
       expect(files[0].files.length).toBe(0);
@@ -391,14 +391,14 @@ describe('iiif-parser', () => {
     });
 
     it('with supplementing annotations', () => {
-      const files = iiifParser.getSupplementingFiles(lunchroomManifest, 0);
+      const files = iiifParser.getSupplementingFiles(lunchroomManifest);
       expect(files.length).toBe(2);
       expect(files[0].label).toBe('Lunchroom Manners');
       expect(files[0].files.length).toBe(1);
       expect(files[0].files[0].label).toEqual('Captions in WebVTT format (.vtt)');
       expect(files[0].files[0].filename).toEqual('Captions in WebVTT format');
       expect(files[1].label).toBe('Section 2');
-      expect(files[1].files.length).toBe(0);
+      expect(files[1].files.length).toBe(2);
     });
   });
 

diff --git a/src/services/utility-helpers.js b/src/services/utility-helpers.js
@@ -156,7 +156,7 @@ export function fileDownload(fileUrl, fileName, fileExt = '', machineGenerated =
 
   // Handle download based on the URL format
   // TODO:: research for a better way to handle this
-  if (!fileUrl.endsWith(extension)) {
+  if (fileUrl.endsWith('transcripts') || fileUrl.endsWith('captions')) {
     // For URLs of format: http://.../<filename>.<file_extension>
     fetch(fileUrl)
       .then((response) => {