Skip to content

Commit

Permalink
fix: Unit Status Reason optional
Browse files Browse the repository at this point in the history
  • Loading branch information
@SPageot
SPageot committed Jun 22, 2022
1 parent 5546808 commit bd1c3dc
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 46 deletions.
60 changes: 19 additions & 41 deletions src/components/forms/UnitDetailsForm.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,7 @@ const UnitDetailsForm = ({ unitDetails, setUnitDetails }) => {
<ToolTipContainer
tooltip={intl.formatMessage({
id: 'select-existing-project',
})}
>
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
Expand Down Expand Up @@ -211,8 +210,7 @@ const UnitDetailsForm = ({ unitDetails, setUnitDetails }) => {
<ToolTipContainer
tooltip={intl.formatMessage({
id: 'units-project-location-id-description',
})}
>
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
Expand Down Expand Up @@ -265,8 +263,7 @@ const UnitDetailsForm = ({ unitDetails, setUnitDetails }) => {
<ToolTipContainer
tooltip={intl.formatMessage({
id: 'units-unit-owner-description',
})}
>
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
Expand Down Expand Up @@ -305,8 +302,7 @@ const UnitDetailsForm = ({ unitDetails, setUnitDetails }) => {
<ToolTipContainer
tooltip={intl.formatMessage({
id: 'units-unit-block-start-description',
})}
>
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
Expand Down Expand Up @@ -347,8 +343,7 @@ const UnitDetailsForm = ({ unitDetails, setUnitDetails }) => {
<ToolTipContainer
tooltip={intl.formatMessage({
id: 'units-unit-block-end-description',
})}
>
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
Expand Down Expand Up @@ -389,8 +384,7 @@ const UnitDetailsForm = ({ unitDetails, setUnitDetails }) => {
<ToolTipContainer
tooltip={intl.formatMessage({
id: 'units-unit-count-description',
})}
>
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
Expand Down Expand Up @@ -429,8 +423,7 @@ const UnitDetailsForm = ({ unitDetails, setUnitDetails }) => {
<ToolTipContainer
tooltip={intl.formatMessage({
id: 'units-in-country-jurisdiction-of-owner-description',
})}
>
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
Expand Down Expand Up @@ -471,8 +464,7 @@ const UnitDetailsForm = ({ unitDetails, setUnitDetails }) => {
<ToolTipContainer
tooltip={intl.formatMessage({
id: 'units-country-jurisdiction-of-owner-description',
})}
>
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
Expand Down Expand Up @@ -515,8 +507,7 @@ const UnitDetailsForm = ({ unitDetails, setUnitDetails }) => {
<ToolTipContainer
tooltip={intl.formatMessage({
id: 'units-unit-type-description',
})}
>
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
Expand Down Expand Up @@ -556,8 +547,7 @@ const UnitDetailsForm = ({ unitDetails, setUnitDetails }) => {
<ToolTipContainer
tooltip={intl.formatMessage({
id: 'units-unit-status-description',
})}
>
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
Expand Down Expand Up @@ -593,16 +583,12 @@ const UnitDetailsForm = ({ unitDetails, setUnitDetails }) => {
<StyledLabelContainer>
<Body color={'#262626'}>
<LabelContainer>
{['cancelled', 'retired'].includes(
unitDetails?.unitStatus?.toLowerCase(),
) && '*'}
<FormattedMessage id="unit-status-reason" />
</LabelContainer>
<ToolTipContainer
tooltip={intl.formatMessage({
id: 'units-unit-status-reason-description',
})}
>
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
Expand Down Expand Up @@ -643,8 +629,7 @@ const UnitDetailsForm = ({ unitDetails, setUnitDetails }) => {
<ToolTipContainer
tooltip={intl.formatMessage({
id: 'units-unit-registry-link-description',
})}
>
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
Expand Down Expand Up @@ -684,8 +669,7 @@ const UnitDetailsForm = ({ unitDetails, setUnitDetails }) => {
<ToolTipContainer
tooltip={intl.formatMessage({
id: 'units-vintage-year-description',
})}
>
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
Expand Down Expand Up @@ -725,8 +709,7 @@ const UnitDetailsForm = ({ unitDetails, setUnitDetails }) => {
<ToolTipContainer
tooltip={intl.formatMessage({
id: 'units-marketplace-description',
})}
>
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
Expand Down Expand Up @@ -765,8 +748,7 @@ const UnitDetailsForm = ({ unitDetails, setUnitDetails }) => {
<ToolTipContainer
tooltip={intl.formatMessage({
id: 'units-marketplace-identifier-description',
})}
>
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
Expand Down Expand Up @@ -808,8 +790,7 @@ const UnitDetailsForm = ({ unitDetails, setUnitDetails }) => {
<ToolTipContainer
tooltip={intl.formatMessage({
id: 'units-marketplace-link-description',
})}
>
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
Expand Down Expand Up @@ -850,8 +831,7 @@ const UnitDetailsForm = ({ unitDetails, setUnitDetails }) => {
<ToolTipContainer
tooltip={intl.formatMessage({
id: 'units-corresponding-adjustment-declaration-description',
})}
>
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
Expand Down Expand Up @@ -894,8 +874,7 @@ const UnitDetailsForm = ({ unitDetails, setUnitDetails }) => {
<ToolTipContainer
tooltip={intl.formatMessage({
id: 'units-corresponding-adjustment-status-description',
})}
>
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
Expand Down Expand Up @@ -942,8 +921,7 @@ const UnitDetailsForm = ({ unitDetails, setUnitDetails }) => {
<ToolTipContainer
tooltip={intl.formatMessage({
id: 'units-unit-tags-description',
})}
>
})}>
<DescriptionIcon height="14" width="14" />
</ToolTipContainer>
</Body>
Expand Down
6 changes: 1 addition & 5 deletions src/store/validations/unit.validations.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,7 @@ export const unitsSchema = yup.object().shape({
marketplaceIdentifier: yup.string().optional(),
unitTags: yup.string().optional(),
unitStatus: yup.string().required('Required Field'),
unitStatusReason: yup.string().when('unitStatus', {
is: val => ['cancelled', 'retired'].includes(val.toLowerCase()),
then: yup.string().required('Required Field'),
otherwise: yup.string().optional(),
}),
unitStatusReason: yup.string().optional(),
unitRegistryLink: yup.string().required('Required Field'),
correspondingAdjustmentDeclaration: yup.string().required('Required Field'),
correspondingAdjustmentStatus: yup.string().required('Required Field'),
Expand Down

0 comments on commit bd1c3dc

Please sign in to comment.