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

fix: Moved "Return to Regular Route" into root directions list #2521

Merged
merged 11 commits into from
Mar 29, 2024
Merged

fix: Moved "Return to Regular Route" into root directions list #2521

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2d03044
Update Storybook with "Return to route" wording change
hannahpurcell Mar 26, 2024
b353c56
Test out moving the "return to route" to the root directions list
hannahpurcell Mar 26, 2024
24a8278
Only add Regular Route after detour is finished
hannahpurcell Mar 26, 2024
fc1d9aa
Updated wording to match figma
hannahpurcell Mar 26, 2024
27b25b0
Added check: "regular route" only appears when detour is finished
hannahpurcell Mar 27, 2024
2bfae55
Formatting of test
hannahpurcell Mar 27, 2024
fb5fea8
Switch to jest-dom matchers
hannahpurcell Mar 28, 2024
d41a21a
Async behavior not needed for these click events
hannahpurcell Mar 28, 2024
27a72c1
Similarly, async/await not needed for the first test either
hannahpurcell Mar 28, 2024
480144a
Update test title wording
hannahpurcell Mar 28, 2024
18636f1
Tuck in a check during a test, re-work later
hannahpurcell Mar 29, 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
1 change: 0 additions & 1 deletion assets/src/components/detours/diversionPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ export const DiversionPage = ({
,
"Turn-by-Turn Directions:",
...(directions?.map((v) => v.instruction) ?? []),
"Return to Regular Route",
,
"Connection Points:",
connectionPoints?.start?.name ?? "N/A",
Expand Down
11 changes: 5 additions & 6 deletions assets/src/components/detours/diversionPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,13 @@ export const DiversionPanel = ({
<ListGroup as="ol">
{directions.map((d) => (
<ListGroup.Item key={d.instruction} as="li">
{d.instruction}
{d.instruction == "Return to Regular Route" ? (
<strong className="fw-medium">{d.instruction}</strong>
) : (
d.instruction
)}
</ListGroup.Item>
))}
{detourFinished && (
<ListGroup.Item as="li">
<strong className="fw-medium">Return to Regular Route</strong>
</ListGroup.Item>
)}
</ListGroup>
) : (
<DirectionsHelpText />
Expand Down
6 changes: 5 additions & 1 deletion assets/src/hooks/useDetour.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,11 @@ export const useDetour = ({ routePatternId, shape }: OriginalRoute) => {
)

const coordinates = isOk(detourShape) ? detourShape.ok.coordinates : []
const directions = isOk(detourShape) ? detourShape.ok.directions : undefined
const directions = isOk(detourShape)
? detourShape.ok.directions?.concat({
instruction: "Return to Regular Route",
hannahpurcell marked this conversation as resolved.
Show resolved Hide resolved
})
: undefined
firestack marked this conversation as resolved.
Show resolved Hide resolved

const canAddWaypoint = () => startPoint !== null && endPoint === null
const addWaypoint = canAddWaypoint()
Expand Down
2 changes: 1 addition & 1 deletion assets/stories/skate-components/detours/detourFinishedPanel.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const defaultText = [
"Turn-by-Turn Directions:",
"From Harvard St & Babcock St",
"Right on Babcock St.",
"Regular Route",
"Return to Regular Route",
"",
"Connection Points:",
"Harvard St @ Beacon St",
Expand Down
Loading