Fix correct bytes not being sent, fix showing upload progress and speed

[arvados-workbench2.git] / src / common / formatters.ts

diff --git a/src/common/formatters.ts b/src/common/formatters.ts
index 38ef0223e957f1b134d1dfed10c23341af145fbc..49e0690515e868a4b1145c79ccbd2ede9d813314 100644 (file)
--- a/src/common/formatters.ts
+++ b/src/common/formatters.ts
@@ -19,6 +19,18 @@ export const formatFileSize = (size?: number) => {
     return "";
 };
 
+export const formatProgress = (loaded: number, total: number) => {
+    const progress = loaded >= 0 && total > 0 ? loaded * 100 / total : 0;
+    return `${progress.toFixed(2)}%`;
+};
+
+export function formatUploadSpeed(prevLoaded: number, loaded: number, prevTime: number, currentTime: number) {
+    const speed = loaded > prevLoaded && currentTime > prevTime
+        ? (loaded - prevLoaded) / (currentTime - prevTime)
+        : 0;
+    return `${(speed / 1000).toFixed(2)} KB/s`;
+}
+
 const FILE_SIZES = [
     {
         base: 1000000000000,
@@ -40,4 +52,4 @@ const FILE_SIZES = [
         base: 1,
         unit: "B"
     }
-];
\ No newline at end of file
+];