16159: Merge branch 'master' into 16159-logout-request-with-token

[arvados.git] / src / views-components / dialog-create / dialog-project-create.tsx

diff --git a/src/views-components/dialog-create/dialog-project-create.tsx b/src/views-components/dialog-create/dialog-project-create.tsx
index 3075d96e4b722f42c4c248ee65a7d844c13bdeef..c835e04e572b071479bb99186dfee7ca61f7ac46 100644 (file)
--- a/src/views-components/dialog-create/dialog-project-create.tsx
+++ b/src/views-components/dialog-create/dialog-project-create.tsx
@@ -8,10 +8,13 @@ import { WithDialogProps } from '~/store/dialog/with-dialog';
 import { ProjectCreateFormDialogData } from '~/store/projects/project-create-actions';
 import { FormDialog } from '~/components/form-dialog/form-dialog';
 import { ProjectNameField, ProjectDescriptionField } from '~/views-components/form-fields/project-form-fields';
+import { CreateProjectPropertiesForm } from '~/views-components/project-properties/create-project-properties-form';
+import { CreateProjectPropertiesList } from '~/views-components/project-properties/create-project-properties-list';
+import { ResourceParentField } from '../form-fields/resource-form-fields';
 
-type DialogCollectionProps = WithDialogProps<{}> & InjectedFormProps<ProjectCreateFormDialogData>;
+type DialogProjectProps = WithDialogProps<{}> & InjectedFormProps<ProjectCreateFormDialogData>;
 
-export const DialogProjectCreate = (props: DialogCollectionProps) =>
+export const DialogProjectCreate = (props: DialogProjectProps) =>
     <FormDialog
         dialogTitle='New project'
         formFields={ProjectAddFields}
@@ -20,6 +23,9 @@ export const DialogProjectCreate = (props: DialogCollectionProps) =>
     />;
 
 const ProjectAddFields = () => <span>
+    <ResourceParentField />
     <ProjectNameField />
     <ProjectDescriptionField />
+    <CreateProjectPropertiesForm />
+    <CreateProjectPropertiesList />
 </span>;