Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

INT-B-19226 onboarding required fields fix for boat shipments #13567

Merged
merged 6 commits into from
Aug 28, 2024
Merged

INT-B-19226 onboarding required fields fix for boat shipments #13567

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
46824cd
Added required field to legend tag for each boat shipment dimension, …
Aug 26, 2024
aa887cd
Merge branch 'MAIN-B-19226-onboarding-required-fields' into INT-B-192…
Aug 26, 2024
6a52e19
Removed optional label on remarks.
Aug 27, 2024
abdb421
Merge branch 'main' into MAIN-B-19226-onboarding-required-fields
Aug 27, 2024
54f4090
Merge branch 'MAIN-B-19226-onboarding-required-fields' into INT-B-192…
Aug 27, 2024
4f09407
Merge branch 'integrationTesting' into INT-B-19226-onboarding-require…
brooklyn-welsh Aug 28, 2024
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
18 changes: 11 additions & 7 deletions src/components/Customer/BoatShipment/BoatShipmentForm/BoatShipmentForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import MaskedTextField from 'components/form/fields/MaskedTextField/MaskedTextFi
import Callout from 'components/Callout';
import { ErrorMessage } from 'components/form/index';
import { convertInchesToFeetAndInches } from 'utils/formatMtoShipment';
import RequiredTag from 'components/form/RequiredTag';

const currentYear = new Date().getFullYear();
const maxYear = currentYear + 2;
Expand Down Expand Up @@ -158,6 +159,7 @@ const BoatShipmentForm = ({ mtoShipment, onBack, onSubmit }) => {
<Fieldset className={styles.formFieldContainer}>
<div className="labelWrapper">
<legend className="usa-label">Length</legend>
<RequiredTag />
<ErrorMessage display={lengthHasError}>Required</ErrorMessage>
</div>
<div className={classnames(styles.formTextFieldWrapper, 'grid-row grid-gap')}>
Expand All @@ -173,6 +175,7 @@ const BoatShipmentForm = ({ mtoShipment, onBack, onSubmit }) => {
suffix="Feet"
errorClassName={styles.hide}
title="Length in feet"
optional
/>
</div>
<div className="mobile-lg:grid-col-3">
Expand All @@ -188,13 +191,15 @@ const BoatShipmentForm = ({ mtoShipment, onBack, onSubmit }) => {
max={11}
errorClassName={styles.hide}
title="Length in inches"
optional
/>
</div>
</div>
</Fieldset>
<Fieldset className={styles.formFieldContainer}>
<div className="labelWrapper">
<legend className="usa-label">Width</legend>
<RequiredTag />
<ErrorMessage display={widthHasError}>Required</ErrorMessage>
</div>
<div className={classnames(styles.formTextFieldWrapper, 'grid-row grid-gap')}>
Expand All @@ -210,6 +215,7 @@ const BoatShipmentForm = ({ mtoShipment, onBack, onSubmit }) => {
suffix="Feet"
errorClassName={styles.hide}
title="Width in feet"
optional
/>
</div>
<div className="mobile-lg:grid-col-3">
Expand All @@ -225,13 +231,15 @@ const BoatShipmentForm = ({ mtoShipment, onBack, onSubmit }) => {
max={11}
errorClassName={styles.hide}
title="Width in inches"
optional
/>
</div>
</div>
</Fieldset>
<Fieldset className={styles.formFieldContainer}>
<div className="labelWrapper">
<legend className="usa-label">Height</legend>
<RequiredTag />
<ErrorMessage display={heightHasError}>Required</ErrorMessage>
</div>
<div className={classnames(styles.formTextFieldWrapper, 'grid-row grid-gap')}>
Expand All @@ -247,6 +255,7 @@ const BoatShipmentForm = ({ mtoShipment, onBack, onSubmit }) => {
suffix="Feet"
errorClassName={styles.hide}
title="Height in feet"
optional
/>
</div>
<div className="mobile-lg:grid-col-3">
Expand All @@ -262,6 +271,7 @@ const BoatShipmentForm = ({ mtoShipment, onBack, onSubmit }) => {
max={11}
errorClassName={styles.hide}
title="Height in inches"
optional
/>
</div>
</div>
Expand Down Expand Up @@ -316,13 +326,7 @@ const BoatShipmentForm = ({ mtoShipment, onBack, onSubmit }) => {
</Fieldset>
</SectionWrapper>
<SectionWrapper className={formStyles.formSection}>
<Fieldset
legend={
<div className={formStyles.legendContent}>
Remarks <span className={formStyles.optional}>Optional</span>
</div>
}
>
<Fieldset legend={<div className={formStyles.legendContent}>Remarks</div>}>
<Label htmlFor="customerRemarks">
Are there things about this boat shipment that your counselor or movers should know or discuss with
you?
Expand Down