fixup! feat(site): correctly display values of type clibase.Duration

johnstcn · johnstcn · commit d29e21f2ae0f · 2023-11-14T12:30:26.000Z
diff --git a/site/src/components/DeploySettingsLayout/optionValue.test.ts b/site/src/components/DeploySettingsLayout/optionValue.test.ts
@@ -21,14 +21,16 @@ describe("optionValue", () => {
         ...defaultOption,
         name: "Max Token Lifetime",
         value: 3600 * 1e9,
+        annotations: { format_duration_ns: "false" },
       },
-      expected: "1 hour",
+      expected: 3600000000000,
     },
     {
       option: {
         ...defaultOption,
         name: "Max Token Lifetime",
         value: 24 * 3600 * 1e9,
+        annotations: { format_duration_ns: "true" },
       },
       expected: "1 day",
     },
@@ -37,14 +39,16 @@ describe("optionValue", () => {
         ...defaultOption,
         name: "Session Duration",
         value: 3600 * 1e9,
+        annotations: { format_duration_ns: "falsae" },
       },
-      expected: "1 hour",
+      expected: 3600000000000,
     },
     {
       option: {
         ...defaultOption,
         name: "Session Duration",
         value: 24 * 3600 * 1e9,
+        annotations: { format_duration_ns: "true" },
       },
       expected: "1 day",
     },
@@ -109,18 +113,18 @@ describe("optionValue", () => {
         ...defaultOption,
         name: "Some Go Duration We Want To Show As A String",
         value: 30 * 1e9,
-        annotations: { "format_duration_ns": "true" },
+        annotations: { format_duration_ns: "true" },
       },
-      expected: "30s",
+      expected: "30 seconds",
     },
     {
       option: {
         ...defaultOption,
         name: "Some Other Go Duration We Want To Just Display As A Number",
         value: 30 * 1e9,
-        annotations: { "format_duration_ns": "false" },
+        annotations: { format_duration_ns: "false" },
       },
-      expected: "30000000000"
+      expected: 30000000000,
     },
   ])(
     `[$option.name]optionValue($option.value)`,
diff --git a/site/src/components/DeploySettingsLayout/optionValue.ts b/site/src/components/DeploySettingsLayout/optionValue.ts
@@ -16,11 +16,14 @@ export function optionValue(
         case "format_duration_ns":
           return formatDuration(
             // intervalToDuration takes ms, so convert nanoseconds to ms
-            intervalToDuration({ start: 0, end: option.value as number / 1e6 }),
-          )
+            intervalToDuration({
+              start: 0,
+              end: (option.value as number) / 1e6,
+            }),
+          );
         // Add additional cases here as needed.
       }
-    };
+    }
   }
 
   // If no format annotations are present, use the option name to format the value.
