Skip to content
This repository has been archived by the owner on May 22, 2024. It is now read-only.

[terra-clinical-onset-picker] Added required prop #927

Merged
merged 2 commits into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/terra-clinical-onset-picker/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

* Added
* Added required prop to mark fields as required based on granularity.

## 4.36.0 - (September 21, 2023)

* Added
Expand Down
11 changes: 11 additions & 0 deletions packages/terra-clinical-onset-picker/src/OnsetPicker.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,16 @@ const propTypes = {
* The intl object containing translations. This is retrieved from the context automatically by injectIntl.
*/
intl: PropTypes.shape({ formatMessage: PropTypes.func }).isRequired,
/**
* Whether the field is required.
*/
required: PropTypes.bool,
};

const defaultProps = {
precisionSet: ['on/at', 'about', 'before', 'after', 'unknown'],
isLegendHidden: false,
required: false,
};

class OnsetPicker extends React.Component {
Expand Down Expand Up @@ -181,6 +186,7 @@ class OnsetPicker extends React.Component {
getYearInput(intl, id) {
return (
<SelectField
required={this.props.required}
className={cx('field-inline', 'year')}
value={this.state.onsetDate ? this.state.onsetDate.year().toString() : undefined}
label={intl.formatMessage({ id: 'Terra.onsetPicker.year' })}
Expand Down Expand Up @@ -358,6 +364,7 @@ class OnsetPicker extends React.Component {
legend,
intl,
isLegendHidden,
required,
...customProps
} = this.props;

Expand Down Expand Up @@ -420,6 +427,7 @@ class OnsetPicker extends React.Component {
if (this.state.granularity === GranularityOptions.AGE) {
ageInput = (
<InputField
required={required}
className={cx('field-inline', 'age')}
defaultValue={this.state.age}
inputAttrs={{
Expand All @@ -439,6 +447,7 @@ class OnsetPicker extends React.Component {

ageUnitSelect = (
<SelectField
required={required}
className={cx('field-inline', 'age-unit')}
defaultValue={this.state.ageUnit}
label={intl.formatMessage({ id: 'Terra.onsetPicker.agePrecision' })}
Expand All @@ -460,6 +469,7 @@ class OnsetPicker extends React.Component {
monthSelect = (
<React.Fragment>
<SelectField
required={required}
className={cx('field-inline', 'month')}
value={this.state.onsetDate ? this.state.onsetDate.month().toString() : undefined}
label={intl.formatMessage({ id: 'Terra.onsetPicker.month' })}
Expand Down Expand Up @@ -494,6 +504,7 @@ class OnsetPicker extends React.Component {
}}
>
<DatePicker
required={required}
onChangeRaw={this.changeDate}
minDate={this.props.birthdate}
maxDate={moment().format(DATE_FORMAT)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const picker = () => (
<div>
<p>{`Birthdate: ${birthdate.format('MM-DD-YYYY')}`}</p>
<OnsetPicker
required
legend="Onset of symptoms"
birthdate={birthdate.format('YYYY-MM-DD')}
id="doogs"
Expand Down
Loading
Loading