Fix invalid option as default parameter

BrunoQuaresma · BrunoQuaresma · commit fefcf2f819b0 · 2023-07-26T13:49:32.000Z
diff --git a/site/src/utils/richParameters.test.ts b/site/src/utils/richParameters.test.ts
@@ -0,0 +1,53 @@
+import { TemplateVersionParameter } from "api/typesGenerated"
+import { selectInitialRichParametersValues } from "./richParameters"
+
+test("selectInitialRichParametersValues return default value when default build parameter is not valid", () => {
+  const templateParameters: TemplateVersionParameter[] = [
+    {
+      name: "cpu",
+      display_name: "CPU",
+      description: "The number of CPU cores",
+      description_plaintext: "The number of CPU cores",
+      type: "string",
+      mutable: true,
+      default_value: "2",
+      icon: "/icon/memory.svg",
+      options: [
+        {
+          name: "2 Cores",
+          description: "",
+          value: "2",
+          icon: "",
+        },
+        {
+          name: "4 Cores",
+          description: "",
+          value: "4",
+          icon: "",
+        },
+        {
+          name: "6 Cores",
+          description: "",
+          value: "6",
+          icon: "",
+        },
+        {
+          name: "8 Cores",
+          description: "",
+          value: "8",
+          icon: "",
+        },
+      ],
+      required: false,
+      ephemeral: false,
+    },
+  ]
+
+  const cpuParameter = templateParameters[0]
+  const [cpuParameterInitialValue] = selectInitialRichParametersValues(
+    templateParameters,
+    [{ name: cpuParameter.name, value: "100" }],
+  )
+
+  expect(cpuParameterInitialValue.value).toBe(cpuParameter.default_value)
+})
diff --git a/site/src/utils/richParameters.ts b/site/src/utils/richParameters.ts
@@ -19,14 +19,19 @@ export const selectInitialRichParametersValues = (
 
     if (parameter.options.length > 0) {
       parameterValue = parameterValue ?? parameter.options[0].value
+      const validValues = parameter.options.map((option) => option.value)
 
       if (defaultBuildParameters) {
-        const buildParameter = defaultBuildParameters.find(
+        const defaultBuildParameter = defaultBuildParameters.find(
           (p) => p.name === parameter.name,
         )
 
-        if (buildParameter) {
-          parameterValue = buildParameter?.value
+        // We don't want invalid values from default parameters to be set
+        if (
+          defaultBuildParameter &&
+          validValues.includes(defaultBuildParameter.value)
+        ) {
+          parameterValue = defaultBuildParameter?.value
         }
       }
 

Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,19 @@ export const selectInitialRichParametersValues = (`
`19`	`19`
`20`	`20`	`if (parameter.options.length > 0) {`
`21`	`21`	`parameterValue = parameterValue ?? parameter.options[0].value`
	`22`	`+ const validValues = parameter.options.map((option) => option.value)`
`22`	`23`
`23`	`24`	`if (defaultBuildParameters) {`
`24`		`- const buildParameter = defaultBuildParameters.find(`
	`25`	`+ const defaultBuildParameter = defaultBuildParameters.find(`
`25`	`26`	`(p) => p.name === parameter.name,`
`26`	`27`	`)`
`27`	`28`
`28`		`- if (buildParameter) {`
`29`		`- parameterValue = buildParameter?.value`
	`29`	`+ // We don't want invalid values from default parameters to be set`
	`30`	`+ if (`
	`31`	`+ defaultBuildParameter &&`
	`32`	`+ validValues.includes(defaultBuildParameter.value)`
	`33`	`+ ) {`
	`34`	`+ parameterValue = defaultBuildParameter?.value`
`30`	`35`	`}`
`31`	`36`	`}`
`32`	`37`