fix(office): Pass viewer options to loaders (#1243)

* fix(office): Pass viewer options to loaders * fix(office): Address comments * fix(office): Address comments
box · Aug 21, 2020 · 1e63d6c · 1e63d6c
1 parent 7d20a81
commit 1e63d6c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/src/lib/Preview.js b/src/lib/Preview.js
@@ -631,7 +631,7 @@ class Preview extends EventEmitter {
         try {
             file = getCachedFile(this.cache, { fileId, fileVersionId });
             loader = file ? this.getLoader(file) : null;
-            viewer = loader ? loader.determineViewer(file) : null;
+            viewer = loader ? loader.determineViewer(file, undefined, this.options.viewers) : null;
             if (!viewer) {
                 return;
             }
@@ -1844,7 +1844,9 @@ class Preview extends EventEmitter {
      * @return {Object|null} Matching loader
      */
     getLoader(file) {
-        return this.loaders.find(loader => loader.canLoad(file, Object.keys(this.disabledViewers)));
+        return this.loaders.find(loader =>
+            loader.canLoad(file, Object.keys(this.disabledViewers), this.options.viewers),
+        );
     }
 
     /**

diff --git a/src/lib/__tests__/Preview-test.js b/src/lib/__tests__/Preview-test.js
@@ -542,8 +542,9 @@ describe('lib/Preview', () => {
             sandbox
                 .mock(loader)
                 .expects('determineViewer')
-                .withArgs(someFile)
+                .withArgs(someFile, undefined, { viewer: {} })
                 .returns(viewer);
+            preview.options.viewers = { viewer: {} };
             preview.prefetch({ fileId, token, sharedLink, sharedLinkPassword });
         });
 
@@ -2750,9 +2751,13 @@ describe('lib/Preview', () => {
                     canLoad: sandbox.stub().returns(true),
                 },
             ];
+            preview.options.viewers = { viewer: {} };
 
             const loader = preview.getLoader('file');
             expect(loader.name).to.equal('csv');
+            preview.loaders.forEach(loaderMock => {
+                expect(loaderMock.canLoad).to.be.calledWith('file', ['Office'], { viewer: {} });
+            });
         });
     });
 

diff --git a/src/lib/viewers/AssetLoader.js b/src/lib/viewers/AssetLoader.js
@@ -4,10 +4,11 @@ class AssetLoader {
      *
      * @param {Object} file - Box file
      * @param {Array} [disabledViewers] - List of disabled viewers
+     * @param {Object} viewerOptions - Custom options for viewers
      * @return {boolean} Is file supported
      */
-    canLoad(file, disabledViewers = []) {
-        return !!this.determineViewer(file, disabledViewers);
+    canLoad(file, disabledViewers = [], viewerOptions = {}) {
+        return !!this.determineViewer(file, disabledViewers, viewerOptions);
     }
 
     /**
@@ -24,9 +25,11 @@ class AssetLoader {
      *
      * @param {Object} file - Box file
      * @param {Array} [disabledViewers] - List of disabled viewers
+     * @param {Object} viewerOptions - Custom options for viewers
      * @return {Object} The viewer to use
      */
-    determineViewer(file, disabledViewers = []) {
+    // eslint-disable-next-line no-unused-vars
+    determineViewer(file, disabledViewers = [], viewerOptions = {}) {
         return this.viewers.find(viewer => {
             if (disabledViewers.indexOf(viewer.NAME) > -1) {
                 return false;

diff --git a/src/lib/viewers/__tests__/AssetLoader-test.js b/src/lib/viewers/__tests__/AssetLoader-test.js
@@ -23,15 +23,15 @@ describe('lib/viewers/AssetLoader', () => {
         it('should return true if loader can find a viewer to match the file', () => {
             sandbox.stub(loader, 'determineViewer').returns({});
 
-            expect(loader.canLoad({})).to.be.true;
-            expect(loader.determineViewer).to.be.called;
+            expect(loader.canLoad({}, [], { viewer: {} })).to.be.true;
+            expect(loader.determineViewer).to.be.calledWith({}, [], { viewer: {} });
         });
 
         it("should return false if loader can't find a viewer to match the file", () => {
             sandbox.stub(loader, 'determineViewer').returns(null);
 
-            expect(loader.canLoad({})).to.be.false;
-            expect(loader.determineViewer).to.be.called;
+            expect(loader.canLoad({}, [], { viewer: {} })).to.be.false;
+            expect(loader.determineViewer).to.be.calledWith({}, [], { viewer: {} });
         });
     });