Merge branch '18169-cancel-button-not-working' into main
[arvados-workbench2.git] / src / common / formatters.ts
index d8228bf5eb007f5c0843d0f16990a73e9b9a1d28..6d0a7e491e4e508384ccbad42f66cc2eb3f8c195 100644 (file)
@@ -2,8 +2,8 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { PropertyValue } from "~/models/search-bar";
-import { Vocabulary, getTagKeyLabel, getTagValueLabel } from "~/models/vocabulary";
+import { PropertyValue } from "models/search-bar";
+import { Vocabulary, getTagKeyLabel, getTagValueLabel } from "models/vocabulary";
 
 export const formatDate = (isoDate?: string | null, utc: boolean = false) => {
     if (isoDate) {
@@ -29,7 +29,7 @@ export const formatFileSize = (size?: number | string) => {
                 return `${(size / base).toFixed()} ${unit}`;
             }
         }
-    } 
+    }
     if ((typeof size === "string" && size === '') || size === undefined) {
         return '';
     }
@@ -61,24 +61,25 @@ export function formatUploadSpeed(prevLoaded: number, loaded: number, prevTime:
     const speed = loaded > prevLoaded && currentTime > prevTime
         ? (loaded - prevLoaded) / (currentTime - prevTime)
         : 0;
-    return `${(speed / 1000).toFixed(2)} KB/s`;
+
+    return `${(speed / 1000).toFixed(2)} MB/s`;
 }
 
 const FILE_SIZES = [
     {
-        base: 1000000000000,
+        base: 1099511627776,
         unit: "TB"
     },
     {
-        base: 1000000000,
+        base: 1073741824,
         unit: "GB"
     },
     {
-        base: 1000000,
+        base: 1048576,
         unit: "MB"
     },
     {
-        base: 1000,
+        base: 1024,
         unit: "KB"
     },
     {