From 05b74ba1c8b10c356d396ce9a4834d053cd791b1 Mon Sep 17 00:00:00 2001
From: Steve Klebanoff <steve.klebanoff@gmail.com>
Date: Tue, 30 Oct 2018 13:27:28 -0700
Subject: Dispatching progress

---
 packages/instant/src/util/progress.ts | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'packages/instant/src/util')

diff --git a/packages/instant/src/util/progress.ts b/packages/instant/src/util/progress.ts
index 5cb6a6de9..08b813e3d 100644
--- a/packages/instant/src/util/progress.ts
+++ b/packages/instant/src/util/progress.ts
@@ -1,3 +1,4 @@
+// TODO: change filename?
 import * as _ from 'lodash';
 import { Dispatch } from 'redux';
 
@@ -26,19 +27,21 @@ interface TickingFinishingStatus {
 type TickingStatus = TickingNoneState | TickingRunningStatus | TickingFinishingStatus;
 
 const TICKS_PER_SECOND = 1000 / PROGRESS_TICK_INTERVAL_MS;
-export class Progress {
+class Progress {
     private _startTimeUnix?: number;
     private _expectedTimeMs?: number;
     private _intervalId?: number;
     private _percentageDone: number;
     private _tickingStatus: TickingStatus;
+    private _dispatcher: Dispatch<Action>;
 
-    constructor() {
+    constructor(dispatcher: Dispatch<Action>) {
         this._startTimeUnix = undefined;
         this._expectedTimeMs = undefined;
         this._percentageDone = 0;
         this._intervalId = undefined;
         this._tickingStatus = { state: TickingState.None };
+        this._dispatcher = dispatcher;
     }
 
     public beginRunning(expectedTimeMs: number): void {
@@ -66,8 +69,9 @@ export class Progress {
                 : this._getNewPercentageNormal();
 
         const maxPercentage = this._tickingStatus.state === TickingState.Finishing ? 100 : PROGRESS_STALL_AT_PERCENTAGE;
-        const percentageDone = Math.min(rawPercentageDone, maxPercentage);
+        const percentageDone = Math.floor(Math.min(rawPercentageDone, maxPercentage));
         this._percentageDone = percentageDone;
+        this._dispatcher(actions.updateOrderProgressPercentage(this._percentageDone));
         console.log('percentageDone', this._percentageDone);
         if (percentageDone >= 100) {
             this._clearTimer();
@@ -96,3 +100,9 @@ export class Progress {
         return this._percentageDone + finishingState.increasePercentageEveryTick;
     }
 }
+
+let _currentProgress: Progress | undefined;
+export const progress = (dispatcher: Dispatch<Action>): Progress => {
+    _currentProgress = _currentProgress || new Progress(dispatcher);
+    return _currentProgress;
+};
-- 
cgit v1.2.3