refactor: clean up getInitialRichParameterValues for clarity

Parkreiner · Parkreiner · commit e290ece56c5f · 2023-10-13T14:43:49.000Z
diff --git a/site/src/utils/richParameters.ts b/site/src/utils/richParameters.ts
@@ -5,24 +5,27 @@ import {
 import * as Yup from "yup";
 
 export const getInitialRichParameterValues = (
-  templateParameters: TemplateVersionParameter[],
-  buildParameters?: WorkspaceBuildParameter[],
+  templateParameters: readonly TemplateVersionParameter[],
+  buildParameters?: readonly WorkspaceBuildParameter[],
 ): WorkspaceBuildParameter[] => {
-  return templateParameters.map((parameter) => {
-    const existentBuildParameter = buildParameters?.find(
-      (p) => p.name === parameter.name,
+  return templateParameters.map((templateParam) => {
+    const matchedBuildParam = buildParameters?.find(
+      (buildParam) => buildParam.name === templateParam.name,
     );
-    const shouldReturnTheDefaultValue =
-      !existentBuildParameter ||
-      !isValidValue(parameter, existentBuildParameter) ||
-      parameter.ephemeral;
-    if (shouldReturnTheDefaultValue) {
-      return {
-        name: parameter.name,
-        value: parameter.default_value,
-      };
+
+    const shouldOverrideTemplate =
+      matchedBuildParam !== undefined &&
+      isValidValue(templateParam, matchedBuildParam) &&
+      !templateParam.ephemeral;
+
+    if (shouldOverrideTemplate) {
+      return matchedBuildParam;
     }
-    return existentBuildParameter;
+
+    return {
+      name: templateParam.name,
+      value: templateParam.default_value,
+    };
   });
 };
 
