From c44a1eb173e91df953d8bd90cf53df6395c02d56 Mon Sep 17 00:00:00 2001 From: Daniel Stefan Date: Wed, 9 Feb 2022 15:24:41 +0200 Subject: [PATCH] feat: populate all dropdowns with picklists --- src/components/forms/CreateProjectForm.js | 34 +++++++++++++++++----- src/components/forms/EditProjectsForm.js | 35 +++++++++++++++++------ 2 files changed, 54 insertions(+), 15 deletions(-) diff --git a/src/components/forms/CreateProjectForm.js b/src/components/forms/CreateProjectForm.js index 70d3c4e5..dcf0c685 100644 --- a/src/components/forms/CreateProjectForm.js +++ b/src/components/forms/CreateProjectForm.js @@ -109,6 +109,15 @@ const CreateProjectForm = withRouter( [pickLists], ); + const selectProjectSectorOptions = useMemo( + () => + pickLists.projectSector.map(projectSectorItem => ({ + value: projectSectorItem, + label: projectSectorItem, + })), + [pickLists], + ); + const handleSubmit = () => { if (tabValue === 5) { const dataToSend = _.cloneDeep(newProject); @@ -455,17 +464,28 @@ const CreateProjectForm = withRouter( - + selected={ + newProject.sector + ? [ + { + label: newProject.sector, + value: newProject.sector, + }, + ] + : undefined + } + onChange={selectedOptions => setNewProject(prev => ({ ...prev, - sector: value, + sector: selectedOptions[0].value, })) } /> diff --git a/src/components/forms/EditProjectsForm.js b/src/components/forms/EditProjectsForm.js index 1c0cf260..0adda3a3 100644 --- a/src/components/forms/EditProjectsForm.js +++ b/src/components/forms/EditProjectsForm.js @@ -82,7 +82,15 @@ const EditProjectsForm = ({ onClose }) => { [pickLists], ); - //projectSector + const selectProjectSectorOptions = useMemo( + () => + pickLists.projectSector.map(projectSectorItem => ({ + value: projectSectorItem, + label: projectSectorItem, + })), + [pickLists], + ); + //projectStatusValues //registries @@ -470,17 +478,28 @@ const EditProjectsForm = ({ onClose }) => { - + selected={ + climatewarehouseProjects.sector + ? [ + { + label: climatewarehouseProjects.sector, + value: climatewarehouseProjects.sector, + }, + ] + : undefined + } + onChange={selectedOptions => setEditProjects(prev => ({ ...prev, - sector: value, + sector: selectedOptions[0].value, })) } />