Use the UploadProgress in the ingest file flow

brimdata · Nov 20, 2020 · 332f3b5 · 332f3b5
1 parent 760d373
commit 332f3b5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/src/js/flows/getZealot.ts b/src/js/flows/getZealot.ts
@@ -6,7 +6,7 @@ import ConnectionStatuses from "../state/ConnectionStatuses"
 
 const createBrimFetcher = (dispatch, getState) => {
   return (hostPort: string) => {
-    const {promise, stream} = createFetcher(hostPort)
+    const {promise, ...rest} = createFetcher(hostPort)
 
     const wrappedPromise = (args: FetchArgs): Promise<any> => {
       return promise(args).catch((e) => {
@@ -22,7 +22,7 @@ const createBrimFetcher = (dispatch, getState) => {
       })
     }
 
-    return {promise: wrappedPromise, stream}
+    return {promise: wrappedPromise, ...rest}
   }
 }
 

diff --git a/src/js/flows/ingestFiles.ts b/src/js/flows/ingestFiles.ts
@@ -151,12 +151,6 @@ const trackProgress = (client, gDispatch, clusterId) => {
         else return status.pcap_read_size / status.pcap_total_size || 0
       }
 
-      function logPostStatusToPercent(status): number {
-        // log_total_size may not be present
-        if (!status.log_total_size) return 1
-        else return status.log_read_size / status.log_total_size
-      }
-
       gDispatch(space.setIngestProgress(0))
       for await (const {type, ...status} of stream) {
         switch (type) {
@@ -167,14 +161,13 @@ const trackProgress = (client, gDispatch, clusterId) => {
             gDispatch(space.setIngestSnapshot(status.snapshot_count))
             if (status.snapshot_count > 0) updateSpaceDetails()
             break
-          case "LogPostStatus":
-            gDispatch(space.setIngestProgress(logPostStatusToPercent(status)))
+          case "UploadProgress":
+            gDispatch(space.setIngestProgress(status.progress))
             updateSpaceDetails()
             break
           case "LogPostResponse":
-            console.log(status)
             updateSpaceDetails()
-            ;(status.warnings || []).forEach((warning) => {
+            status.warnings.forEach((warning) => {
               gDispatch(space.appendIngestWarning(warning))
             })
             break
@@ -190,7 +183,6 @@ const trackProgress = (client, gDispatch, clusterId) => {
                 throw errors.logsIngest(status.error.error)
               }
             }
-
             break
         }
       }