Merge pull request #5471 from HSLdevcom/DT-6557-alternative

vesameskanen · web-flow · commit b9387c9fe574 · 2025-09-01T09:52:08.000+03:00
DT-6557 fix alternative routes showing incorrect alert icon
diff --git a/app/component/itinerary/queries/ItineraryDetailsFragment.js b/app/component/itinerary/queries/ItineraryDetailsFragment.js
@@ -51,6 +51,8 @@ export const ItineraryDetailsFragment = graphql`
         route {
           alerts {
             alertSeverityLevel
+            effectiveStartDate
+            effectiveEndDate
           }
           shortName
           mode
@@ -63,13 +65,17 @@ export const ItineraryDetailsFragment = graphql`
             platformCode
             alerts {
               alertSeverityLevel
+              effectiveStartDate
+              effectiveEndDate
             }
           }
         }
         to {
           stop {
             alerts {
               alertSeverityLevel
+              effectiveStartDate
+              effectiveEndDate
             }
           }
         }
diff --git a/app/util/alertUtils.js b/app/util/alertUtils.js
@@ -519,7 +519,6 @@ export const getActiveLegAlerts = (leg, legStartTime) => {
         ),
       };
     }),
-  ].filter(alert => isAlertActive(legStartTime, alert));
-
+  ].filter(alert => isAlertValid(alert, legStartTime));
   return serviceAlerts;
 };

Original file line number	Diff line number	Diff line change
@@ -51,6 +51,8 @@ export const ItineraryDetailsFragment = graphql`
`51`	`51`	`route {`
`52`	`52`	`alerts {`
`53`	`53`	`alertSeverityLevel`
	`54`	`+ effectiveStartDate`
	`55`	`+ effectiveEndDate`
`54`	`56`	`}`
`55`	`57`	`shortName`
`56`	`58`	`mode`
@@ -63,13 +65,17 @@ export const ItineraryDetailsFragment = graphql`
`63`	`65`	`platformCode`
`64`	`66`	`alerts {`
`65`	`67`	`alertSeverityLevel`
	`68`	`+ effectiveStartDate`
	`69`	`+ effectiveEndDate`
`66`	`70`	`}`
`67`	`71`	`}`
`68`	`72`	`}`
`69`	`73`	`to {`
`70`	`74`	`stop {`
`71`	`75`	`alerts {`
`72`	`76`	`alertSeverityLevel`
	`77`	`+ effectiveStartDate`
	`78`	`+ effectiveEndDate`
`73`	`79`	`}`
`74`	`80`	`}`
`75`	`81`	`}`