Merge branch '14102-actions-repository'

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

diff --git a/src/common/formatters.ts b/src/common/formatters.ts
index 1d9a52012445b1478c9dc3b4d37197dd9237bc74..49e0690515e868a4b1145c79ccbd2ede9d813314 100644 (file)
--- a/src/common/formatters.ts
+++ b/src/common/formatters.ts
@@ -4,12 +4,13 @@
 
 export const formatDate = (isoDate: string) => {
     const date = new Date(isoDate);
-    return date.toLocaleString();
+    const text = date.toLocaleString();
+    return text === 'Invalid Date' ? "" : text;
 };
 
 export const formatFileSize = (size?: number) => {
     if (typeof size === "number") {
-        for (const { base, unit } of fileSizes) {
+        for (const { base, unit } of FILE_SIZES) {
             if (size >= base) {
                 return `${(size / base).toFixed()} ${unit}`;
             }
@@ -18,7 +19,19 @@ export const formatFileSize = (size?: number) => {
     return "";
 };
 
-const fileSizes = [
+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,
         unit: "TB"
@@ -39,4 +52,4 @@ const fileSizes = [
         base: 1,
         unit: "B"
     }
-];
\ No newline at end of file
+];