{JSON.stringify(organizations)}

- Date: Tue, 25 Jan 2022 06:25:52 +0000 Subject: [PATCH 05/12] Remove extra code --- site/components/Form/FormDropdownField.tsx | 32 +--------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/site/components/Form/FormDropdownField.tsx b/site/components/Form/FormDropdownField.tsx index 9271aac415838..3d3ccf87bcf3f 100644 --- a/site/components/Form/FormDropdownField.tsx +++ b/site/components/Form/FormDropdownField.tsx @@ -52,34 +52,4 @@ const useStyles = makeStyles({ hintText: { opacity: 0.75, }, -}) - -/* - handleSelectPool(ev.target.value)} - value={selectedPool ? selectedPool.name : ""} - disabled={fieldIsDisabled} - required - label="Workspace provider" - select -> - {poolsSorted.map((pool: UIResourcePoolWithRegion) => ( - - - - - {pool.name} - - {pool.region !== null && ( - - - {pool.region} - - - )} - - - ))} -*/ +}) \ No newline at end of file From 35ddcab9564656a924bb87a4af98fd291e1241bc Mon Sep 17 00:00:00 2001 From: Bryan Phelps Date: Tue, 25 Jan 2022 19:27:19 +0000 Subject: [PATCH 06/12] Hook up cancel button --- site/api.ts | 1 - site/components/Form/FormDropdownField.tsx | 2 +- site/pages/projects/create.tsx | 8 +++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/site/api.ts b/site/api.ts index bb21a5ff6c3e7..3c9bb4390ee52 100644 --- a/site/api.ts +++ b/site/api.ts @@ -39,7 +39,6 @@ export interface Project { active_version_id: string } ->>>>>>> main export const login = async (email: string, password: string): Promise => { const response = await fetch("/api/v2/login", { method: "POST", diff --git a/site/components/Form/FormDropdownField.tsx b/site/components/Form/FormDropdownField.tsx index 3d3ccf87bcf3f..83d9404afa668 100644 --- a/site/components/Form/FormDropdownField.tsx +++ b/site/components/Form/FormDropdownField.tsx @@ -52,4 +52,4 @@ const useStyles = makeStyles({ hintText: { opacity: 0.75, }, -}) \ No newline at end of file +}) diff --git a/site/pages/projects/create.tsx b/site/pages/projects/create.tsx index 5424e3eda9148..b37442ccb8d70 100644 --- a/site/pages/projects/create.tsx +++ b/site/pages/projects/create.tsx @@ -1,5 +1,6 @@ import React from "react" import { makeStyles } from "@material-ui/core/styles" +import { useRouter } from "next/router" import useSWR from "swr" import { provisioners } from "../../api" @@ -8,6 +9,7 @@ import { FullScreenLoader } from "../../components/Loader/FullScreenLoader" import { CreateProjectForm } from "../../forms/CreateProjectForm" const CreateProjectPage: React.FC = () => { + const router = useRouter() const styles = useStyles() const { me } = useUser(true) const { data: organizations, error } = useSWR("/api/v2/users/me/organizations") @@ -21,13 +23,17 @@ const CreateProjectPage: React.FC = () => { return } + const onCancel = async () => { + await router.push("/projects") + } + return (

alert(JSON.stringify(request))} - onCancel={() => alert("Cancelled")} + onCancel={onCancel} />

) From 502a034ee3c75561df5d8d3ce529db229ba2c0ec Mon Sep 17 00:00:00 2001 From: Bryan Phelps Date: Tue, 25 Jan 2022 19:45:50 +0000 Subject: [PATCH 07/12] Wire up more to the create form --- site/api.ts | 28 +++++++++++++++++++++++++ site/forms/CreateProjectForm.tsx | 35 ++++++++++++++++++-------------- site/pages/projects/create.tsx | 16 ++++++++++----- 3 files changed, 59 insertions(+), 20 deletions(-) diff --git a/site/api.ts b/site/api.ts index 3c9bb4390ee52..f8c3ae330ebe8 100644 --- a/site/api.ts +++ b/site/api.ts @@ -1,3 +1,5 @@ +import { mutate } from "swr" + interface LoginResponse { session_token: string } @@ -39,6 +41,32 @@ export interface Project { active_version_id: string } +export interface CreateProjectRequest { + name: string + organizationId: string + provisioner: string +} + +export namespace Project { + export const create = async (request: CreateProjectRequest): Promise => { + const response = await fetch(`/api/v2/projects/${request.organizationId}/`, { + method: "POST", + headers: { + "Content-Type": "application/json", + }, + body: JSON.stringify(request), + }) + + const body = await response.json() + await mutate("/api/v2/projects") + if (!response.ok) { + throw new Error(body.message) + } + + return body + } +} + export const login = async (email: string, password: string): Promise => { const response = await fetch("/api/v2/login", { method: "POST", diff --git a/site/forms/CreateProjectForm.tsx b/site/forms/CreateProjectForm.tsx index 33e8f99860859..b661c58c637fb 100644 --- a/site/forms/CreateProjectForm.tsx +++ b/site/forms/CreateProjectForm.tsx @@ -12,23 +12,17 @@ import { DropdownItem, } from "../components/Form" -import { Organization, Provisioner } from "./../api" - -export interface CreateProjectRequest { - provisionerId: string - organizationId: string - name: string -} +import { Organization, Project, Provisioner, CreateProjectRequest } from "./../api" export interface CreateProjectFormProps { provisioners: Provisioner[] organizations: Organization[] - onSubmit: (request: CreateProjectRequest) => Promise + onSubmit: (request: CreateProjectRequest) => Promise onCancel: () => void } const validationSchema = Yup.object({ - provisionerId: Yup.string().required("Email is required."), + provisioner: Yup.string().required("Provisioner is required."), organizationId: Yup.string().required("Organization is required."), name: Yup.string().required("Name is required"), }) @@ -46,18 +40,20 @@ export const CreateProjectForm: React.FC = ({ const form = useFormik({ initialValues: { - provisionerId: provisioners[0].id, - organizationId: organizations[0].id, + provisioner: provisioners[0].id, + organizationId: organizations[0].name, name: "", }, enableReinitialize: true, validationSchema: validationSchema, - onSubmit: onSubmit, + onSubmit: (req) => { + return onSubmit(req) + }, }) const organizationDropDownItems: DropdownItem[] = organizations.map((org) => { return { - value: org.id, + value: org.name, name: org.name, } }) @@ -100,7 +96,7 @@ export const CreateProjectForm: React.FC = ({ = ({ -