Fix some compilation issues

bryphe-coder · bryphe-coder · commit 840a796288ef · 2022-01-20T05:44:56.000Z
diff --git a/site/components/Form/FormTextField.tsx b/site/components/Form/FormTextField.tsx
@@ -35,7 +35,6 @@ export interface FormTextFieldProps<T>
       | "SelectProps"
       | "style"
       | "type"
-      | "variant"
     >,
     FormFieldProps<T> {
   /**
diff --git a/site/components/PageTemplates/LoadingPage.tsx b/site/components/PageTemplates/LoadingPage.tsx
@@ -29,7 +29,7 @@ const useStyles = makeStyles(() => ({
  * Finally, if the request succeeds, we use the Render Prop pattern to pass it off:
  * https://reactjs.org/docs/render-props.html
  */
-export const LoadingPage: React.FC<LoadingPageProps<T>> = <T,>(props: LoadingPageProps<T>) => {
+export const LoadingPage = <T,>(props: LoadingPageProps<T>): React.ReactElement<any, any> => {
   const styles = useStyles()
 
   const { request, render } = props
diff --git a/site/pages/workspaces/create/[projectId].tsx b/site/pages/workspaces/create/[projectId].tsx
@@ -1,7 +1,7 @@
 import React from "react"
 import { useRouter } from "next/router"
 import { useFormik } from "formik"
-import { firstOrOnly } from "./../../../util"
+import { firstOrOnly, subForm, FormikLike } from "./../../../util"
 
 import * as API from "../../../api"
 
@@ -24,6 +24,7 @@ namespace CreateProjectForm {
 }
 
 const FormTextField = formTextFieldFactory<CreateProjectForm.Schema>()
+const ParameterTextField = formTextFieldFactory<Record<string, string>>()
 
 namespace Helpers {
   /**
@@ -68,6 +69,8 @@ const CreateProjectPage: React.FC = () => {
     },
   })
 
+  const parametersForm: FormikLike<Record<string, string>> = subForm(form, "parameters")
+
   const cancel = () => {
     router.push(`/workspaces/create`)
   }
@@ -78,7 +81,7 @@ const CreateProjectPage: React.FC = () => {
   }
 
   return (
-    <LoadingPage
+    <LoadingPage<API.Project>
       request={projectToLoad}
       render={(project) => {
         const buttons: FormButton[] = [
@@ -125,9 +128,9 @@ const CreateProjectPage: React.FC = () => {
               {parametersWithMetadata.map((param) => {
                 return (
                   <FormRow>
-                    <FormTextField
-                      form={form}
-                      formFieldName={"parameters." + param.id}
+                    <ParameterTextField
+                      form={parametersForm}
+                      formFieldName={param.id}
                       fullWidth
                       label={param.name}
                       helperText={param.description}
