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

Revert "Revert "feat: Add connectionPoints and missedStops to the “Review Det…" #2891

Merged
merged 1 commit into from
Oct 31, 2024
Merged

Revert "Revert "feat: Add connectionPoints and missedStops to the “Review Det…" #2891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion assets/src/components/detours/detourPanels/detourFinishedPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,27 @@ import React, { PropsWithChildren } from "react"
import { Button, Form } from "react-bootstrap"
import * as BsIcons from "../../../helpers/bsIcons"
import { Panel } from "../diversionPage"
import { CopyButton } from "../detourPanelComponents"
import {
ConnectionPoints,
CopyButton,
MissedStops,
} from "../detourPanelComponents"
import { Stop } from "../../../schedule"

interface DetourFinishedPanelProps extends PropsWithChildren {
onNavigateBack: () => void
detourText: string
connectionPoints?: [string, string]
missedStops?: Stop[]
onChangeDetourText: (value: string) => void
onActivateDetour?: () => void
}

export const DetourFinishedPanel = ({
onNavigateBack,
detourText,
connectionPoints,
missedStops,
onChangeDetourText,
onActivateDetour,
children,
Expand Down Expand Up @@ -45,6 +54,11 @@ export const DetourFinishedPanel = ({
}}
data-fs-element="Detour Text"
/>

{connectionPoints && (
<ConnectionPoints connectionPoints={connectionPoints} />
)}
{missedStops && <MissedStops missedStops={missedStops} />}
</Panel.Body.ScrollArea>

<Panel.Body.Footer className="d-flex flex-column">
Expand Down
5 changes: 5 additions & 0 deletions assets/src/components/detours/diversionPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,11 @@ export const DiversionPage = ({
<DetourFinishedPanel
onNavigateBack={editDetour}
detourText={textArea}
connectionPoints={[
connectionPoints?.start?.name ?? "N/A",
connectionPoints?.end?.name ?? "N/A",
]}
missedStops={missedStops}
onChangeDetourText={setTextArea}
onActivateDetour={
inTestGroup(TestGroups.DetoursList)
Expand Down
46 changes: 46 additions & 0 deletions assets/tests/components/detours/__snapshots__/detoursListPage.openDetour.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,29 @@ exports[`Detours Page: Open a Detour renders detour details in an open drawer on
data-fs-element="Detour Text"
style="resize: none;"
/>
<section
class="pb-3"
>
<h2
class="c-diversion-panel__h2"
>
Connection Points
</h2>
<ul
class="list-group"
>
<div
class="list-group-item"
>
N/A
</div>
<div
class="list-group-item"
>
N/A
</div>
</ul>
</section>
</div>
<div
class="border-top d-flex mt-auto d-flex flex-column"
Expand Down Expand Up @@ -1239,6 +1262,29 @@ exports[`Detours Page: Open a Detour renders detour details modal to match mocke
data-fs-element="Detour Text"
style="resize: none;"
/>
<section
class="pb-3"
>
<h2
class="c-diversion-panel__h2"
>
Connection Points
</h2>
<ul
class="list-group"
>
<div
class="list-group-item"
>
N/A
</div>
<div
class="list-group-item"
>
N/A
</div>
</ul>
</section>
</div>
<div
class="border-top d-flex mt-auto d-flex flex-column"
Expand Down
Loading