Update: Continuous progress bar through retries (#883)

If file fetch returns error, don't re-setup the UI (which re instantiates the progress bar) during the retries

src/lib/Preview.js

@@ -795,7 +795,10 @@ class Preview extends EventEmitter {
         // Set the authorization token
         this.options.token = tokenMap[this.file.id];
 
-        this.setupUI();
+        // Do nothing if container is already setup and in the middle of retrying
+        if (!(this.ui.isSetup() && this.retryCount > 0)) {
+            this.setupUI();
+        }
 
         // Load from cache if the current file is valid, otherwise load file info from server
         if (checkFileValid(this.file)) {

src/lib/PreviewUI.js

@@ -128,6 +128,16 @@ class PreviewUI {
         return this.container;
     }
 
+    /**
+     * Whether the UI has been setup yet
+     *
+     * @public
+     * @return {boolean} Whether the UI has been setup
+     */
+    isSetup() {
+        return this.container && this.container.innerHTML !== '';
+    }
+
     /**
      * Shows navigation arrows if there is a need
      *

src/lib/__tests__/Preview-test.js

@@ -1090,6 +1090,7 @@ describe('lib/Preview', () => {
             stubs.checkFileValid = sandbox.stub(file, 'checkFileValid');
             stubs.loadFromCache = sandbox.stub(preview, 'loadFromCache');
             stubs.cacheFile = sandbox.stub(file, 'cacheFile');
+            stubs.ui = sandbox.stub(preview.ui, 'isSetup');
         });
 
         it('should set the token option', () => {
@@ -1127,6 +1128,26 @@ describe('lib/Preview', () => {
             expect(stubs.loadFromCache).to.not.be.called;
             expect(stubs.loadFromServer).to.be.called;
         });
+
+        it('should setup UI if ui is not setup', () => {
+            stubs.ui.returns(false);
+            preview.handleTokenResponse({});
+            expect(stubs.setupUI).to.be.called;
+        });
+
+        it('should setup UI if not retrying', () => {
+            stubs.ui.returns(true);
+            preview.retryCount = 0;
+            preview.handleTokenResponse({});
+            expect(stubs.setupUI).to.be.called;
+        });
+
+        it('should not setup UI if UI is setup and is retrying', () => {
+            stubs.ui.returns(true);
+            preview.retryCount = 1;
+            preview.handleTokenResponse({});
+            expect(stubs.setupUI).to.not.be.called;
+        });
     });
 
     describe('setupUI', () => {

src/lib/__tests__/PreviewUI-test.js

@@ -378,4 +378,21 @@ describe('lib/PreviewUI', () => {
             expect(customLogoEl.src).to.equal(url);
         });
     });
+
+    describe('isSetup()', () => {
+        it('should return false if container is falsy', () => {
+            ui.container = false;
+            expect(ui.isSetup()).to.be.false;
+        });
+
+        it('should return false if container innerHTML is empty', () => {
+            ui.container = { innerHTML: '' };
+            expect(ui.isSetup()).to.be.false;
+        });
+
+        it('should return true if container innerHTML is not empty', () => {
+            ui.container = { innerHTML: 'foo' };
+            expect(ui.isSetup()).to.be.true;
+        });
+    });
 });