Skip to content

Commit

Permalink
fix: Hide Issuance when no issuances/ added verification report date
Browse files Browse the repository at this point in the history
  • Loading branch information
@SPageot
SPageot committed Mar 9, 2022
1 parent 716a42d commit 774e4c8
Show file tree
Hide file tree
Showing 4 changed files with 190 additions and 130 deletions.
95 changes: 54 additions & 41 deletions src/components/forms/CreateProjectIssuancesForm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import {
SelectStateEnum,
DateVariantEnum,
Select,
SpanTwoColumnsContainer,
} from '..';

const CreateProjectIssuancesForm = ({ value, onChange }) => {
Expand Down Expand Up @@ -112,47 +113,59 @@ const CreateProjectIssuancesForm = ({ value, onChange }) => {
<ModalFormContainerStyle>
<FormContainerStyle>
<BodyContainer>
<StyledFieldContainer>
<StyledLabelContainer>
<Body>
<LabelContainer>
<FormattedMessage id="select-existing-issuance" />
</LabelContainer>
<ToolTipContainer
tooltip={intl.formatMessage({
id: isUserOnUnitsPage
? 'select-existing-issuance'
: 'select-existing-issuance-description',
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
</StyledLabelContainer>
<InputContainer>
<Select
size={SelectSizeEnum.large}
type={SelectTypeEnum.basic}
options={issuancesSelectOptions ? issuancesSelectOptions : []}
state={SelectStateEnum.default}
selected={
value.id
? [{ value: value.id, label: getIssuanceLabel(value) }]
: undefined
}
onChange={selectedOptions =>
updateIssuanceById(selectedOptions[0].value)
}
/>
</InputContainer>
{isUserOnUnitsPage && issuancesSelectOptions === null && (
<Body size="Small" color="red">
{intl.formatMessage({
id: 'add-project-with-issuance',
})}
</Body>
)}
</StyledFieldContainer>
<div></div>
{issuancesSelectOptions && (
<>
<SpanTwoColumnsContainer>
<StyledFieldContainer>
<StyledLabelContainer>
<Body>
<LabelContainer>
<FormattedMessage id="select-existing-issuance" />
</LabelContainer>
<ToolTipContainer
tooltip={intl.formatMessage({
id: isUserOnUnitsPage
? 'select-existing-issuance'
: 'select-existing-issuance-description',
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
</StyledLabelContainer>
<InputContainer>
<Select
size={SelectSizeEnum.large}
type={SelectTypeEnum.basic}
options={
issuancesSelectOptions ? issuancesSelectOptions : []
}
state={SelectStateEnum.default}
selected={
value.id
? [
{
value: value.id,
label: getIssuanceLabel(value),
},
]
: undefined
}
onChange={selectedOptions =>
updateIssuanceById(selectedOptions[0].value)
}
/>
</InputContainer>
{isUserOnUnitsPage && issuancesSelectOptions === null && (
<Body size="Small" color="red">
{intl.formatMessage({
id: 'add-project-with-issuance',
})}
</Body>
)}
</StyledFieldContainer>
</SpanTwoColumnsContainer>
</>
)}
<StyledFieldContainer>
<StyledLabelContainer>
<Body>
Expand Down
134 changes: 91 additions & 43 deletions src/components/forms/CreateUnitIssuanceForm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import {
SelectStateEnum,
DateVariantEnum,
Select,
SpanTwoColumnsContainer,
} from '..';

const CreateUnitIssuanceForm = ({ value, onChange }) => {
Expand Down Expand Up @@ -105,56 +106,69 @@ const CreateUnitIssuanceForm = ({ value, onChange }) => {
};

useEffect(() => {
if(validateForm && formType === 'issuances'){
setValidationErrors(issuanceSchema, value, setErrorIssuanceMessage);
if (validateForm && formType === 'issuances') {
setValidationErrors(issuanceSchema, value, setErrorIssuanceMessage);
}
}, [value, validateForm, formType]);

return (
<ModalFormContainerStyle>
<FormContainerStyle>
<BodyContainer>
<StyledFieldContainer>
<StyledLabelContainer>
<Body>
<LabelContainer>
<FormattedMessage id="select-existing-issuance" />
</LabelContainer>
<ToolTipContainer
tooltip={intl.formatMessage({
id: isUserOnUnitsPage
? 'select-existing-issuance'
: 'select-existing-issuance-description',
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
</StyledLabelContainer>
<InputContainer>
<Select
size={SelectSizeEnum.large}
type={SelectTypeEnum.basic}
options={issuancesSelectOptions ? issuancesSelectOptions : []}
state={SelectStateEnum.default}
selected={
value.id
? [{ value: value.id, label: getIssuanceLabel(value) }]
: undefined
}
onChange={selectedOptions =>
updateIssuanceById(selectedOptions[0].value)
}
/>
</InputContainer>
{isUserOnUnitsPage && issuancesSelectOptions === null && (
<Body size="Small" color="red">
{intl.formatMessage({
id: 'add-project-with-issuance',
})}
</Body>
)}
</StyledFieldContainer>
<div></div>
{issuancesSelectOptions && (
<>
<SpanTwoColumnsContainer>
<StyledFieldContainer>
<StyledLabelContainer>
<Body>
<LabelContainer>
<FormattedMessage id="select-existing-issuance" />
</LabelContainer>
<ToolTipContainer
tooltip={intl.formatMessage({
id: isUserOnUnitsPage
? 'select-existing-issuance'
: 'select-existing-issuance-description',
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
</StyledLabelContainer>
<InputContainer>
<Select
size={SelectSizeEnum.large}
type={SelectTypeEnum.basic}
options={
issuancesSelectOptions ? issuancesSelectOptions : []
}
state={SelectStateEnum.default}
selected={
value.id
? [
{
value: value.id,
label: getIssuanceLabel(value),
},
]
: undefined
}
onChange={selectedOptions =>
updateIssuanceById(selectedOptions[0].value)
}
/>
</InputContainer>
{isUserOnUnitsPage && issuancesSelectOptions === null && (
<Body size="Small" color="red">
{intl.formatMessage({
id: 'add-project-with-issuance',
})}
</Body>
)}
</StyledFieldContainer>
</SpanTwoColumnsContainer>
</>
)}

<StyledFieldContainer>
<StyledLabelContainer>
<Body>
Expand Down Expand Up @@ -288,6 +302,40 @@ const CreateUnitIssuanceForm = ({ value, onChange }) => {
</Body>
)}
</StyledFieldContainer>
<StyledFieldContainer>
<StyledLabelContainer>
<Body>
<LabelContainer>
*<FormattedMessage id="verification-report-date" />
</LabelContainer>
<ToolTipContainer
tooltip={intl.formatMessage({
id: 'issuances-verification-report-date-description',
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
</StyledLabelContainer>
<InputContainer>
<DateSelect
variant={
errorIssuanceMessage?.verificationReportDate &&
DateVariantEnum.error
}
size="large"
dateValue={value.verificationReportDate}
setDateValue={changeValue =>
onInputChange('verificationReportDate', changeValue)
}
disabled={areFieldsDisabled ? true : undefined}
/>
</InputContainer>
{errorIssuanceMessage?.verificationReportDate && (
<Body size="Small" color="red">
{errorIssuanceMessage.verificationReportDate}
</Body>
)}
</StyledFieldContainer>
<StyledFieldContainer>
<StyledLabelContainer>
<Body>
Expand Down
90 changes: 45 additions & 45 deletions src/components/forms/ProjectDetailsForm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,6 @@ const ProjectDetailsForm = ({ projectDetails, setProjectDetails }) => {
</Body>
)}
</StyledFieldContainer>
<div></div>
<SpanTwoColumnsContainer>
<StyledFieldContainer>
<StyledLabelContainer>
Expand Down Expand Up @@ -505,50 +504,51 @@ const ProjectDetailsForm = ({ projectDetails, setProjectDetails }) => {
)}
</StyledFieldContainer>
</SpanTwoColumnsContainer>
<StyledFieldContainer>
<StyledLabelContainer>
<Body>
<LabelContainer>
*<FormattedMessage id="current-registry" />
</LabelContainer>
<ToolTipContainer
tooltip={intl.formatMessage({
id: 'projects-current-registry-description',
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
</StyledLabelContainer>
<InputContainer>
<SimpleSelect
variant={
errorProjectMessage?.currentRegistry &&
SimpleSelectVariantEnum.error
}
size={SimpleSelectSizeEnum.large}
type={SimpleSelectTypeEnum.basic}
options={pickLists.registries}
state={SimpleSelectStateEnum.default}
selected={
projectDetails.currentRegistry
? [projectDetails.currentRegistry]
: undefined
}
onChange={selectedOptions =>
setProjectDetails(prev => ({
...prev,
currentRegistry: selectedOptions[0],
}))
}
/>
</InputContainer>
{errorProjectMessage?.currentRegistry && (
<Body size="Small" color="red">
{errorProjectMessage.currentRegistry}
</Body>
)}
</StyledFieldContainer>
<div></div>
<SpanTwoColumnsContainer>
<StyledFieldContainer>
<StyledLabelContainer>
<Body>
<LabelContainer>
*<FormattedMessage id="current-registry" />
</LabelContainer>
<ToolTipContainer
tooltip={intl.formatMessage({
id: 'projects-current-registry-description',
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
</StyledLabelContainer>
<InputContainer>
<SimpleSelect
variant={
errorProjectMessage?.currentRegistry &&
SimpleSelectVariantEnum.error
}
size={SimpleSelectSizeEnum.large}
type={SimpleSelectTypeEnum.basic}
options={pickLists.registries}
state={SimpleSelectStateEnum.default}
selected={
projectDetails.currentRegistry
? [projectDetails.currentRegistry]
: undefined
}
onChange={selectedOptions =>
setProjectDetails(prev => ({
...prev,
currentRegistry: selectedOptions[0],
}))
}
/>
</InputContainer>
{errorProjectMessage?.currentRegistry && (
<Body size="Small" color="red">
{errorProjectMessage.currentRegistry}
</Body>
)}
</StyledFieldContainer>
</SpanTwoColumnsContainer>
<StyledFieldContainer>
<StyledLabelContainer>
<Body>
Expand Down
1 change: 0 additions & 1 deletion src/components/forms/UnitDetailsForm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,6 @@ const UnitDetailsForm = ({ unitDetails, setUnitDetails }) => {
</Body>
)}
</StyledFieldContainer>
<div></div>
<HrSpanTwoColumnsContainer>
<hr />
</HrSpanTwoColumnsContainer>
Expand Down

0 comments on commit 774e4c8

Please sign in to comment.