feat(viewer): use unsupported file type error message for .boxdicom (#…

…1437) * feat(viewer): use unsupported file type error message for boxdicom * feat(viewer): modify tests and simplify viewer logic * feat(viewer): remove unneeded conditional * feat(viewer): update comment
box · Nov 19, 2021 · 7af11c4 · 7af11c4
1 parent 8b9a4a8
commit 7af11c4
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 15 deletions.
diff --git a/src/lib/viewers/iframe/IFrameLoader.js b/src/lib/viewers/iframe/IFrameLoader.js
@@ -9,7 +9,13 @@ const VIEWERS = [
         NAME: 'IFrame',
         CONSTRUCTOR: IFrameViewer,
         REP: ORIGINAL_REP_NAME,
-        EXT: ['boxnote', 'boxdicom'],
+        EXT: ['boxdicom'],
+    },
+    {
+        NAME: 'IFrame',
+        CONSTRUCTOR: IFrameViewer,
+        REP: ORIGINAL_REP_NAME,
+        EXT: ['boxnote'],
     },
 ];
 
@@ -28,11 +34,10 @@ class IFrameLoader extends AssetLoader {
      * @inheritdoc
      */
     determineViewer(file, disabledViewers = [], viewerOptions = {}) {
-        const isDicomFile = file.extension === 'boxdicom';
         const disableDicom = getProp(viewerOptions, 'IFrame.disableDicom');
-        // The IFrame viewer is disabled when the file is a Boxdicom file and the disableDicom viewer option is enabled
-        if (disableDicom && isDicomFile) {
-            disabledViewers.push('IFrame');
+        // Removes boxdicom as a supported extension when the disableDicom viewer option is enabled
+        if (disableDicom) {
+            this.viewers = this.viewers.filter(viewer => !viewer.EXT.includes('boxdicom'));
         }
 
         return super.determineViewer(file, disabledViewers);

diff --git a/src/lib/viewers/iframe/__tests__/IFrameLoader-test.js b/src/lib/viewers/iframe/__tests__/IFrameLoader-test.js
@@ -16,21 +16,29 @@ describe('lib/viewers/iframe/IFrameLoader', () => {
         },
     });
 
-    test('should have the correct viewer', () => {
-        const iframeViewer = IFrameLoader.viewers[0];
-        expect(iframeViewer).toEqual({
-            NAME: 'IFrame',
-            CONSTRUCTOR: IFrameViewer,
-            REP: 'ORIGINAL',
-            EXT: ['boxnote', 'boxdicom'],
-        });
+    test('should have the correct viewers', () => {
+        const iframeViewers = IFrameLoader.viewers;
+        expect(iframeViewers).toEqual([
+            {
+                NAME: 'IFrame',
+                CONSTRUCTOR: IFrameViewer,
+                REP: 'ORIGINAL',
+                EXT: ['boxdicom'],
+            },
+            {
+                NAME: 'IFrame',
+                CONSTRUCTOR: IFrameViewer,
+                REP: 'ORIGINAL',
+                EXT: ['boxnote'],
+            },
+        ]);
     });
 
     test.each`
         disableDicom | fileType      | viewerInstance
+        ${false}     | ${'boxdicom'} | ${IFrameLoader.viewers.find(v => v.EXT.includes('boxdicom'))}
         ${true}      | ${'boxdicom'} | ${undefined}
-        ${true}      | ${'boxnote'}  | ${IFrameLoader.viewers[0]}
-        ${false}     | ${'boxdicom'} | ${IFrameLoader.viewers[0]}
+        ${true}      | ${'boxnote'}  | ${IFrameLoader.viewers.find(v => v.EXT.includes('boxnote'))}
     `(
         'should return correct result depending on the disableDicom viewer option and file type',
         ({ disableDicom, fileType, viewerInstance }) => {
@@ -43,6 +51,7 @@ describe('lib/viewers/iframe/IFrameLoader', () => {
             };
             const viewer = IFrameLoader.determineViewer(iframe.options.file, [], viewerOptions);
             expect(viewer).toEqual(viewerInstance);
+            expect(IFrameLoader.getViewers().some(v => v.EXT.includes('boxdicom'))).toEqual(!disableDicom);
         },
     );
 });