Skip to content

Commit

Permalink
Language changes to filter PA/ESS and alerts by time (#602)
Browse files Browse the repository at this point in the history
* Language changes to filter PA/ESS and alerts by time

- https://app.asana.com/0/1185117109217413/1208918421836698
- "Now" switched to "Live"
- "Done" switched to "Past"
- "Current Service Disruption" to "Ongoing service disruption"
- "Planned Service Disruption" to "Upcoming service disruption"

* Switched language to be "Filter by" on all pages
- Also switched the language in the StaticTemplatePage to be consistent
  with the other pages

---------

Co-authored-by: dshi <[email protected]>
Co-authored-by: Dean Shi <[email protected]>
  • Loading branch information
3 people authored Feb 4, 2025
1 parent 9b6da6d commit 755e946
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,16 @@ const AssociateAlert = ({ onApply, onCancel }: AssociateAlertPageProps) => {
<Col className="associate-alert-filter-selection">
<FilterGroup
className="mb-5"
header="Message state"
header="Filter by message state"
selectedFilter={selectedMessageState}
onFilterSelect={setSelectedMessageState}
filters={[
{ label: "Active", value: "active" },
{ label: "Live", value: "active" },
{ label: "Future", value: "future" },
]}
/>
<FilterGroup
header="Service type"
header="Filter by service type"
selectedFilter={selectedServiceType}
onFilterSelect={setSelectedServiceType}
filters={serviceTypes.map((serviceType) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const StaticTemplatePage = ({ onCancel, onSelect }: Props) => {
<Row className="static-template-page-body">
<Col className="filter-group-col">
<FilterGroup
header="Template type"
header="Filter by template type"
selectedFilter={selectedTemplateType}
onFilterSelect={(templateType) =>
setSelectedTemplateType(templateType as TemplateType)
Expand Down
4 changes: 2 additions & 2 deletions assets/js/components/Dashboard/PaMessagesPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,9 @@ const PaMessagesPage: ComponentType = () => {
}
selectedFilter={stateFilter.toLowerCase()}
filters={[
{ label: "Now", value: "current" },
{ label: "Live", value: "current" },
{ label: "Future", value: "future" },
{ label: "Done", value: "past" },
{ label: "Past", value: "past" },
]}
/>
<FilterGroup
Expand Down
4 changes: 2 additions & 2 deletions assets/js/components/Dashboard/PriorityPicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ const PriorityPicker = ({
<Dropdown.Menu role="listbox">
{[
"Emergency",
"Current Service Disruption",
"Planned Service Disruption",
"Ongoing service disruption",
"Upcoming service disruption",
"PSA Message",
].map((label, index) => {
const priorityIndex = index + 1;
Expand Down

0 comments on commit 755e946

Please sign in to comment.