Copy from template

coder · BrunoQuaresma · Mar 30, 2023 · Mar 28, 2023 · Mar 28, 2023 · Mar 28, 2023
commit 03d832c451db8f8fad9ec53fa62d10003b66fe97
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -335,7 +335,7 @@ export const getTemplateVersionGitAuth = async (
 
 export const getTemplateVersionParameters = async (
   versionId: string,
-): Promise<TypesGen.Parameter[]> => {
+): Promise<TypesGen.ComputedParameter[]> => {
   const response = await axios.get(
     `/api/v2/templateversions/${versionId}/parameters`,
   )

diff --git a/site/src/pages/CreateTemplatePage/CreateTemplateForm.tsx b/site/src/pages/CreateTemplatePage/CreateTemplateForm.tsx
@@ -120,6 +120,7 @@ const getInitialValues = ({
   fromCopy,
   canSetMaxTTL,
   variables,
+  parameters,
 }: GetInitialValuesParams) => {
   let initialValues = defaultInitialValues
 
@@ -151,19 +152,26 @@ const getInitialValues = ({
 
   if (variables) {
     variables.forEach((variable) => {
-      if (variable.sensitive) {
-        return
-      }
       if (!initialValues.user_variable_values) {
         initialValues.user_variable_values = []
       }
       initialValues.user_variable_values.push({
         name: variable.name,
-        value: variable.value,
+        value: variable.sensitive ? "" : variable.value,
       })
     })
   }
 
+  if (parameters) {
+    parameters.forEach((parameter) => {
+      if (!initialValues.parameter_values_by_name) {
+        initialValues.parameter_values_by_name = {}
+      }
+      initialValues.parameter_values_by_name[parameter.name] =
+        parameter.default_source_value
+    })
+  }
+
   return initialValues
 }
 
@@ -203,6 +211,7 @@ export const CreateTemplateForm: FC<CreateTemplateFormProps> = ({
       fromExample: starterTemplate,
       fromCopy: copiedTemplate,
       variables,
+      parameters,
     }),
     validationSchema,
     onSubmit,
@@ -407,7 +416,7 @@ export const CreateTemplateForm: FC<CreateTemplateFormProps> = ({
           <FormFields>
             {variables.map((variable, index) => (
               <VariableInput
-                defaultValue={form.values.user_variable_values?.[index].value}
+                defaultValue={variable.value}
                 variable={variable}
                 disabled={isSubmitting}
                 key={variable.name}

diff --git a/site/src/xServices/createTemplate/createTemplateXService.ts b/site/src/xServices/createTemplate/createTemplateXService.ts
@@ -8,6 +8,7 @@ import {
   getTemplateVersionLogs,
   getTemplateVersionVariables,
   getTemplateByName,
+  getTemplateVersionParameters,
 } from "api/api"
 import {
   CreateTemplateVersionRequest,
@@ -114,7 +115,7 @@ export const createTemplateMachine =
             data: {
               template: Template
               version: TemplateVersion
-
+              parameters: ParameterSchema[]
               variables: TemplateVersionVariable[]
             }
           }
@@ -155,7 +156,7 @@ export const createTemplateMachine =
               {
                 target: "creating.promptParametersAndVariables",
                 actions: ["assignCopiedTemplateData"],
-                cond: "hasVariables",
+                cond: "hasParametersOrVariables",
               },
               {
                 target: "idle",
@@ -340,14 +341,36 @@ export const createTemplateMachine =
             organizationId,
             templateNameToCopy,
           )
-          const [version, variables] = await Promise.all([
-            getTemplateVersion(template.active_version_id),
+          const [version, schemaParameters, computedParameters, variables] =
+            await Promise.all([
+              getTemplateVersion(template.active_version_id),
+              getTemplateVersionSchema(template.active_version_id),
+              getTemplateVersionParameters(template.active_version_id),
+              getTemplateVersionVariables(template.active_version_id),
+            ])
+
+          // Recreate parameters with default_source_value from the already
+          // computed version parameters
+          const parameters: ParameterSchema[] = []
+          computedParameters.forEach((computedParameter) => {
+            const schema = schemaParameters.find(
+              (schema) => schema.name === computedParameter.name,
+            )
+            if (!schema) {
+              throw new Error(
+                `Parameter ${computedParameter.name} not found in schema`,
+              )
+            }
+            parameters.push({
+              ...schema,
+              default_source_value: computedParameter.source_value,
+            })
+          })
 
-            getTemplateVersionVariables(template.active_version_id),
-          ])
           return {
             template,
             version,
+            parameters,
             variables,
           }
         },
@@ -518,6 +541,7 @@ export const createTemplateMachine =
         assignCopiedTemplateData: assign({
           copiedTemplate: (_, { data }) => data.template,
           version: (_, { data }) => data.version,
+          parameters: (_, { data }) => data.parameters,
           variables: (_, { data }) => data.variables,
         }),
       },
@@ -535,8 +559,8 @@ export const createTemplateMachine =
           ),
         hasNoParametersOrVariables: (_, { data }) =>
           data.parameters === undefined && data.variables === undefined,
-        hasVariables: (_, { data }) => {
-          return data.variables.length > 0
+        hasParametersOrVariables: (_, { data }) => {
+          return data.parameters.length > 0 || data.variables.length > 0
         },
       },
     },