refactor: Update create workspace flow to allow creation from the workspaces page (#1684)

This commit is contained in:
Bruno Quaresma
2022-05-24 08:37:44 -05:00
committed by GitHub
parent 5f8d0e5dad
commit fcd610ee7b
11 changed files with 368 additions and 262 deletions

View File

@ -15,6 +15,7 @@
"drpcserver",
"Dsts",
"fatih",
"Formik",
"goarch",
"gographviz",
"goleak",
@ -22,6 +23,7 @@
"gsyslog",
"hashicorp",
"hclsyntax",
"httpapi",
"httpmw",
"idtoken",
"Iflag",
@ -63,6 +65,7 @@
"tfjson",
"tfstate",
"trimprefix",
"typegen",
"unconvert",
"Untar",
"VMID",

View File

@ -56,6 +56,16 @@ export const AppRouter: React.FC = () => (
</AuthAndFrame>
}
/>
<Route
path="new"
element={
<RequireAuth>
<CreateWorkspacePage />
</RequireAuth>
}
/>
<Route path=":workspace">
<Route
index
@ -85,17 +95,6 @@ export const AppRouter: React.FC = () => (
</AuthAndFrame>
}
/>
<Route path=":template">
<Route
path="new"
element={
<RequireAuth>
<CreateWorkspacePage />
</RequireAuth>
}
/>
</Route>
</Route>
<Route path="users">

View File

@ -35,7 +35,7 @@ export const FormFooter: React.FC<FormFooterProps> = ({
const styles = useStyles()
return (
<div className={styles.footer}>
<Button className={styles.button} onClick={onCancel} variant="outlined">
<Button type="button" className={styles.button} onClick={onCancel} variant="outlined">
{Language.cancelLabel}
</Button>
<LoadingButton loading={isLoading} className={styles.button} variant="contained" color="primary" type="submit">

View File

@ -5,10 +5,17 @@ import { reach, StringSchema } from "yup"
import * as API from "../../api/api"
import { Language as FooterLanguage } from "../../components/FormFooter/FormFooter"
import { MockTemplate, MockWorkspace } from "../../testHelpers/entities"
import { history, render } from "../../testHelpers/renderHelpers"
import { renderWithAuth } from "../../testHelpers/renderHelpers"
import CreateWorkspacePage from "./CreateWorkspacePage"
import { Language, validationSchema } from "./CreateWorkspacePageView"
const renderCreateWorkspacePage = () => {
return renderWithAuth(<CreateWorkspacePage />, {
route: "/workspaces/new?template=" + MockTemplate.name,
path: "/workspaces/new",
})
}
const fillForm = async ({ name = "example" }: { name?: string }) => {
const nameField = await screen.findByLabelText(Language.nameLabel)
await userEvent.type(nameField, name)
@ -19,25 +26,21 @@ const fillForm = async ({ name = "example" }: { name?: string }) => {
const nameSchema = reach(validationSchema, "name") as StringSchema
describe("CreateWorkspacePage", () => {
beforeEach(() => {
history.replace("/templates/" + MockTemplate.name + "/new")
})
it("renders", async () => {
render(<CreateWorkspacePage />)
renderCreateWorkspacePage()
const element = await screen.findByText("Create workspace")
expect(element).toBeDefined()
})
it("shows validation error message", async () => {
render(<CreateWorkspacePage />)
renderCreateWorkspacePage()
await fillForm({ name: "$$$" })
const errorMessage = await screen.findByText(Language.nameMatches)
expect(errorMessage).toBeDefined()
})
it("succeeds", async () => {
render(<CreateWorkspacePage />)
renderCreateWorkspacePage()
// You have to spy the method before it is used.
jest.spyOn(API, "createWorkspace").mockResolvedValueOnce(MockWorkspace)
await fillForm({ name: "test" })

View File

@ -1,36 +1,59 @@
import { useMachine } from "@xstate/react"
import React from "react"
import { useNavigate } from "react-router"
import { useParams } from "react-router-dom"
import { createWorkspace } from "../../api/api"
import { templateMachine } from "../../xServices/template/templateXService"
import { useActor, useMachine } from "@xstate/react"
import React, { useContext } from "react"
import { useNavigate, useSearchParams } from "react-router-dom"
import { Template } from "../../api/typesGenerated"
import { createWorkspaceMachine } from "../../xServices/createWorkspace/createWorkspaceXService"
import { XServiceContext } from "../../xServices/StateContext"
import { CreateWorkspacePageView } from "./CreateWorkspacePageView"
const useOrganizationId = () => {
const xServices = useContext(XServiceContext)
const [authState] = useActor(xServices.authXService)
const organizationId = authState.context.me?.organization_ids[0]
if (!organizationId) {
throw new Error("No organization ID found")
}
return organizationId
}
const CreateWorkspacePage: React.FC = () => {
const { template } = useParams()
const [templateState] = useMachine(templateMachine, {
context: {
name: template,
const organizationId = useOrganizationId()
const [searchParams] = useSearchParams()
const preSelectedTemplateName = searchParams.get("template")
const navigate = useNavigate()
const [createWorkspaceState, send] = useMachine(createWorkspaceMachine, {
context: { organizationId, preSelectedTemplateName },
actions: {
onCreateWorkspace: (_, event) => {
navigate("/workspaces/" + event.data.id)
},
},
})
const navigate = useNavigate()
const loading = templateState.hasTag("loading")
if (!templateState.context.template || !templateState.context.templateSchema) {
return null
}
return (
<CreateWorkspacePageView
template={templateState.context.template}
templateSchema={templateState.context.templateSchema}
loading={loading}
onCancel={() => navigate("/templates")}
onSubmit={async (req) => {
if (!templateState.context.template) {
throw new Error("template isn't valid")
}
const workspace = await createWorkspace(templateState.context.template.organization_id, req)
navigate("/workspaces/" + workspace.id)
loadingTemplates={createWorkspaceState.matches("gettingTemplates")}
loadingTemplateSchema={createWorkspaceState.matches("gettingTemplateSchema")}
creatingWorkspace={createWorkspaceState.matches("creatingWorkspace")}
templates={createWorkspaceState.context.templates}
selectedTemplate={createWorkspaceState.context.selectedTemplate}
templateSchema={createWorkspaceState.context.templateSchema}
onCancel={() => {
navigate(preSelectedTemplateName ? "/templates" : "/workspaces")
}}
onSubmit={(request) => {
send({
type: "CREATE_WORKSPACE",
request,
})
}}
onSelectTemplate={(template: Template) => {
send({
type: "SELECT_TEMPLATE",
template,
})
}}
/>
)

View File

@ -1,9 +1,32 @@
import { ComponentMeta, Story } from "@storybook/react"
import React from "react"
import { createParameterSchema } from "../../components/ParameterInput/ParameterInput.stories"
import { ParameterSchema } from "../../api/typesGenerated"
import { MockTemplate } from "../../testHelpers/entities"
import { CreateWorkspacePageView, CreateWorkspacePageViewProps } from "./CreateWorkspacePageView"
const createParameterSchema = (partial: Partial<ParameterSchema>): ParameterSchema => {
return {
id: "000000",
job_id: "000000",
allow_override_destination: false,
allow_override_source: true,
created_at: "",
default_destination_scheme: "none",
default_refresh: "",
default_source_scheme: "data",
default_source_value: "default-value",
name: "parameter name",
description: "Some description!",
redisplay_value: false,
validation_condition: "",
validation_contains: [],
validation_error: "",
validation_type_system: "",
validation_value_type: "",
...partial,
}
}
export default {
title: "pages/CreateWorkspacePageView",
component: CreateWorkspacePageView,
@ -13,13 +36,15 @@ const Template: Story<CreateWorkspacePageViewProps> = (args) => <CreateWorkspace
export const NoParameters = Template.bind({})
NoParameters.args = {
template: MockTemplate,
templates: [MockTemplate],
selectedTemplate: MockTemplate,
templateSchema: [],
}
export const Parameters = Template.bind({})
Parameters.args = {
template: MockTemplate,
templates: [MockTemplate],
selectedTemplate: MockTemplate,
templateSchema: [
createParameterSchema({
name: "region",

View File

@ -1,16 +1,19 @@
import { makeStyles } from "@material-ui/core/styles"
import TextField from "@material-ui/core/TextField"
import MenuItem from "@material-ui/core/MenuItem"
import TextField, { TextFieldProps } from "@material-ui/core/TextField"
import { FormikContextType, useFormik } from "formik"
import React from "react"
import * as Yup from "yup"
import * as TypesGen from "../../api/typesGenerated"
import { FormFooter } from "../../components/FormFooter/FormFooter"
import { FullPageForm } from "../../components/FullPageForm/FullPageForm"
import { Loader } from "../../components/Loader/Loader"
import { Margins } from "../../components/Margins/Margins"
import { ParameterInput } from "../../components/ParameterInput/ParameterInput"
import { Stack } from "../../components/Stack/Stack"
import { getFormHelpers, onChangeTrimmed } from "../../util/formUtils"
export const Language = {
templateLabel: "Template",
nameLabel: "Name",
nameRequired: "Please enter a name.",
nameMatches: "Name must start with a-Z or 0-9 and can contain a-Z, 0-9 or -",
@ -24,12 +27,15 @@ const maxLenName = 32
const usernameRE = /^[a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*$/
export interface CreateWorkspacePageViewProps {
loading?: boolean
template: TypesGen.Template
templateSchema: TypesGen.ParameterSchema[]
loadingTemplates: boolean
loadingTemplateSchema: boolean
creatingWorkspace: boolean
templates?: TypesGen.Template[]
selectedTemplate?: TypesGen.Template
templateSchema?: TypesGen.ParameterSchema[]
onCancel: () => void
onSubmit: (req: TypesGen.CreateWorkspaceRequest) => Promise<void>
onSubmit: (req: TypesGen.CreateWorkspaceRequest) => void
onSelectTemplate: (template: TypesGen.Template) => void
}
export const validationSchema = Yup.object({
@ -40,15 +46,19 @@ export const validationSchema = Yup.object({
})
export const CreateWorkspacePageView: React.FC<CreateWorkspacePageViewProps> = (props) => {
const styles = useStyles()
const [parameterValues, setParameterValues] = React.useState<Record<string, string>>({})
const form: FormikContextType<TypesGen.CreateWorkspaceRequest> = useFormik<TypesGen.CreateWorkspaceRequest>({
initialValues: {
name: "",
template_id: props.template.id,
template_id: props.selectedTemplate ? props.selectedTemplate.id : "",
},
enableReinitialize: true,
validationSchema,
onSubmit: (request) => {
if (!props.templateSchema) {
throw new Error("No template schema loaded")
}
const createRequests: TypesGen.CreateParameterRequest[] = []
props.templateSchema.forEach((schema) => {
let value = schema.default_source_value
@ -70,49 +80,84 @@ export const CreateWorkspacePageView: React.FC<CreateWorkspacePageViewProps> = (
})
const getFieldHelpers = getFormHelpers<TypesGen.CreateWorkspaceRequest>(form)
const handleTemplateChange: TextFieldProps["onChange"] = (event) => {
if (!props.templates) {
throw new Error("Templates are not loaded")
}
const templateId = event.target.value
const selectedTemplate = props.templates.find((template) => template.id === templateId)
if (!selectedTemplate) {
throw new Error(`Template ${templateId} not found`)
}
form.setFieldValue("template_id", selectedTemplate.id)
props.onSelectTemplate(selectedTemplate)
}
return (
<Margins>
<FullPageForm title="Create workspace" onCancel={props.onCancel}>
<form onSubmit={form.handleSubmit}>
<TextField
{...getFieldHelpers("name")}
disabled={form.isSubmitting}
onChange={onChangeTrimmed(form)}
autoFocus
fullWidth
label={Language.nameLabel}
variant="outlined"
/>
{props.templateSchema.length > 0 && (
<div className={styles.parameters}>
{props.templateSchema.map((schema) => (
<ParameterInput
disabled={form.isSubmitting}
key={schema.id}
onChange={(value) => {
setParameterValues({
...parameterValues,
[schema.name]: value,
})
}}
schema={schema}
/>
))}
</div>
)}
{props.loadingTemplates && <Loader />}
<FormFooter onCancel={props.onCancel} isLoading={props.loading || form.isSubmitting} />
<Stack>
{props.templates && (
<TextField
{...getFieldHelpers("template_id")}
disabled={form.isSubmitting}
onChange={handleTemplateChange}
autoFocus
fullWidth
label={Language.templateLabel}
variant="outlined"
select
>
{props.templates.map((template) => (
<MenuItem key={template.id} value={template.id}>
{template.name}
</MenuItem>
))}
</TextField>
)}
{props.selectedTemplate && props.templateSchema && (
<>
<TextField
{...getFieldHelpers("name")}
disabled={form.isSubmitting}
onChange={onChangeTrimmed(form)}
autoFocus
fullWidth
label={Language.nameLabel}
variant="outlined"
/>
{props.templateSchema.length > 0 && (
<Stack>
{props.templateSchema.map((schema) => (
<ParameterInput
disabled={form.isSubmitting}
key={schema.id}
onChange={(value) => {
setParameterValues({
...parameterValues,
[schema.name]: value,
})
}}
schema={schema}
/>
))}
</Stack>
)}
<FormFooter onCancel={props.onCancel} isLoading={props.creatingWorkspace} />
</>
)}
</Stack>
</form>
</FullPageForm>
</Margins>
)
}
const useStyles = makeStyles((theme) => ({
parameters: {
paddingTop: theme.spacing(4),
"& > *": {
marginBottom: theme.spacing(4),
},
},
}))

View File

@ -83,7 +83,11 @@ export const TemplatesPageView: React.FC<TemplatesPageViewProps> = (props) => {
<Avatar variant="square" className={styles.templateAvatar}>
{firstLetter(template.name)}
</Avatar>
<Link component={RouterLink} to={`/templates/${template.name}/new`} className={styles.templateLink}>
<Link
component={RouterLink}
to={`/workspaces/new?template=${template.name}`}
className={styles.templateLink}
>
<b>{template.name}</b>
<span>{template.description}</span>
</Link>

View File

@ -39,7 +39,7 @@ export const WorkspacesPageView: React.FC<WorkspacesPageViewProps> = (props) =>
<Stack spacing={4}>
<Margins>
<div className={styles.actions}>
<Link component={RouterLink} to="/templates">
<Link underline="none" component={RouterLink} to="/workspaces/new">
<Button startIcon={<AddCircleOutline />}>{Language.createButton}</Button>
</Link>
</div>

View File

@ -0,0 +1,171 @@
import { assign, createMachine } from "xstate"
import { createWorkspace, getTemplates, getTemplateVersionSchema } from "../../api/api"
import { CreateWorkspaceRequest, ParameterSchema, Template, Workspace } from "../../api/typesGenerated"
type CreateWorkspaceContext = {
organizationId: string
templates?: Template[]
selectedTemplate?: Template
templateSchema?: ParameterSchema[]
createWorkspaceRequest?: CreateWorkspaceRequest
createdWorkspace?: Workspace
// This is useful when the user wants to create a workspace from the template
// page having it pre selected. It is string or null because of the
// useSearchQuery
preSelectedTemplateName: string | null
}
type CreateWorkspaceEvent =
| {
type: "SELECT_TEMPLATE"
template: Template
}
| {
type: "CREATE_WORKSPACE"
request: CreateWorkspaceRequest
}
export const createWorkspaceMachine = createMachine(
{
id: "createWorkspaceState",
initial: "gettingTemplates",
schema: {
context: {} as CreateWorkspaceContext,
events: {} as CreateWorkspaceEvent,
services: {} as {
getTemplates: {
data: Template[]
}
getTemplateSchema: {
data: ParameterSchema[]
}
createWorkspace: {
data: Workspace
}
},
},
tsTypes: {} as import("./createWorkspaceXService.typegen").Typegen0,
states: {
gettingTemplates: {
invoke: {
src: "getTemplates",
onDone: [
{
actions: ["assignTemplates", "assignPreSelectedTemplate"],
target: "gettingTemplateSchema",
cond: "hasValidPreSelectedTemplate",
},
{
actions: ["assignTemplates"],
target: "selectingTemplate",
},
],
onError: {
target: "error",
},
},
},
selectingTemplate: {
on: {
SELECT_TEMPLATE: {
actions: ["assignSelectedTemplate"],
target: "gettingTemplateSchema",
},
},
},
gettingTemplateSchema: {
invoke: {
src: "getTemplateSchema",
onDone: {
actions: ["assignTemplateSchema"],
target: "fillingParams",
},
onError: {
target: "error",
},
},
},
fillingParams: {
on: {
CREATE_WORKSPACE: {
actions: ["assignCreateWorkspaceRequest"],
target: "creatingWorkspace",
},
},
},
creatingWorkspace: {
invoke: {
src: "createWorkspace",
onDone: {
actions: ["onCreateWorkspace"],
target: "created",
},
onError: {
target: "error",
},
},
},
created: {
type: "final",
},
error: {},
},
},
{
services: {
getTemplates: (context) => getTemplates(context.organizationId),
getTemplateSchema: (context) => {
const { selectedTemplate } = context
if (!selectedTemplate) {
throw new Error("No selected template")
}
return getTemplateVersionSchema(selectedTemplate.active_version_id)
},
createWorkspace: (context) => {
const { createWorkspaceRequest, organizationId } = context
if (!createWorkspaceRequest) {
throw new Error("No create workspace request")
}
return createWorkspace(organizationId, createWorkspaceRequest)
},
},
guards: {
hasValidPreSelectedTemplate: (ctx, event) => {
if (!ctx.preSelectedTemplateName) {
return false
}
const template = event.data.find((template) => template.name === ctx.preSelectedTemplateName)
return !!template
},
},
actions: {
assignTemplates: assign({
templates: (_, event) => event.data,
}),
assignSelectedTemplate: assign({
selectedTemplate: (_, event) => event.template,
}),
assignTemplateSchema: assign({
templateSchema: (_, event) => event.data,
}),
assignCreateWorkspaceRequest: assign({
createWorkspaceRequest: (_, event) => event.request,
}),
assignPreSelectedTemplate: assign({
selectedTemplate: (ctx, event) => {
const selectedTemplate = event.data.find((template) => template.name === ctx.preSelectedTemplateName)
// The proper validation happens on hasValidPreSelectedTemplate
if (!selectedTemplate) {
throw new Error("Invalid template selected")
}
return selectedTemplate
},
}),
},
},
)

View File

@ -1,167 +0,0 @@
import { assign, createMachine } from "xstate"
import * as API from "../../api/api"
import * as TypesGen from "../../api/typesGenerated"
interface TemplateContext {
name: string
organizations?: TypesGen.Organization[]
organizationsError?: Error | unknown
template?: TypesGen.Template
templateError?: Error | unknown
templateVersion?: TypesGen.TemplateVersion
templateVersionError?: Error | unknown
templateSchema?: TypesGen.ParameterSchema[]
templateSchemaError?: Error | unknown
}
export const templateMachine = createMachine(
{
tsTypes: {} as import("./templateXService.typegen").Typegen0,
schema: {
context: {} as TemplateContext,
services: {} as {
getOrganizations: {
data: TypesGen.Organization[]
}
getTemplate: {
data: TypesGen.Template
}
getTemplateVersion: {
data: TypesGen.TemplateVersion
}
getTemplateSchema: {
data: TypesGen.ParameterSchema[]
}
},
},
id: "templateState",
initial: "gettingOrganizations",
states: {
gettingOrganizations: {
entry: "clearOrganizationsError",
invoke: {
src: "getOrganizations",
id: "getOrganizations",
onDone: [
{
actions: ["assignOrganizations", "clearOrganizationsError"],
target: "gettingTemplate",
},
],
onError: [
{
actions: "assignOrganizationsError",
target: "error",
},
],
},
tags: "loading",
},
gettingTemplate: {
entry: "clearTemplateError",
invoke: {
src: "getTemplate",
id: "getTemplate",
onDone: {
target: "gettingTemplateVersion",
actions: ["assignTemplate", "clearTemplateError"],
},
onError: {
target: "error",
actions: "assignTemplateError",
},
},
tags: "loading",
},
gettingTemplateVersion: {
entry: "clearTemplateVersionError",
invoke: {
src: "getTemplateVersion",
id: "getTemplateVersion",
onDone: {
target: "gettingTemplateSchema",
actions: ["assignTemplateVersion", "clearTemplateVersionError"],
},
onError: {
target: "error",
actions: "assignTemplateVersionError",
},
},
},
gettingTemplateSchema: {
entry: "clearTemplateSchemaError",
invoke: {
src: "getTemplateSchema",
id: "getTemplateSchema",
onDone: {
target: "done",
actions: ["assignTemplateSchema", "clearTemplateSchemaError"],
},
onError: {
target: "error",
actions: "assignTemplateSchemaError",
},
},
},
done: {},
error: {},
},
},
{
actions: {
assignOrganizations: assign({
organizations: (_, event) => event.data,
}),
assignOrganizationsError: assign({
organizationsError: (_, event) => event.data,
}),
clearOrganizationsError: assign((context) => ({
...context,
organizationsError: undefined,
})),
assignTemplate: assign({
template: (_, event) => event.data,
}),
assignTemplateError: assign({
templateError: (_, event) => event.data,
}),
clearTemplateError: (context) => assign({ ...context, templateError: undefined }),
assignTemplateVersion: assign({
templateVersion: (_, event) => event.data,
}),
assignTemplateVersionError: assign({
templateVersionError: (_, event) => event.data,
}),
clearTemplateVersionError: (context) => assign({ ...context, templateVersionError: undefined }),
assignTemplateSchema: assign({
templateSchema: (_, event) => event.data,
}),
assignTemplateSchemaError: assign({
templateSchemaError: (_, event) => event.data,
}),
clearTemplateSchemaError: (context) => assign({ ...context, templateSchemaError: undefined }),
},
services: {
getOrganizations: API.getOrganizations,
getTemplate: async (context) => {
if (!context.organizations || context.organizations.length === 0) {
throw new Error("no organizations")
}
return API.getTemplateByName(context.organizations[0].id, context.name)
},
getTemplateVersion: async (context) => {
if (!context.template) {
throw new Error("no template")
}
return API.getTemplateVersion(context.template.active_version_id)
},
getTemplateSchema: async (context) => {
if (!context.templateVersion) {
throw new Error("no template version")
}
return API.getTemplateVersionSchema(context.templateVersion.id)
},
},
},
)