From ab685cb0ae273da666e6205fae6ac51a9a28daf5 Mon Sep 17 00:00:00 2001 From: Cyprien Huissoud <huissoud@routerank.com> Date: Fri, 27 Sep 2024 10:21:59 +0200 Subject: [PATCH 1/2] replace hardcoded 'node_modules' path --- lib/util/i18n.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/util/i18n.js b/lib/util/i18n.js index 6f210c071..b17e001a6 100644 --- a/lib/util/i18n.js +++ b/lib/util/i18n.js @@ -97,8 +97,9 @@ async function loadOtpUiLocaleData(matchedLocale) { .filter((pkg) => pkg.startsWith('@opentripplanner')) .map(async (pkg) => { try { + const packagePath = pkg.replace('@opentripplanner/', '') const msgs = await import( - `../../node_modules/${pkg}/i18n/${matchedLocale}.yml` + `@opentripplanner/${packagePath}/i18n/${matchedLocale}.yml` ) if (msgs) return msgs.default } catch (ex) { From 40d95dad5329fcd379ba617a479e8cb867cfacfa Mon Sep 17 00:00:00 2001 From: miles-grant-ibigroup <miles.grant@ibigroup.com> Date: Tue, 26 Nov 2024 13:26:07 -0500 Subject: [PATCH 2/2] fix(base-renderer): remove OTP1 compatability conversion --- .../base-renderer.js | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/lib/components/user/monitored-trip/trip-status-rendering-strategies/base-renderer.js b/lib/components/user/monitored-trip/trip-status-rendering-strategies/base-renderer.js index 612135199..54d2a5d50 100644 --- a/lib/components/user/monitored-trip/trip-status-rendering-strategies/base-renderer.js +++ b/lib/components/user/monitored-trip/trip-status-rendering-strategies/base-renderer.js @@ -4,18 +4,6 @@ import React from 'react' import FormattedDuration from '../../../util/formatted-duration' -/** - * Helper function that changes alert timestamps from milliseconds to seconds - * for display using the alerts body component from itinerary-body. - */ -function withAlertTimestampsInSeconds(alert) { - return { - ...alert, - effectiveEndDate: alert.effectiveEndDate / 1000, - effectiveStartDate: alert.effectiveStartDate / 1000 - } -} - /** * Calculate commonly-used pieces of data used to render the trip status * component. The monitoredTrip param can be undefined. @@ -63,9 +51,7 @@ export default function baseRenderer(monitoredTrip) { // Set some alert data if the matching itinerary exists. // (Convert alert timestamps in milliseconds to seconds for display using alerts body.) - data.alerts = data.matchingItinerary?.alerts?.map( - withAlertTimestampsInSeconds - ) + data.alerts = data.matchingItinerary?.alerts data.hasMoreThanOneAlert = !!(data.alerts?.length > 0) data.shouldRenderAlerts = data.hasMoreThanOneAlert