Skip to content

Commit 3513404

Browse files
committed
Fix patch
1 parent f222b1b commit 3513404

File tree

3 files changed

+26
-19
lines changed

3 files changed

+26
-19
lines changed

site/src/api/api.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,17 @@ export const updateActiveTemplateVersion = async (
373373
return response.data
374374
}
375375

376+
export const patchTemplateVersion = async (
377+
templateVersionId: string,
378+
data: TypesGen.PatchTemplateVersionRequest,
379+
) => {
380+
const response = await axios.patch<Types.Message>(
381+
`/api/v2/templateversions/${templateVersionId}`,
382+
data,
383+
)
384+
return response.data
385+
}
386+
376387
export const updateTemplateMeta = async (
377388
templateId: string,
378389
data: TypesGen.UpdateTemplateMeta,

site/src/components/TemplateVersionEditor/PublishTemplateVersionDialog.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export const PublishTemplateVersionDialog: FC<
2626
isActiveVersion: false,
2727
},
2828
validationSchema: Yup.object({
29-
name: nameValidator("name"),
29+
name: nameValidator("name").optional(),
3030
isActiveVersion: Yup.boolean(),
3131
}),
3232
onSubmit: onConfirm,
@@ -62,6 +62,7 @@ export const PublishTemplateVersionDialog: FC<
6262
InputLabelProps={{
6363
shrink: true,
6464
}}
65+
helperText="If you leave this blank, the version name will be automatically generated."
6566
/>
6667

6768
<FormControlLabel

site/src/xServices/templateVersionEditor/templateVersionEditorXService.ts

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -332,28 +332,23 @@ export const templateVersionEditorMachine = createMachine(
332332
}
333333
},
334334
publishingVersion: async (
335-
{ orgId, templateId, uploadResponse },
335+
{ version, templateId },
336336
{ name, isActiveVersion },
337337
) => {
338-
if (!templateId) {
339-
throw new Error("template must be set")
340-
}
341-
if (!uploadResponse) {
342-
throw new Error("upload response must be set")
338+
if (!version) {
339+
throw new Error("Version is not set")
343340
}
344-
const newestVersion = await API.createTemplateVersion(orgId, {
345-
name,
346-
provisioner: "terraform",
347-
storage_method: "file",
348-
tags: {},
349-
template_id: templateId,
350-
file_id: uploadResponse.hash,
351-
})
352-
if (isActiveVersion) {
353-
await API.updateActiveTemplateVersion(templateId, {
354-
id: newestVersion.id,
355-
})
341+
if (!templateId) {
342+
throw new Error("Template is not set")
356343
}
344+
await Promise.all([
345+
API.patchTemplateVersion(version.id, { name: name ?? version.name }),
346+
isActiveVersion
347+
? API.updateActiveTemplateVersion(templateId, {
348+
id: version.id,
349+
})
350+
: Promise.resolve(),
351+
])
357352
},
358353
},
359354
},

0 commit comments

Comments
 (0)