Display error when auto creation fails

BrunoQuaresma · BrunoQuaresma · commit c78528221446 · 2023-07-26T14:08:34.000Z
diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.tsx
@@ -19,6 +19,12 @@ import {
 import { CreateWorkspacePageView } from "./CreateWorkspacePageView"
 import { Loader } from "components/Loader/Loader"
 import { ErrorAlert } from "components/Alert/ErrorAlert"
+import {
+  uniqueNamesGenerator,
+  animals,
+  colors,
+  NumberDictionary,
+} from "unique-names-generator"
 
 const CreateWorkspacePage: FC = () => {
   const organizationId = useOrganizationId()
@@ -27,21 +33,23 @@ const CreateWorkspacePage: FC = () => {
   const navigate = useNavigate()
   const [searchParams] = useSearchParams()
   const defaultBuildParameters = getDefaultBuildParameters(searchParams)
-  const defaultName = searchParams.get("name") ?? ""
+  const mode = (searchParams.get("mode") ?? "form") as CreateWorkspaceMode
   const [createWorkspaceState, send] = useMachine(createWorkspaceMachine, {
     context: {
       organizationId,
       templateName,
-      mode: (searchParams.get("mode") ?? "form") as CreateWorkspaceMode,
+      mode,
       defaultBuildParameters,
+      defaultName:
+        mode === "auto" ? generateUniqueName() : searchParams.get("name") ?? "",
     },
     actions: {
       onCreateWorkspace: (_, event) => {
         navigate(`/@${event.data.owner_name}/${event.data.name}`)
       },
     },
   })
-  const { template, error, parameters, permissions, gitAuth } =
+  const { template, error, parameters, permissions, gitAuth, defaultName } =
     createWorkspaceState.context
   const title = createWorkspaceState.matches("autoCreating")
     ? "Creating workspace..."
@@ -86,6 +94,8 @@ const CreateWorkspacePage: FC = () => {
   )
 }
 
+export default CreateWorkspacePage
+
 const getDefaultBuildParameters = (
   urlSearchParams: URLSearchParams,
 ): WorkspaceBuildParameter[] => {
@@ -114,4 +124,12 @@ export const orderedTemplateParameters = (
   return [...immutables, ...mutables]
 }
 
-export default CreateWorkspacePage
+const generateUniqueName = () => {
+  const numberDictionary = NumberDictionary.generate({ min: 0, max: 99 })
+  return uniqueNamesGenerator({
+    dictionaries: [animals, colors, numberDictionary],
+    separator: "-",
+    length: 3,
+    style: "lowerCase",
+  })
+}
diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx
@@ -26,6 +26,7 @@ import {
 } from "components/TemplateParameters/TemplateParameters"
 import { CreateWSPermissions } from "xServices/createWorkspace/createWorkspaceXService"
 import { GitAuth } from "components/GitAuth/GitAuth"
+import { ErrorAlert } from "components/Alert/ErrorAlert"
 
 export interface CreateWorkspacePageViewProps {
   error: unknown
@@ -101,6 +102,7 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
   return (
     <FullPageHorizontalForm title="New workspace" onCancel={onCancel}>
       <HorizontalForm onSubmit={form.handleSubmit}>
+        {Boolean(error) && <ErrorAlert error={error} />}
         {/* General info */}
         <FormSection
           title="General"
diff --git a/site/src/xServices/createWorkspace/createWorkspaceXService.ts b/site/src/xServices/createWorkspace/createWorkspaceXService.ts
@@ -15,12 +15,6 @@ import {
   WorkspaceBuildParameter,
 } from "api/typesGenerated"
 import { assign, createMachine } from "xstate"
-import {
-  uniqueNamesGenerator,
-  animals,
-  colors,
-  NumberDictionary,
-} from "unique-names-generator"
 import { paramsUsedToCreateWorkspace } from "utils/workspace"
 import { REFRESH_GITAUTH_BROADCAST_CHANNEL } from "utils/gitAuth"
 
@@ -30,6 +24,7 @@ type CreateWorkspaceContext = {
   organizationId: string
   templateName: string
   mode: CreateWorkspaceMode
+  defaultName: string
   error?: Error | unknown
   // Form
   template?: Template
@@ -96,7 +91,7 @@ export const createWorkspaceMachine =
             },
             onError: {
               actions: ["assignError"],
-              target: "idle",
+              target: "loadingFormData",
             },
           },
         },
@@ -161,11 +156,12 @@ export const createWorkspaceMachine =
           templateName,
           organizationId,
           defaultBuildParameters,
+          defaultName,
         }) => {
           const template = await getTemplateByName(organizationId, templateName)
           return createWorkspace(organizationId, "me", {
             template_id: template.id,
-            name: generateUniqueName(),
+            name: defaultName,
             rich_parameter_values: defaultBuildParameters,
           })
         },
@@ -206,16 +202,6 @@ export const createWorkspaceMachine =
     },
   )
 
-const generateUniqueName = () => {
-  const numberDictionary = NumberDictionary.generate({ min: 0, max: 99 })
-  return uniqueNamesGenerator({
-    dictionaries: [animals, colors, numberDictionary],
-    separator: "-",
-    length: 3,
-    style: "lowerCase",
-  })
-}
-
 const checkCreateWSPermissions = async (organizationId: string) => {
   // HACK: below, we pass in * for the owner_id, which is a hacky way of checking if the
   // current user can create a workspace on behalf of anyone within the org (only org owners should be able to do this).
