From 71809a3439f842054ea12643bdae6ae409ae1051 Mon Sep 17 00:00:00 2001
From: Ammar Bandukwala <ammar@ammar.io>
Date: Sat, 15 Oct 2022 21:09:47 +0000
Subject: [PATCH] site: minor build stats fixes

- Correct variable used in the template stats summary
- Don't use dayjs.humanize (it thinks 30 seconds is "a few seconds")
---
 .../components/TemplateStats/TemplateStats.tsx    |  2 +-
 .../WorkspaceBuildProgress.tsx                    | 15 +++++++--------
 site/src/util/templates.ts                        |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/site/src/components/TemplateStats/TemplateStats.tsx b/site/src/components/TemplateStats/TemplateStats.tsx
index dfdc0db40bdbe..ba548937e5f88 100644
--- a/site/src/components/TemplateStats/TemplateStats.tsx
+++ b/site/src/components/TemplateStats/TemplateStats.tsx
@@ -46,7 +46,7 @@ export const TemplateStats: FC<TemplateStatsProps> = ({
         <span className={styles.statsLabel}>{Language.buildTimeLabel}</span>
 
         <span className={styles.statsValue}>
-          {formatTemplateBuildTime(template.active_user_count)}{" "}
+          {formatTemplateBuildTime(template.average_build_time_ms)}{" "}
         </span>
       </div>
       <div className={styles.statsDivider} />
diff --git a/site/src/components/WorkspaceBuildProgress/WorkspaceBuildProgress.tsx b/site/src/components/WorkspaceBuildProgress/WorkspaceBuildProgress.tsx
index 3d51f5d20cf28..53ea70d1dcc94 100644
--- a/site/src/components/WorkspaceBuildProgress/WorkspaceBuildProgress.tsx
+++ b/site/src/components/WorkspaceBuildProgress/WorkspaceBuildProgress.tsx
@@ -18,18 +18,17 @@ const estimateFinish = (
   templateAverage *= 1.2
 
   const realPercentage = dayjs().diff(startedAt) / templateAverage
-  // Showing a full bar is frustrating.
-  const displayPercentage = Math.min(realPercentage, 0.95)
 
-  if (realPercentage > 1) {
-    return [displayPercentage, "Any moment now..."]
+  // Showing a full bar is frustrating.
+  if (realPercentage > 0.95) {
+    return [0.95, "Any moment now..."]
   }
 
   return [
-    displayPercentage,
-    `${dayjs
-      .duration((1 - realPercentage) * templateAverage)
-      .humanize()} remaining...`,
+    realPercentage,
+    `~${Math.ceil(
+      dayjs.duration((1 - realPercentage) * templateAverage).asSeconds(),
+    )} seconds remaining...`,
   ]
 }
 
diff --git a/site/src/util/templates.ts b/site/src/util/templates.ts
index efa9e0ccc0f76..ebc3d8ae4a365 100644
--- a/site/src/util/templates.ts
+++ b/site/src/util/templates.ts
@@ -16,5 +16,5 @@ export const formatTemplateActiveDevelopers = (num?: number): string => {
 export const formatTemplateBuildTime = (buildTimeMs: number): string => {
   return buildTimeMs < 0
     ? "Unknown"
-    : dayjs.duration(buildTimeMs, "milliseconds").humanize()
+    : `${Math.round(dayjs.duration(buildTimeMs, "milliseconds").asSeconds())}s`
 }