feat: add detour button to list page (#2739)

* feat: add detour button to list page

* feat: add detour machine input to original route type

* feat: show modal when add button is clicked

assets/src/components/detourListPage.tsx

@@ -1,5 +1,9 @@
-import React from "react"
+import React, { useState } from "react"
 import { DetoursTable } from "./detoursTable"
+import userInTestGroup, { TestGroups } from "../userInTestGroup"
+import { Button } from "react-bootstrap"
+import { PlusSquare } from "../helpers/bsIcons"
+import { DetourModal } from "./detours/detourModal"
 
 export interface Detour {
   route: string
@@ -76,9 +80,24 @@ export const DetourListPage = () => {
     },
   ]
 
+  const [showDetourModal, setShowDetourModal] = useState(false)
+
   return (
     <div className="h-100 overflow-y-auto">
+      {userInTestGroup(TestGroups.DetoursPilot) && (
+        <Button className="icon-link" onClick={() => setShowDetourModal(true)}>
+          <PlusSquare />
+          Add detour
+        </Button>
+      )}
       <DetoursTable data={fakeData} />
+      {showDetourModal && (
+        <DetourModal
+          onClose={() => setShowDetourModal(false)}
+          show
+          originalRoute={{}}
+        />
+      )}
     </div>
   )
 }

assets/src/models/createDetourMachine.ts

@@ -36,12 +36,12 @@ export const createDetourMachine = setup({
       | {
           // Caller has target route
           route: Route
-          routePattern: undefined
+          routePattern?: undefined
         }
       | {
           // Caller has no prior selection
-          route: undefined
-          routePattern: undefined
+          route?: undefined
+          routePattern?: undefined
         },
 
     events: {} as

assets/src/models/detour.ts

@@ -1,5 +1,6 @@
 import { LatLngLiteral } from "leaflet"
-import { Route, RoutePattern, ShapePoint, Stop } from "../schedule"
+import { ShapePoint, Stop } from "../schedule"
+import { CreateDetourMachineInput } from "./createDetourMachine"
 
 export interface DetourShape {
   coordinates: ShapePoint[]
@@ -10,13 +11,13 @@ export type DetourDirection = {
   instruction: string
 }
 
-export interface OriginalRoute {
-  route: Route
-  routePattern?: RoutePattern
+export interface MapLocation {
   center?: LatLngLiteral
   zoom?: number
 }
 
+export type OriginalRoute = CreateDetourMachineInput & MapLocation
+
 export interface UnfinishedRouteSegments {
   beforeStartPoint: ShapePoint[]
   afterStartPoint: ShapePoint[]

assets/tests/components/detours/detoursPage.addDetour.test.tsx

@@ -0,0 +1,68 @@
+import { describe, expect, jest, test } from "@jest/globals"
+
+import React from "react"
+
+import { screen } from "@testing-library/dom"
+import "@testing-library/jest-dom/jest-globals"
+import { render } from "@testing-library/react"
+import userEvent from "@testing-library/user-event"
+
+import { DetourListPage } from "../../../src/components/detourListPage"
+import { TestGroups } from "../../../src/userInTestGroup"
+import getTestGroups from "../../../src/userTestGroups"
+
+jest.mock("../../../src/userTestGroups")
+
+const renderDetourListPage = () => {
+  return render(<DetourListPage></DetourListPage>)
+}
+
+describe("Detours Page: Create Detour", () => {
+  test("Shows the add detour button when in test group", () => {
+    jest.mocked(getTestGroups).mockReturnValue([TestGroups.DetoursPilot])
+
+    renderDetourListPage()
+
+    expect(screen.getByRole("button", { name: "Add detour" })).toBeVisible()
+  })
+
+  test("Does not show add detour button when not in test group", () => {
+    jest.mocked(getTestGroups).mockReturnValue([])
+
+    renderDetourListPage()
+
+    expect(
+      screen.queryByRole("button", { name: "Add detour" })
+    ).not.toBeInTheDocument()
+  })
+
+  test("Opens Detour Modal when clicked", async () => {
+    jest.mocked(getTestGroups).mockReturnValue([TestGroups.DetoursPilot])
+
+    renderDetourListPage()
+
+    await userEvent.click(screen.getByRole("button", { name: "Add detour" }))
+
+    expect(
+      await screen.findByRole("heading", { name: "Create Detour" })
+    ).toBeVisible()
+  })
+
+  test("Returns to page when modal is closed", async () => {
+    jest.mocked(getTestGroups).mockReturnValue([TestGroups.DetoursPilot])
+
+    renderDetourListPage()
+
+    await userEvent.click(screen.getByRole("button", { name: "Add detour" }))
+
+    const createDetourHeading = await screen.findByRole("heading", {
+      name: "Create Detour",
+    })
+    expect(createDetourHeading).toBeVisible()
+
+    await userEvent.click(screen.getByRole("button", { name: "Close" }))
+    await userEvent.click(screen.getByRole("button", { name: "Yes, I'm sure" }))
+
+    expect(createDetourHeading).not.toBeInTheDocument()
+  })
+})