Show progress

Antonio Scandurra · Antonio Scandurra · commit 6166b1bac31b · 2016-05-30T15:43:54.000+02:00
diff --git a/lib/git/push-pull/push-pull-component.js b/lib/git/push-pull/push-pull-component.js
@@ -67,7 +67,7 @@ export default class PushPullComponent {
 
     return (
       <div className='git-Progress'>
-        <progress className='git-Progress-bar'/>
+        <progress className='git-Progress-bar' value={this.viewModel.getProgressPercentage()}/>
       </div>
     )
   }
diff --git a/lib/git/push-pull/push-pull-view-model.js b/lib/git/push-pull/push-pull-view-model.js
@@ -12,6 +12,7 @@ export default class PushPullViewModel {
   token: ?string;
   inFlightRequests: number;
   emitter: Emitter;
+  progress: number;
 
   constructor (gitStore: GitStore) {
     this.inFlightRequests = 0
@@ -36,7 +37,8 @@ export default class PushPullViewModel {
       let index = 0
       for (const remote of remotes) {
         await this.gitService.fetch(remote, creds, localProgress => { // eslint-disable-line babel/no-await-in-loop
-          console.log('fetch progress', (localProgress + index) / remotes.length)
+          this.progress = (localProgress + index) / remotes.length
+          this.emitter.emit('did-update')
         })
         index++
       }
@@ -46,27 +48,35 @@ export default class PushPullViewModel {
   pull (): Promise<void> {
     return this.performNetworkAction(() => {
       return this.gitService.pull(this.gitStore.branchName, this.getCreds(), progress => {
-        console.log('pull progress', progress)
+        this.progress = progress
+        this.emitter.emit('did-update')
       })
     })
   }
 
   push (): Promise<void> {
     return this.performNetworkAction(() => {
       return this.gitService.push(this.gitStore.branchName, this.getCreds(), progress => {
-        console.log('push progress', progress)
+        this.progress = progress
+        this.emitter.emit('did-update')
       })
     })
   }
 
+  getProgressPercentage (): number {
+    return this.progress * 100
+  }
+
   async performNetworkAction (fn: () => Promise<void>): Promise<void> {
+    this.progress = 0
     this.inFlightRequests++
     this.emitter.emit('did-update')
 
     try {
       await fn()
     } finally {
       this.inFlightRequests--
+      this.progress = 0
       this.emitter.emit('did-update')
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ export default class PushPullComponent {`
`67`	`67`
`68`	`68`	`return (`
`69`	`69`	`<div className='git-Progress'>`
`70`		`- <progress className='git-Progress-bar'/>`
	`70`	`+ <progress className='git-Progress-bar' value={this.viewModel.getProgressPercentage()}/>`
`71`	`71`	`</div>`
`72`	`72`	`)`
`73`	`73`	`}`