Unify Age column output with kubectl (#1822)

Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>

src/renderer/utils/formatDuration.ts

@@ -1,34 +1,86 @@
 import moment from "moment";
 
-const suffixes = ["w", "d", "h", "m", "s"];
-
 /**
  * This function formats durations in a more human readable form.
  * @param timeValue the duration in milliseconds to format
- * @param compact when true, only the largest non-zero time frame will be returned
  */
-export function formatDuration(timeValue: number, compact: boolean) {
+export function formatDuration(timeValue: number, compact = true) {
   const duration = moment.duration(timeValue, "milliseconds");
-  const durationValues = [
-    Math.floor(duration.asWeeks()),
-    Math.floor(duration.asDays()) % 7,
-    duration.hours(),
-    duration.minutes(),
-    duration.seconds(),
-  ];
-  const meaningfulValues = durationValues
-    .map((a, i): [number, string] => [a, suffixes[i]])
-    .filter(([dur]) => dur > 0)
-    .filter(([, suf], i) => i === 0 || suf !== "s") // remove seconds, unless it is the only one
-    .map(([dur, suf]) => dur + suf);
+  const seconds = Math.floor(duration.asSeconds());
+  const separator = compact ? "": " ";
 
-  if (meaningfulValues.length === 0) {
+  if (seconds < 0) {
     return "0s";
+  } else if (seconds < 60*2 ) {
+    return `${seconds}s`;
+  }
+
+  const minutes = Math.floor(duration.asMinutes());
+
+  if (minutes < 10) {
+    const seconds = duration.seconds();
+
+    return getMeaningfulValues([minutes, seconds], ["m", "s"], separator);
+  } else if (minutes < 60 * 3) {
+    if (!compact) {
+      return getMeaningfulValues([minutes, duration.seconds()], ["m", "s"]);
+    }
+
+    return `${minutes}m`;
+  }
+
+  const hours = Math.floor(duration.asHours());
+
+  if(hours < 8) {
+    const minutes = duration.minutes();
+
+    return getMeaningfulValues([hours, minutes], ["h", "m"], separator);
+  } else if (hours < 48) {
+    if (compact) {
+      return `${hours}h`;
+    } else {
+      return getMeaningfulValues([hours, duration.minutes()], ["h", "m"]);
+    }
+  }
+
+  const days = Math.floor(duration.asDays());
+
+  if (days < 8) {
+    const hours = duration.hours();
+
+    if (compact) {
+      return getMeaningfulValues([days, hours], ["d", "h"], separator);
+    } else {
+      return getMeaningfulValues([days, hours, duration.minutes()], ["d", "h", "m"]);
+    }
+  }
+  const years = Math.floor(duration.asYears());
+
+  if (years < 2) {
+    if (compact) {
+      return `${days}d`;
+    } else {
+      return getMeaningfulValues([days, duration.hours(), duration.minutes()], ["d", "h", "m"]);
+    }
+  } else if (years < 8) {
+    const days = duration.days();
+
+    if (compact) {
+      return getMeaningfulValues([years, days], ["y", "d"], separator);
+    }
   }
 
   if (compact) {
-    return meaningfulValues[0];
+    return `${years}y`;
   }
 
-  return meaningfulValues.join(" ");
+  return getMeaningfulValues([years, duration.days(), duration.hours(), duration.minutes()], ["y", "d", "h", "m"]);
 }
+
+function getMeaningfulValues(values: number[], suffixes: string[], separator = " ") {
+  return values
+    .map((a, i): [number, string] => [a, suffixes[i]])
+    .filter(([dur]) => dur > 0)
+    .map(([dur, suf]) => dur + suf)
+    .join(separator);
+}