diff --git a/packages/@uppy/status-bar/src/StatusBar.js b/packages/@uppy/status-bar/src/StatusBar.js index 536f30bed..0f1faa7a4 100644 --- a/packages/@uppy/status-bar/src/StatusBar.js +++ b/packages/@uppy/status-bar/src/StatusBar.js @@ -1,6 +1,8 @@ const throttle = require('lodash.throttle') const classNames = require('classnames') const statusBarStates = require('./StatusBarStates') +const prettyBytes = require('prettier-bytes') +const prettyETA = require('@uppy/utils/lib/prettyETA') const { h } = require('preact') function calculateProcessingProgress (files) { @@ -204,8 +206,11 @@ const ProgressBarProcessing = (props) => { const ProgressDetails = (props) => { return
{ props.numUploads > 1 && props.i18n('filesUploadedOfTotal', { complete: props.complete, smart_count: props.numUploads }) + ' \u00B7 ' } - { props.i18n('dataUploadedOfTotal', { complete: props.totalUploadedSize, total: props.totalSize }) + ' \u00B7 ' } - { props.i18n('xTimeLeft', { time: props.totalETA }) } + { props.i18n('dataUploadedOfTotal', { + complete: prettyBytes(props.totalUploadedSize), + total: prettyBytes(props.totalSize) + }) + ' \u00B7 ' } + { props.i18n('xTimeLeft', { time: prettyETA(props.totalETA) }) }
} diff --git a/packages/@uppy/status-bar/src/index.js b/packages/@uppy/status-bar/src/index.js index 66d44d9ab..eb79bfb5f 100644 --- a/packages/@uppy/status-bar/src/index.js +++ b/packages/@uppy/status-bar/src/index.js @@ -4,8 +4,6 @@ const StatusBarUI = require('./StatusBar') const statusBarStates = require('./StatusBarStates') const getSpeed = require('@uppy/utils/lib/getSpeed') const getBytesRemaining = require('@uppy/utils/lib/getBytesRemaining') -const prettyETA = require('@uppy/utils/lib/prettyETA') -const prettyBytes = require('prettier-bytes') /** * StatusBar: renders a status bar with upload/pause/resume/cancel/retry buttons, @@ -195,8 +193,7 @@ module.exports = class StatusBar extends Plugin { return files[file] }) - const totalSpeed = prettyBytes(this.getTotalSpeed(inProgressNotPausedFilesArray)) - const totalETA = prettyETA(this.getTotalETA(inProgressNotPausedFilesArray)) + const totalETA = this.getTotalETA(inProgressNotPausedFilesArray) // total size and uploaded size let totalSize = 0 @@ -205,8 +202,6 @@ module.exports = class StatusBar extends Plugin { totalSize = totalSize + (file.progress.bytesTotal || 0) totalUploadedSize = totalUploadedSize + (file.progress.bytesUploaded || 0) }) - totalSize = prettyBytes(totalSize) - totalUploadedSize = prettyBytes(totalUploadedSize) const isUploadStarted = uploadStartedFiles.length > 0 @@ -243,7 +238,6 @@ module.exports = class StatusBar extends Plugin { complete: completeFiles.length, newFiles: newFiles.length, numUploads: startedFiles.length, - totalSpeed, totalETA, files, i18n: this.i18n,