URL param

coder · mtojek · Feb 1, 2023 · Jan 24, 2023 · Jan 24, 2023 · Jan 25, 2023
commit feeb10c40937f4d4f28d6bf6818dea5c865067c0
diff --git a/site/src/components/RichParameterInput/RichParameterInput.tsx b/site/src/components/RichParameterInput/RichParameterInput.tsx
@@ -50,12 +50,14 @@ export interface RichParameterInputProps {
   disabled?: boolean
   parameter: TemplateVersionParameter
   onChange: (value: string) => void
+  defaultValue?: string
 }
 
 export const RichParameterInput: FC<RichParameterInputProps> = ({
   disabled,
   onChange,
   parameter,
+  defaultValue,
   ...props
 }) => {
   const styles = useStyles()
@@ -69,6 +71,7 @@ export const RichParameterInput: FC<RichParameterInputProps> = ({
           disabled={disabled}
           onChange={onChange}
           parameter={parameter}
+          defaultValue={defaultValue}
         />
       </div>
     </Stack>
@@ -79,15 +82,16 @@ const RichParameterField: React.FC<RichParameterInputProps> = ({
   disabled,
   onChange,
   parameter,
+  defaultValue,
   ...props
 }) => {
-  const [parameterValue, setParameterValue] = useState(parameter.default_value)
+  const [parameterValue, setParameterValue] = useState(defaultValue)
   const styles = useStyles()
 
   if (isBoolean(parameter)) {
     return (
       <RadioGroup
-        defaultValue={parameter.default_value}
+        defaultValue={parameterValue}
         onChange={(event) => {
           onChange(event.target.value)
         }}
@@ -111,7 +115,7 @@ const RichParameterField: React.FC<RichParameterInputProps> = ({
   if (parameter.options.length > 0) {
     return (
       <RadioGroup
-        defaultValue={parameter.options[0].value}
+        defaultValue={parameterValue}
         onChange={(event) => {
           onChange(event.target.value)
         }}

diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx
@@ -52,6 +52,10 @@ export const CreateWorkspacePageView: FC<
   const [parameterValues, setParameterValues] = useState<
     Record<string, string>
   >(props.defaultParameterValues ?? {})
+  const defaultRichParameterValues = extractRichParametersValues(
+    props.templateParameters,
+    props.defaultParameterValues,
+  )
 
   const { t } = useTranslation("createWorkspacePage")
 
@@ -60,7 +64,7 @@ export const CreateWorkspacePageView: FC<
       initialValues: {
         name: "",
         template_id: props.selectedTemplate ? props.selectedTemplate.id : "",
-        rich_parameter_values: defaultRichParameters(props.templateParameters),
+        rich_parameter_values: defaultRichParameterValues,
       },
       validationSchema: ValidationSchemaForRichParameters(
         props.templateParameters,
@@ -281,6 +285,10 @@ export const CreateWorkspacePageView: FC<
                       })
                     }}
                     parameter={parameter}
+                    defaultValue={initialRichParameterValue(
+                      defaultRichParameterValues,
+                      parameter,
+                    )}
                   />
                 ))}
               </Stack>
@@ -370,8 +378,9 @@ const useFormFooterStyles = makeStyles((theme) => ({
   },
 }))
 
-const defaultRichParameters = (
+const extractRichParametersValues = (
   templateParameters?: TypesGen.TemplateVersionParameter[],
+  defaultValuesFromQuery?: Record<string, string>,
 ): TypesGen.WorkspaceBuildParameter[] => {
   const defaults: TypesGen.WorkspaceBuildParameter[] = []
   if (!templateParameters) {
@@ -380,23 +389,43 @@ const defaultRichParameters = (
 
   templateParameters.forEach((parameter) => {
     if (parameter.options.length > 0) {
+      let parameterValue = parameter.options[0].value
+      if (defaultValuesFromQuery && defaultValuesFromQuery[parameter.name]) {
+        parameterValue = defaultValuesFromQuery[parameter.name]
+      }
+
       const buildParameter: TypesGen.WorkspaceBuildParameter = {
         name: parameter.name,
-        value: parameter.options[0].value,
+        value: parameterValue,
       }
       defaults.push(buildParameter)
       return
     }
 
+    let parameterValue = parameter.default_value
+    if (defaultValuesFromQuery && defaultValuesFromQuery[parameter.name]) {
+      parameterValue = defaultValuesFromQuery[parameter.name]
+    }
+
     const buildParameter: TypesGen.WorkspaceBuildParameter = {
       name: parameter.name,
-      value: parameter.default_value || "",
+      value: parameterValue || "",
     }
     defaults.push(buildParameter)
   })
   return defaults
 }
 
+const initialRichParameterValue = (
+  workspaceBuildParameters: TypesGen.WorkspaceBuildParameter[],
+  parameter: TypesGen.TemplateVersionParameter,
+): string => {
+  const buildParameter = workspaceBuildParameters.find((buildParameter) => {
+    return buildParameter.name === parameter.name
+  })
+  return (buildParameter && buildParameter.value) || ""
+}
+
 const ValidationSchemaForRichParameters = (
   templateParameters?: TypesGen.TemplateVersionParameter[],
 ): Yup.AnySchema => {