Extract optionValue into a module

BrunoQuaresma · BrunoQuaresma · commit dab8aabb6c56 · 2023-09-07T12:32:49.000Z
diff --git a/site/src/components/DeploySettingsLayout/OptionsTable.tsx b/site/src/components/DeploySettingsLayout/OptionsTable.tsx
@@ -12,7 +12,7 @@ import {
   OptionValue,
 } from "components/DeploySettingsLayout/Option";
 import { FC } from "react";
-import { intervalToDuration, formatDuration } from "date-fns";
+import { optionValue } from "./optionValue";
 
 const OptionsTable: FC<{
   options: DeploymentOption[];
@@ -60,29 +60,6 @@ const OptionsTable: FC<{
   );
 };
 
-// optionValue is a helper function to format the value of a specific deployment options
-export function optionValue(option: DeploymentOption) {
-  switch (option.name) {
-    case "Max Token Lifetime":
-    case "Session Duration":
-      // intervalToDuration takes ms, so convert nanoseconds to ms
-      return formatDuration(
-        intervalToDuration({ start: 0, end: (option.value as number) / 1e6 }),
-      );
-    case "Strict-Transport-Security":
-      if (option.value === 0) {
-        return "Disabled";
-      }
-      return (option.value as number).toString() + "s";
-    case "OIDC Group Mapping":
-      return Object.entries(option.value as Record<string, string>).map(
-        ([key, value]) => `"${key}"->"${value}"`,
-      );
-    default:
-      return option.value;
-  }
-}
-
 const useStyles = makeStyles((theme) => ({
   table: {
     "& td": {
diff --git a/site/src/components/DeploySettingsLayout/optionValue.test.ts b/site/src/components/DeploySettingsLayout/optionValue.test.ts
@@ -1,4 +1,4 @@
-import { optionValue } from "./OptionsTable";
+import { optionValue } from "./optionValue";
 import { DeploymentOption } from "api/types";
 
 const defaultOption: DeploymentOption = {
diff --git a/site/src/components/DeploySettingsLayout/optionValue.ts b/site/src/components/DeploySettingsLayout/optionValue.ts
@@ -0,0 +1,25 @@
+import { DeploymentOption } from "api/types";
+import { intervalToDuration, formatDuration } from "date-fns";
+
+// optionValue is a helper function to format the value of a specific deployment options
+export function optionValue(option: DeploymentOption) {
+  switch (option.name) {
+    case "Max Token Lifetime":
+    case "Session Duration":
+      // intervalToDuration takes ms, so convert nanoseconds to ms
+      return formatDuration(
+        intervalToDuration({ start: 0, end: (option.value as number) / 1e6 }),
+      );
+    case "Strict-Transport-Security":
+      if (option.value === 0) {
+        return "Disabled";
+      }
+      return (option.value as number).toString() + "s";
+    case "OIDC Group Mapping":
+      return Object.entries(option.value as Record<string, string>).map(
+        ([key, value]) => `"${key}"->"${value}"`,
+      );
+    default:
+      return option.value;
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { optionValue } from "./OptionsTable";`
	`1`	`+import { optionValue } from "./optionValue";`
`2`	`2`	`import { DeploymentOption } from "api/types";`
`3`	`3`
`4`	`4`	`const defaultOption: DeploymentOption = {`