chore: generalize PaMessageForm

Moves form component for PA messages from `NewPaMessage` into `PaMessageForm` so that it can be used to make an `EditPaMessage` component later on.
mbta · Aug 20, 2024 · d727b89 · d727b89
1 parent 635a43b
commit d727b89
Show file tree

Hide file tree

Showing 17 changed files with 16 additions and 10 deletions.
diff --git a/assets/js/components/Dashboard/NewPaMessage/NewPaMessage.tsx b/assets/js/components/Dashboard/NewPaMessage/NewPaMessage.tsx
@@ -1,10 +1,11 @@
 import React, { useState } from "react";
 import moment, { type Moment } from "moment";
-import { Page } from "./types";
-import NewPaMessagePage from "./NewPaMessagePage";
-import AssociateAlertPage from "./AssociateAlertPage";
+import PaMessageForm, {
+  Page,
+  SelectStationsAndZones,
+  AssociateAlert,
+} from "../PaMessageForm";
 import { Alert, InformedEntity } from "Models/alert";
-import SelectStationsAndZones from "./StationsAndZones/SelectStationsAndZones";
 import { usePlacesWithPaEss } from "Hooks/usePlacesWithPaEss";
 import ErrorToast from "Components/ErrorToast";
 import { PaMessage } from "Models/pa_message";
@@ -105,7 +106,7 @@ const NewPaMessage = () => {
   return (
     <div className="new-pa-message">
       {page === Page.NEW && (
-        <NewPaMessagePage
+        <PaMessageForm
           {...{
             days,
             interval,
@@ -150,7 +151,7 @@ const NewPaMessage = () => {
         </div>
       )}
       {page === Page.ALERTS && (
-        <AssociateAlertPage
+        <AssociateAlert
           associatedAlert={associatedAlert}
           endWithEffectPeriod={endWithEffectPeriod}
           onImportMessage={onImportMessage}

diff --git a/...board/NewPaMessage/AssociateAlertPage.tsx → ...ashboard/PaMessageForm/AssociateAlert.tsx b/...board/NewPaMessage/AssociateAlertPage.tsx → ...ashboard/PaMessageForm/AssociateAlert.tsx
@@ -31,7 +31,7 @@ interface AssociateAlertPageProps {
   setEndWithEffectPeriod: Dispatch<SetStateAction<boolean>>;
 }
 
-const AssociateAlertPage = ({
+const AssociateAlert = ({
   associatedAlert,
   endWithEffectPeriod,
   onImportMessage,
@@ -346,4 +346,4 @@ const AssociateAlertsTableRow: ComponentType<AssociateAlertsTableRowProps> = ({
   );
 };
 
-export default AssociateAlertPage;
+export default AssociateAlert;
diff --git a/...shboard/NewPaMessage/NewPaMessagePage.tsx → ...Dashboard/PaMessageForm/PaMessageForm.tsx b/...shboard/NewPaMessage/NewPaMessagePage.tsx → ...Dashboard/PaMessageForm/PaMessageForm.tsx
@@ -58,7 +58,7 @@ interface Props {
   onSubmit: () => void;
 }
 
-const NewPaMessagePage = ({
+const PaMessageForm = ({
   days,
   startDateTime,
   setStartDateTime,
@@ -538,4 +538,4 @@ const NewPaMessageHeader = ({
   );
 };
 
-export default NewPaMessagePage;
+export default PaMessageForm;
diff --git a/...essage/StationsAndZones/PlaceZonesRow.tsx → .../SelectStationsAndZones/PlaceZonesRow.tsx b/...essage/StationsAndZones/PlaceZonesRow.tsx → .../SelectStationsAndZones/PlaceZonesRow.tsx
diff --git a/...aMessage/StationsAndZones/RouteColumn.tsx → ...rm/SelectStationsAndZones/RouteColumn.tsx b/...aMessage/StationsAndZones/RouteColumn.tsx → ...rm/SelectStationsAndZones/RouteColumn.tsx
diff --git a/...ationsAndZones/SelectStationsAndZones.tsx → ...ationsAndZones/SelectStationsAndZones.tsx b/...ationsAndZones/SelectStationsAndZones.tsx → ...ationsAndZones/SelectStationsAndZones.tsx
diff --git a/...e/StationsAndZones/SelectStationsPage.tsx → ...ctStationsAndZones/SelectStationsPage.tsx b/...e/StationsAndZones/SelectStationsPage.tsx → ...ctStationsAndZones/SelectStationsPage.tsx
diff --git a/...sage/StationsAndZones/SelectZonesPage.tsx → ...electStationsAndZones/SelectZonesPage.tsx b/...sage/StationsAndZones/SelectZonesPage.tsx → ...electStationsAndZones/SelectZonesPage.tsx
diff --git a/...tionsAndZones/SelectedStationsSummary.tsx → ...tionsAndZones/SelectedStationsSummary.tsx b/...tionsAndZones/SelectedStationsSummary.tsx → ...tionsAndZones/SelectedStationsSummary.tsx
diff --git a/...sage/StationsAndZones/SignButtonGroup.tsx → ...electStationsAndZones/SignButtonGroup.tsx b/...sage/StationsAndZones/SignButtonGroup.tsx → ...electStationsAndZones/SignButtonGroup.tsx
diff --git a/...StationsAndZones/StationGroupCheckbox.tsx → ...StationsAndZones/StationGroupCheckbox.tsx b/...StationsAndZones/StationGroupCheckbox.tsx → ...StationsAndZones/StationGroupCheckbox.tsx
diff --git a/...Message/StationsAndZones/StationGroups.ts → ...m/SelectStationsAndZones/StationGroups.ts b/...Message/StationsAndZones/StationGroups.ts → ...m/SelectStationsAndZones/StationGroups.ts
diff --git a/assets/js/components/Dashboard/PaMessageForm/SelectStationsAndZones/index.ts b/assets/js/components/Dashboard/PaMessageForm/SelectStationsAndZones/index.ts
@@ -0,0 +1 @@
+export { default } from "./SelectStationsAndZones";
diff --git a/...NewPaMessage/SelectedSignsByRouteTags.tsx → ...aMessageForm/SelectedSignsByRouteTags.tsx b/...NewPaMessage/SelectedSignsByRouteTags.tsx → ...aMessageForm/SelectedSignsByRouteTags.tsx
diff --git a/...mponents/Dashboard/NewPaMessage/hooks.tsx → ...ponents/Dashboard/PaMessageForm/hooks.tsx b/...mponents/Dashboard/NewPaMessage/hooks.tsx → ...ponents/Dashboard/PaMessageForm/hooks.tsx
diff --git a/assets/js/components/Dashboard/PaMessageForm/index.ts b/assets/js/components/Dashboard/PaMessageForm/index.ts
@@ -0,0 +1,4 @@
+export { Page } from "./types";
+export { default } from "./PaMessageForm";
+export { default as SelectStationsAndZones } from "./SelectStationsAndZones";
+export { default as AssociateAlert } from "./AssociateAlert";
diff --git a/...omponents/Dashboard/NewPaMessage/types.ts → ...mponents/Dashboard/PaMessageForm/types.ts b/...omponents/Dashboard/NewPaMessage/types.ts → ...mponents/Dashboard/PaMessageForm/types.ts
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export { default } from "./SelectStationsAndZones";