Fix #916 Show installation progress based on number of selected components

Author: dgolovin

browser/directives/progressBar.html

@@ -7,7 +7,7 @@
   </div>
   <div class="progress progress-label-top-right">
     <div class="progress-bar"
-      ng-class="{'progress-determinate active': progress.status == 'Installing' || progress.status == 'Setting up' || progress.status.indexOf('Waiting') > -1 || progress.status.indexOf('Verifying') > -1, 'progress-bar-danger': progress.status.indexOf('Failed') > -1}"
+      ng-class="{'progress-bar-danger': progress.status.indexOf('Failed') > -1}"
       role="progressbar" aria-valuenow="{{progress.current}}" aria-valuemin="{{progress.min}}" aria-valuemax="{{progress.max}}"
       style="width: {{progress.current}}%; animation: progress-bar-stripes 2s infinite steps(15);">
       <span>{{progress.label}}</span>

browser/model/helpers/installer.js

@@ -143,7 +143,6 @@ class Installer {
 
   succeed(done) {
     if (done) {
-      this.progress.setComplete();
       this.success();
     }
   }

browser/pages/install/controller.js

@@ -12,6 +12,7 @@ class InstallController {
     this.$timeout = $timeout;
     this.installerDataSvc = installerDataSvc;
     this.electron = electron;
+    this.electron.ipcRenderer.setMaxListeners(0);
     this.failedDownloads = new Set();
     this.totalAmount = 0;
     this.installerDataSvc.setupTargetFolder();
@@ -49,6 +50,16 @@ class InstallController {
       }
     }
     this.$scope.data = this.data;
+
+    this.electron.ipcRenderer.on('installComplete', (event, key)=>{
+      if(key == 'all') {
+        this.itemProgress.current = 100;
+        this.$timeout();
+        this.$timeout(()=>{
+          this.installerDataSvc.router.go('start');
+        },700);
+      }
+    });
   }
 
   processInstallable(key, value) {
@@ -84,6 +95,17 @@ class InstallController {
   }
 
   processInstall() {
+
+    let totalItems = 0;
+    for (let [key, value] of this.installerDataSvc.allInstallables().entries()) {
+      if(!value.isSkipped()) {
+        totalItems++;
+      }
+    }
+    this.itemProgress.setStatus('Installing');
+    this.itemProgress.setTotalAmount(totalItems);
+    this.itemProgress.setCurrent(1);
+
     for (let [key, value] of this.installerDataSvc.allInstallables().entries()) {
       if(!value.isSkipped()) {
         this.triggerInstall(key, value, this.itemProgress);
@@ -95,6 +117,7 @@ class InstallController {
     this.installerDataSvc.startInstall(installableKey);
     installableValue.install(progress,
       () => {
+        this.itemProgress.setCurrent(this.itemProgress.currentAmount+1);
         this.installerDataSvc.installDone(progress, installableKey);
       },
       (error) => {
@@ -158,7 +181,7 @@ class ProgressState {
   }
 
   setCurrent(newVal) {
-    if (newVal > this.currentAmount && newVal <= this.totalAmount) {
+    if (newVal <= this.totalAmount) {
       this.lastAmount = this.currentAmount;
       this.currentAmount = newVal;
 
@@ -167,8 +190,13 @@ class ProgressState {
         this.durationFormat.units.push('s');
       }
 
-      this.current = Math.round(this.currentAmount / this.totalAmount * 100);
-      this.label = this.sizeInKB(this.currentAmount) + ' / ' + this.sizeInKB(this.totalAmount) + ' (' + this.current + '%), ' + this.durationFormat(remaining) + ' left';
+      if (this.status === 'Downloading') {
+        this.current = Math.round(this.currentAmount / this.totalAmount * 100);
+        this.label = this.sizeInKB(this.currentAmount) + ' / ' + this.sizeInKB(this.totalAmount) + ' (' + this.current + '%), ' + this.durationFormat(remaining) + ' left';
+      } else if(this.status === 'Installing'){
+        this.current = Math.round((this.currentAmount-1) / this.totalAmount * 100);
+        this.label = this.currentAmount + ' out of ' + this.totalAmount ;
+      }
       this.$timeout();
     }
   }
@@ -183,18 +211,6 @@ class ProgressState {
   }
 
   setStatus(newStatus) {
-    if (newStatus === this.status) {
-      return;
-    }
-    if (newStatus !== 'Downloading') {
-      this.current = 100;
-      this.label = '';
-    } else {
-      this.current = 0;
-      this.label = 0 + '%';
-      this.currentAmount = 0;
-      //    this.totalAmount = 0;
-    }
     this.status = newStatus;
     this.$timeout();
   }

browser/services/data.js

@@ -285,7 +285,7 @@ class InstallerDataService {
       Logger.info('All installs complete');
       this.installing = false;
       this.ipcRenderer.send('installComplete', 'all');
-      this.router.go('start');
+      // this.router.go('start');
     }
   }
 

test/mock/electron.js

@@ -1,5 +1,7 @@
 'use strict';
 
+import EventEmitter from 'events';
+
 function electron() {
   let electronWindow = {
     close() {},
@@ -30,9 +32,11 @@ function electron() {
   let shell = {
     openExternal() {}
   };
+  let ipcRenderer = new EventEmitter();
   return {
     remote,
-    shell
+    shell,
+    ipcRenderer
   };
 }
 

test/unit/model/helpers/installer-test.js

@@ -343,13 +343,6 @@ describe('Installer', function() {
   });
 
   describe('succeed', function() {
-    it('should set progress to complete when the input is truthy', function() {
-      let spy = sandbox.spy(fakeProgress, 'setComplete');
-      installer.succeed(true);
-
-      expect(spy).to.have.been.calledOnce;
-    });
-
     it('should not succeed with a falsey input', function() {
       let spy = sandbox.spy(fakeProgress, 'setComplete');
       installer.succeed(false);

test/unit/pages/install/controller-test.js

@@ -53,7 +53,7 @@ describe('Install controller', function() {
   describe('constrution', function() {
     it('should process all installables', function() {
       let stub = sandbox.stub(InstallController.prototype, 'processInstallable').returns();
-      new InstallController({}, {}, installerDataSvc);
+      new InstallController({}, {}, installerDataSvc, new ElectronMock());
 
       expect(stub).calledOnce;
       expect(stub).calledWith(VirtualBoxInstall.KEY, vbox);
@@ -63,7 +63,7 @@ describe('Install controller', function() {
       let stub = sandbox.stub(installerDataSvc, 'setupDone').returns();
       sandbox.stub(InstallController.prototype, 'processInstallable').returns();
       sandbox.stub(vbox, 'isSkipped').returns(true);
-      new InstallController({}, {}, installerDataSvc);
+      new InstallController({}, {}, installerDataSvc, new ElectronMock());
       expect(stub).calledOnce;
     });
   });
@@ -87,14 +87,14 @@ describe('Install controller', function() {
     });
 
     it('should trigger download on not downloaded installables', function() {
-      new InstallController({}, timeoutStub, installerDataSvc);
+      new InstallController({}, timeoutStub, installerDataSvc, new ElectronMock());
 
       expect(dlStub).calledOnce;
       expect(dlStub).calledWith('virtualbox', vbox);
     });
 
     it('should not trigger download on already downloaded items', function() {
-      new InstallController({}, timeoutStub, installerDataSvc);
+      new InstallController({}, timeoutStub, installerDataSvc, new ElectronMock());
 
     });
   });
@@ -109,7 +109,7 @@ describe('Install controller', function() {
 
     it('data service should register the new downloads', function() {
       let spy = sandbox.spy(installerDataSvc, 'startDownload');
-      new InstallController({}, timeoutStub, installerDataSvc);
+      new InstallController({}, timeoutStub, installerDataSvc, new ElectronMock());
 
       expect(spy).calledOnce;
       expect(spy).calledWith('virtualbox');
@@ -121,7 +121,7 @@ describe('Install controller', function() {
     it('should call the installables downloadInstaller method', function() {
       sandbox.stub(installerDataSvc, 'startDownload').returns();
 
-      new InstallController({}, timeoutStub, installerDataSvc);
+      new InstallController({}, timeoutStub, installerDataSvc, new ElectronMock());
       expect(vboxStub).calledOnce;
     });
   });
@@ -138,21 +138,21 @@ describe('Install controller', function() {
     it.skip('logs error in case of install failed', function() {
       vbox.install.restore();
       sandbox.stub(vbox, 'install').callsArgWith(2, 'Error');
-      new InstallController({}, timeoutStub, installerDataSvc);
+      new InstallController({}, timeoutStub, installerDataSvc, new ElectronMock());
       expect(errorStub).calledTwice;
     });
 
     it.skip('should call the installables install method', function() {
       sandbox.stub(installerDataSvc, 'startInstall').returns();
 
-      new InstallController({}, timeoutStub, installerDataSvc);
+      new InstallController({}, timeoutStub, installerDataSvc, new ElectronMock());
       expect(vboxStub).calledOnce;
     });
 
     it.skip('should call data services installDone when install finishes', function() {
       sandbox.stub(installerDataSvc, 'startInstall').returns();
 
-      new InstallController({}, timeoutStub, installerDataSvc);
+      new InstallController({}, timeoutStub, installerDataSvc, new ElectronMock());
 
       expect(doneStub).calledOnce;
       expect(doneStub).calledWith(sinon.match.any, 'virtualbox');
@@ -173,18 +173,13 @@ describe('Install controller', function() {
       });
     });
     describe('setCurrent', function() {
-      it('should do nothing if new current progress value is the same', function() {
-        let progress = new ProgressState();
-        progress.$timeout = sandbox.stub().yields();
-        progress.setCurrent(0);
-        expect(progress.$timeout).to.be.not.called;
-      });
       describe('should update', function() {
         let progress;
         beforeEach(function() {
           progress = new ProgressState();
           progress.$timeout = sinon.stub();
           progress.$scope = {$apply:sinon.stub()};
+          progress.setStatus('Downloading');
           progress.setTotalAmount(1000);
           progress.setCurrent(100);
         });
@@ -292,12 +287,6 @@ describe('Install controller', function() {
       it('sets status to "Complete"', function() {
         expect(progress.status).equals('Complete');
       });
-      it('sets label to 100%', function() {
-        expect(progress.label).equals('');
-      });
-      it('sets current prcentage to 100',  function() {
-        expect(progress.current).equals(100);
-      });
     });
     describe('calculateTime', function() {
       let progress;

test/unit/services/data-test.js

@@ -353,17 +353,6 @@ describe('InstallerDataService', function() {
       expect(spy).calledWith('installComplete', 'all');
     });
 
-    it('setupDone should switch to final page when all installs have finished', function() {
-      let spy = sandbox.spy(svc.router, 'go');
-
-      svc.setupDone(fakeProgress, 'jdk');
-      svc.setupDone(fakeProgress, 'vbox');
-
-      expect(svc.installing).to.be.false;
-      expect(spy).calledOnce;
-      expect(spy).calledWith('start');
-    });
-
     it('setupDone should not log info message for skipped installer', function() {
       sandbox.stub(jdk, 'isSkipped').returns(true);
       Logger.info.reset();