Skip to content

Commit fc2c831

Browse files
authored
ORV2-5060: Frontend enhancement on permit review/confirm page for return trip (#2223)
1 parent 3540f87 commit fc2c831

File tree

3 files changed

+27
-8
lines changed

3 files changed

+27
-8
lines changed

frontend/src/features/permits/pages/Application/components/review/PermitReview.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ export const PermitReview = (props: PermitReviewProps) => {
201201
routeDetails={props.route}
202202
oldRouteDetails={props.oldFields?.permitData?.permittedRoute}
203203
showChangedFields={props.showChangedFields}
204+
permitType={props.permitType}
204205
/>
205206

206207
<ThirdPartyLiabilitySection

frontend/src/features/permits/pages/Application/components/review/TripDetails.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@
4646
}
4747
}
4848

49+
&__radio-group {
50+
display: flex;
51+
flex-direction: row;
52+
}
53+
4954
&__info {
5055
display: flex;
5156
flex-direction: row;

frontend/src/features/permits/pages/Application/components/review/TripDetails.tsx

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,17 @@ import { DiffChip } from "./DiffChip";
66
import { PermittedRoute } from "../../../../types/PermittedRoute";
77
import { getDefaultRequiredVal } from "../../../../../../common/helpers/util";
88
import { areOrderedSequencesEqual, areValuesDifferent } from "../../../../../../common/helpers/equality";
9+
import { PERMIT_TYPES, PermitType } from "../../../../types/PermitType";
910

1011
export const TripDetails = ({
1112
routeDetails,
1213
oldRouteDetails,
14+
permitType,
1315
showChangedFields = false,
1416
}: {
1517
routeDetails?: Nullable<PermittedRoute>;
1618
oldRouteDetails?: Nullable<PermittedRoute>;
19+
permitType?: Nullable<PermitType>;
1720
showChangedFields?: boolean;
1821
}) => {
1922
const origin = getDefaultRequiredVal("", routeDetails?.manualRoute?.origin);
@@ -70,6 +73,12 @@ export const TripDetails = ({
7073
return show ? <DiffChip /> : null;
7174
};
7275

76+
const showReturnTrip = permitType && ([
77+
PERMIT_TYPES.STOS,
78+
PERMIT_TYPES.STOW,
79+
PERMIT_TYPES.STWS,
80+
] as PermitType[]).includes(permitType);
81+
7382
return routeDetails ? (
7483
<Box className="review-trip-details">
7584
<Box className="review-trip-details__header">
@@ -115,7 +124,7 @@ export const TripDetails = ({
115124
</div>
116125
) : null}
117126

118-
{isReturnTrip ? (
127+
{showReturnTrip ? (
119128
<div className="manual-route__is-return-trip">
120129
<RadioGroup
121130
className="manual-route__radio-group"
@@ -129,23 +138,27 @@ export const TripDetails = ({
129138
disabled: "return-trip-option--disabled",
130139
label: "return-trip-option__label",
131140
}}
132-
label="Return Trip"
141+
label={isReturnTrip ? "Return Trip" : "One Way"}
133142
value={isReturnTrip}
134143
control={
135144
<Radio
136145
key="is-return-trip-true"
137146
className="return-trip-option__radio return-trip-option__radio--disabled"
138147
/>}
139148
/>
149+
150+
{showDiffChip(!isReturnTrip && changedFields.isReturnTrip)}
140151
</RadioGroup>
141152

142-
<Typography className="manual-route__info">
143-
<span className="manual-route__info-text">
144-
Permitted for return trip along the same route.
145-
</span>
153+
{isReturnTrip ? (
154+
<Typography className="manual-route__info">
155+
<span className="manual-route__info-text">
156+
Permitted for return trip along the same route.
157+
</span>
146158

147-
{showDiffChip(changedFields.isReturnTrip)}
148-
</Typography>
159+
{showDiffChip(changedFields.isReturnTrip)}
160+
</Typography>
161+
) : null}
149162
</div>
150163
) : null}
151164

0 commit comments

Comments
 (0)