Fix create template from example id

BrunoQuaresma · BrunoQuaresma · commit 521803f267b3 · 2022-12-13T18:22:42.000Z
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -744,55 +744,57 @@ export const getTemplateExamples = async (
   return response.data
 }
 
-// This function mocks what the CLI is doing
+// for creating a new template:
+// 1. upload template tar or use the example ID
+// 2. create template version
+// 3. wait for it to complete
+// 4. if the job failed with the missing parameter error then:
+//    a. prompt for params
+//    b. create template version again with the same file hash
+//    c. wait for it to complete
+// 5.create template with the successful template version ID
 // https://github.com/coder/coder/blob/b6703b11c6578b2f91a310d28b6a7e57f0069be6/cli/templatecreate.go#L169-L170
 export const createValidTemplate = async (
   organizationId: string,
   exampleId: string,
   // The template_version_id is calculated in the function
   data: Omit<TypesGen.CreateTemplateRequest, "template_version_id">,
 ): Promise<TypesGen.Template> => {
-  // First template version is used to generate the parameters and default values
+  // Step 2.
   let version = await createTemplateVersion(organizationId, {
     storage_method: "file",
     example_id: exampleId,
     provisioner: "terraform",
     tags: {},
   })
-  console.log("Create version")
-
-  // Wait the version job to be completed
-  const waitForJobToBeCompleted = async (
-    templateVersion: TypesGen.TemplateVersion,
-  ) => {
-    const version = await getTemplateVersion(templateVersion.id)
-    if (["pending", "running"].includes(version.job.status)) {
-      await waitForJobToBeCompleted(version)
-    }
-    return version
+
+  // Step 3.
+  let status = version.job.status
+  while (["pending", "running"].includes(status)) {
+    version = await getTemplateVersion(version.id)
+    status = version.job.status
   }
-  version = await waitForJobToBeCompleted(version)
-  if (version.job.status === "failed") {
-    throw new Error("Version failed to be created")
+  if (status === "failed") {
+    console.error(version.job.error)
+    throw new Error(version.job.error)
   }
 
-  console.log("Completed")
-  // Get schema and create a new template version with the parameters
-  const schema = await getTemplateVersionSchema(version.id)
-  version = await createTemplateVersion(organizationId, {
-    storage_method: "file",
-    example_id: exampleId,
-    provisioner: "terraform",
-    tags: {},
-    parameter_values: schema.map((parameter) => ({
-      name: parameter.name,
-      source_scheme: parameter.default_source_scheme,
-      destination_scheme: parameter.default_destination_scheme,
-      source_value: parameter.default_source_value,
-    })),
-  })
-
-  // Create template
+  // // Get schema and create a new template version with the parameters
+  // const schema = await getTemplateVersionSchema(version.id)
+  // version = await createTemplateVersion(organizationId, {
+  //   storage_method: "file",
+  //   example_id: exampleId,
+  //   provisioner: "terraform",
+  //   tags: {},
+  //   parameter_values: schema.map((parameter) => ({
+  //     name: parameter.name,
+  //     source_scheme: parameter.default_source_scheme,
+  //     destination_scheme: parameter.default_destination_scheme,
+  //     source_value: parameter.default_source_value,
+  //   })),
+  // })
+
+  // Step 5.
   const template = await createTemplate(organizationId, {
     ...data,
     template_version_id: version.id,
diff --git a/site/src/xServices/createTemplate/createTemplateXService.ts b/site/src/xServices/createTemplate/createTemplateXService.ts
@@ -1,5 +1,6 @@
 import { createValidTemplate, getTemplateExamples } from "api/api"
 import { Template, TemplateExample } from "api/typesGenerated"
+import { displayError } from "components/GlobalSnackbar/utils"
 import { assign, createMachine } from "xstate"
 
 interface CreateTemplateContext {
@@ -73,7 +74,7 @@ export const createTemplateMachine = createMachine(
           },
           onError: {
             target: "idle",
-            actions: ["assignError"],
+            actions: ["displayError"],
           },
         },
       },
@@ -111,6 +112,13 @@ export const createTemplateMachine = createMachine(
     actions: {
       assignError: assign({ error: (_, { data }) => data }),
       assignStarterTemplate: assign({ starterTemplate: (_, { data }) => data }),
+      displayError: (_, { data }) => {
+        if (data instanceof Error) {
+          displayError(data.message)
+          return
+        }
+        console.warn(`data is not an Error`)
+      },
     },
     guards: {
       isExampleProvided: ({ exampleId }) => Boolean(exampleId),
