Skip to content

Commit

Permalink
feat: populate all dropdowns with picklists
Browse files Browse the repository at this point in the history
  • Loading branch information
danielstefanequilobe committed Feb 9, 2022
1 parent 14a8e42 commit c44a1eb
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 15 deletions.
34 changes: 27 additions & 7 deletions src/components/forms/CreateProjectForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -455,17 +464,28 @@ const CreateProjectForm = withRouter(
</Body>
</StyledLabelContainer>
<InputContainer>
<StandardInput
size={InputSizeEnum.large}
placeholderText={intl.formatMessage({
<Select
size={SelectSizeEnum.large}
type={SelectTypeEnum.basic}
options={selectProjectSectorOptions}
state={SelectStateEnum.default}
placeholder={intl.formatMessage({
id: 'sector',
})}
state={InputStateEnum.default}
value={newProject.sector}
onChange={value =>
selected={
newProject.sector
? [
{
label: newProject.sector,
value: newProject.sector,
},
]
: undefined
}
onChange={selectedOptions =>
setNewProject(prev => ({
...prev,
sector: value,
sector: selectedOptions[0].value,
}))
}
/>
Expand Down
35 changes: 27 additions & 8 deletions src/components/forms/EditProjectsForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,15 @@ const EditProjectsForm = ({ onClose }) => {
[pickLists],
);

//projectSector
const selectProjectSectorOptions = useMemo(
() =>
pickLists.projectSector.map(projectSectorItem => ({
value: projectSectorItem,
label: projectSectorItem,
})),
[pickLists],
);

//projectStatusValues
//registries

Expand Down Expand Up @@ -470,17 +478,28 @@ const EditProjectsForm = ({ onClose }) => {
</Body>
</StyledLabelContainer>
<InputContainer>
<StandardInput
size={InputSizeEnum.large}
placeholderText={intl.formatMessage({
<Select
size={SelectSizeEnum.large}
type={SelectTypeEnum.basic}
options={selectProjectSectorOptions}
state={SelectStateEnum.default}
placeholder={intl.formatMessage({
id: 'sector',
})}
state={InputStateEnum.default}
value={editedProjects.sector}
onChange={value =>
selected={
climatewarehouseProjects.sector
? [
{
label: climatewarehouseProjects.sector,
value: climatewarehouseProjects.sector,
},
]
: undefined
}
onChange={selectedOptions =>
setEditProjects(prev => ({
...prev,
sector: value,
sector: selectedOptions[0].value,
}))
}
/>
Expand Down

0 comments on commit c44a1eb

Please sign in to comment.