Fix duplicated name

coder · BrunoQuaresma · Mar 27, 2023 · Mar 21, 2023 · Mar 23, 2023 · Mar 23, 2023
commit 90dc55fb77c9e8b2dda937db731cc02b9e88d040
diff --git a/coderd/templateversions.go b/coderd/templateversions.go
@@ -123,6 +123,9 @@ func (api *API) patchTemplateVersion(rw http.ResponseWriter, r *http.Request) {
 	if errors.Is(err, errTemplateVersionNameConflict) {
 		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
 			Message: err.Error(),
+			Validations: []codersdk.ValidationError{
+				{Field: "name", Detail: "Name is already used"},
+			},
 		})
 		return
 	}

diff --git a/site/src/components/TemplateVersionEditor/PublishTemplateVersionDialog.tsx b/site/src/components/TemplateVersionEditor/PublishTemplateVersionDialog.tsx
@@ -14,13 +14,21 @@ import { Stack } from "components/Stack/Stack"
 export type PublishTemplateVersionDialogProps = DialogProps & {
   defaultName: string
   isPublishing: boolean
+  publishingError?: unknown
   onClose: () => void
   onConfirm: (data: PublishVersionData) => void
 }
 
 export const PublishTemplateVersionDialog: FC<
   PublishTemplateVersionDialogProps
-> = ({ onConfirm, isPublishing, onClose, defaultName, ...dialogProps }) => {
+> = ({
+  onConfirm,
+  isPublishing,
+  onClose,
+  defaultName,
+  publishingError,
+  ...dialogProps
+}) => {
   const form = useFormik({
     initialValues: {
       name: defaultName,
@@ -32,7 +40,7 @@ export const PublishTemplateVersionDialog: FC<
     }),
     onSubmit: onConfirm,
   })
-  const getFieldHelpers = getFormHelpers(form)
+  const getFieldHelpers = getFormHelpers(form, publishingError)
   const handleClose = () => {
     form.resetForm()
     onClose()

diff --git a/site/src/components/TemplateVersionEditor/TemplateVersionEditor.tsx b/site/src/components/TemplateVersionEditor/TemplateVersionEditor.tsx
@@ -56,6 +56,7 @@ export interface TemplateVersionEditorProps {
   onPublish: () => void
   onConfirmPublish: (data: PublishVersionData) => void
   onCancelPublish: () => void
+  publishingError: unknown
   isAskingPublishParameters: boolean
   isPublishing: boolean
 }
@@ -85,6 +86,7 @@ export const TemplateVersionEditor: FC<TemplateVersionEditorProps> = ({
   onPublish,
   onConfirmPublish,
   onCancelPublish,
+  publishingError,
   isAskingPublishParameters,
   isPublishing,
   buildLogs,
@@ -400,6 +402,8 @@ export const TemplateVersionEditor: FC<TemplateVersionEditorProps> = ({
       </div>
 
       <PublishTemplateVersionDialog
+        key={templateVersion.name}
+        publishingError={publishingError}
         open={isAskingPublishParameters || isPublishing}
         onClose={onCancelPublish}
         onConfirm={onConfirmPublish}

diff --git a/site/src/pages/TemplateVersionPage/TemplateVersionEditorPage/TemplateVersionEditorPage.tsx b/site/src/pages/TemplateVersionPage/TemplateVersionEditorPage/TemplateVersionEditorPage.tsx
@@ -78,6 +78,7 @@ export const TemplateVersionEditorPage: FC = () => {
           isAskingPublishParameters={editorState.matches(
             "askPublishParameters",
           )}
+          publishingError={editorState.context.publishingError}
           isPublishing={editorState.matches("publishingVersion")}
           disablePreview={editorState.hasTag("loading")}
           disableUpdate={

diff --git a/site/src/xServices/templateVersionEditor/templateVersionEditorXService.ts b/site/src/xServices/templateVersionEditor/templateVersionEditorXService.ts
@@ -25,6 +25,7 @@ export interface TemplateVersionEditorMachineContext {
   resources?: WorkspaceResource[]
   buildLogs?: ProvisionerJobLog[]
   tarReader?: TarReader
+  publishingError?: unknown
 }
 
 export const templateVersionEditorMachine = createMachine(
@@ -97,12 +98,17 @@ export const templateVersionEditorMachine = createMachine(
       },
       publishingVersion: {
         tags: "loading",
+        entry: ["clearPublishingError"],
         invoke: {
           id: "publishingVersion",
           src: "publishingVersion",
           onDone: {
             actions: ["onPublish"],
           },
+          onError: {
+            actions: ["assignPublishingError"],
+            target: "askPublishParameters",
+          },
         },
       },
       cancelingBuild: {
@@ -225,6 +231,10 @@ export const templateVersionEditorMachine = createMachine(
       assignTarReader: assign({
         tarReader: (_, { tarReader }) => tarReader,
       }),
+      assignPublishingError: assign({
+        publishingError: (_, event) => event.data,
+      }),
+      clearPublishingError: assign({ publishingError: (_) => undefined }),
     },
     services: {
       uploadTar: async ({ fileTree, tarReader }) => {