Merge branch 'v3' into AB#509

vesameskanen · vesameskanen · commit ef665d755eb3 · 2026-04-08T15:32:01.000+03:00
diff --git a/.dockerignore b/.dockerignore
@@ -6,7 +6,6 @@
 
 LICENSE*
 Changelog.md
-win-launch-scripts/
 docs/
 /test
 
diff --git a/app/action/realTimeClientAction.js b/app/action/realTimeClientAction.js
@@ -2,7 +2,7 @@ import { startMqttClient, changeTopics } from '../util/mqttClient';
 
 export function startRealTimeClient(actionContext, settings, done) {
   /* settings may have changed, so reset old store content */
-  if (actionContext.config.NODE_ENV === 'test') {
+  if (process.env.NODE_ENV === 'test') {
     return;
   }
   actionContext.dispatch('RealTimeClientReset');
diff --git a/app/component/AppBar.js b/app/component/AppBar.js
@@ -43,7 +43,9 @@ export default function AppBar(
   return (
     <>
       {disruptionInfoOpen && <DisruptionInfo setOpen={toggleDisruptionInfo} />}
-      {config.NODE_ENV !== 'test' && <MessageBar breakpoint={breakpoint} />}
+      {process.env.NODE_ENV !== 'test' && (
+        <MessageBar breakpoint={breakpoint} />
+      )}
       <nav className={`top-bar ${breakpoint !== 'large' ? 'mobile' : ''}`}>
         <section className="title">
           <button
diff --git a/app/component/AppBarHsl.js b/app/component/AppBarHsl.js
@@ -29,15 +29,15 @@ const AppBarHsl = ({ lang, user, favourites }, context) => {
   const [banners, setBanners] = useState([]);
 
   useEffect(() => {
-    if (config.URL.BANNERS && config.NODE_ENV !== 'test') {
+    if (config.URL.BANNERS && process.env.NODE_ENV !== 'test') {
       getJson(`${config.URL.BANNERS}&language=${lang}`)
         .then(data => setBanners(data))
         .catch(() => setBanners([]));
     }
   }, [lang]);
 
   useEffect(() => {
-    if (config.URL.FONTCOUNTER && config.NODE_ENV === 'production') {
+    if (config.URL.FONTCOUNTER && process.env.NODE_ENV === 'production') {
       fetch(config.URL.FONTCOUNTER, {
         mode: 'no-cors',
       });
diff --git a/app/component/BackButton.js b/app/component/BackButton.js
@@ -39,7 +39,7 @@ export default function BackButton(props, context) {
 
   let url;
   // apply rootlink only in production, it is annoying locally
-  if (config.NODE_ENV !== 'development') {
+  if (process.env.NODE_ENV !== 'development') {
     if (config.passLanguageToRootLink && intl.locale !== 'fi') {
       url = `${config.URL.ROOTLINK}/${intl.locale}`;
     } else {
diff --git a/app/component/MapLayersDialogContent.js b/app/component/MapLayersDialogContent.js
@@ -220,7 +220,6 @@ class MapLayersDialogContent extends React.Component {
           )}
           {showRentalVehiclesOfType(
             config.vehicleRental?.networks,
-            config,
             TransportMode.Citybike,
           ) && (
             <Checkbox
@@ -237,7 +236,6 @@ class MapLayersDialogContent extends React.Component {
           )}
           {showRentalVehiclesOfType(
             config.vehicleRental?.networks,
-            config,
             TransportMode.Scooter,
           ) && (
             <Checkbox
diff --git a/app/component/itinerary/ItineraryPageUtils.js b/app/component/itinerary/ItineraryPageUtils.js
@@ -205,7 +205,7 @@ export function settingsLimitRouting(config) {
 }
 
 export function setCurrentTimeToURL(config, match) {
-  if (config.NODE_ENV !== 'test' && !match.location?.query?.time) {
+  if (process.env.NODE_ENV !== 'test' && !match.location?.query?.time) {
     const newLocation = {
       ...match.location,
       query: {
diff --git a/app/component/itinerary/TransitLeg.js b/app/component/itinerary/TransitLeg.js
@@ -376,7 +376,7 @@ class TransitLeg extends React.Component {
     };
     const routeNotifications = [];
     if (
-      config.NODE_ENV !== 'test' &&
+      process.env.NODE_ENV !== 'test' &&
       config.routeNotifications &&
       config.routeNotifications.length > 0
     ) {
diff --git a/app/component/routepage/RouteControlPanel.js b/app/component/routepage/RouteControlPanel.js
@@ -291,7 +291,7 @@ class RouteControlPanel extends React.Component {
     const { config, executeAction } = this.context;
     const { match, route, tripStartTime } = this.props;
     const { realTime } = config;
-    if (config.NODE_ENV === 'test' || !realTime) {
+    if (process.env.NODE_ENV === 'test' || !realTime) {
       return;
     }
 
@@ -365,7 +365,7 @@ class RouteControlPanel extends React.Component {
 
     const routeNotifications = [];
     if (
-      config.NODE_ENV !== 'test' &&
+      process.env.NODE_ENV !== 'test' &&
       config.routeNotifications &&
       config.routeNotifications.length > 0
     ) {
diff --git a/app/configurations/config.default.js b/app/configurations/config.default.js
@@ -21,11 +21,6 @@ const API_SUBSCRIPTION_HEADER_NAME =
 const API_SUBSCRIPTION_TOKEN =
   process.env.API_SUBSCRIPTION_TOKEN || 'c65af0cd2d0a401a9599894970a2b29c';
 
-const {
-  // AXE,
-  NODE_ENV,
-  RUN_ENV,
-} = process.env;
 const hasAPISubscriptionQueryParameter = true;
 const PORT = process.env.PORT || 8080;
 const APP_DESCRIPTION = 'Digitransit journey planning UI';
@@ -38,7 +33,6 @@ export default {
   PORT,
   // AXE,
   CONFIG,
-  NODE_ENV,
   OTPTimeout: OTP_TIMEOUT,
   URL: {
     API_URL,
@@ -113,7 +107,6 @@ export default {
   API_SUBSCRIPTION_QUERY_PARAMETER_NAME,
   API_SUBSCRIPTION_HEADER_NAME,
   API_SUBSCRIPTION_TOKEN,
-  RUN_ENV,
 
   hasAPISubscriptionQueryParameter,
 
diff --git a/app/configurations/config.hsl.js b/app/configurations/config.hsl.js
@@ -1,3 +1,4 @@
+import { IS_DEV } from '../util/envUtils';
 import { BIKEAVL_WITHMAX } from '../util/vehicleRentalUtils';
 import ttConfig from './timetableConfigUtils';
 
@@ -17,11 +18,7 @@ const SUGGESTION_URL = process.env.CONTENT_DOMAIN
   ? `${process.env.CONTENT_DOMAIN}/api/v1/search/suggestions`
   : 'https://content.hsl.fi/api/v1/search/suggestions'; // old url
 
-const IS_DEV =
-  process.env.RUN_ENV === 'development' ||
-  process.env.NODE_ENV !== 'production';
-
-const virtualMonitorBaseUrl = IS_DEV
+const virtualMonitorBaseUrl = IS_DEV()
   ? 'https://dev-hslmonitori.digitransit.fi'
   : 'https://omatnaytot.hsl.fi';
 
@@ -801,22 +798,22 @@ export default {
 
   // features that should not be deployed to production
   experimental: {
-    allowFlexJourneys: IS_DEV,
+    allowFlexJourneys: IS_DEV(),
     allowDirectFlexJourneys: false,
   },
 
   showStopStatusMarkers: true,
 
   flex: {
-    internalFlexEnabled: IS_DEV,
-    allowTaxiJourneys: IS_DEV,
+    internalFlexEnabled: IS_DEV(),
+    allowTaxiJourneys: IS_DEV(),
     directOnlyTaxiJourneys: false,
     internalAgencies: ['KirkkonummiE:612', 'KirkkonummiP:612'],
     externalAgencies: ['02Taksi:02_taksi'],
     allowedExternalFlexRouteTypes: [1501],
     infoLanguage: 'fi',
   },
 
-  showRouteDescNotification: IS_DEV,
+  showRouteDescNotification: IS_DEV(),
   personalisation: false,
 };
diff --git a/app/configurations/config.jyvaskyla.js b/app/configurations/config.jyvaskyla.js
@@ -1,14 +1,12 @@
 import configMerger from '../util/configMerger';
+import { IS_DEV } from '../util/envUtils';
 import walttiConfig from './config.waltti';
 
 const CONFIG = 'jyvaskyla';
 const APP_TITLE = 'Reittiopas Jyväskylä';
 const APP_DESCRIPTION = 'Jyväskylän uusi reittiopas';
-const IS_DEV =
-  process.env.RUN_ENV === 'development' ||
-  process.env.NODE_ENV !== 'production';
 
-const virtualMonitorBaseUrl = IS_DEV
+const virtualMonitorBaseUrl = IS_DEV()
   ? 'https://dev-jyvaskylamonitori.digitransit.fi'
   : 'https://pysakit.jyvaskyla.fi';
 
diff --git a/app/configurations/config.matka.js b/app/configurations/config.matka.js
@@ -6,18 +6,15 @@ import KotkaConfig from './config.kotka';
 import KouvolaConfig from './config.kouvola';
 import KuopioConfig from './config.kuopio';
 import LahtiConfig from './config.lahti';
+import { IS_DEV } from '../util/envUtils';
 
 const CONFIG = 'matka';
 const APP_DESCRIPTION =
   'Fintraffic Matka on reittiopaspalvelu, joka auttaa suunnittelemaan matkoja koko Suomessa yhdistämällä eri liikennemuodot helposti ovelta ovelle.';
 const APP_TITLE = 'Fintraffic Matka – Joukkoliikenteen reittiopas ja matkahaku';
 const YEAR = 1900 + new Date().getYear();
 
-const IS_DEV =
-  process.env.RUN_ENV === 'development' ||
-  process.env.NODE_ENV !== 'production';
-
-const virtualMonitorBaseUrl = IS_DEV
+const virtualMonitorBaseUrl = IS_DEV()
   ? 'https://dev-matkamonitori.digitransit.fi'
   : 'https://matkamonitori.digitransit.fi';
 
@@ -63,7 +60,7 @@ export default {
     rail: '#000',
     ferry: '#247C7B',
   },
-  feedIds: IS_DEV
+  feedIds: IS_DEV()
     ? ['MATKA', 'flixbus', 'CAR_FERRIES']
     : [
         'MATKA',
diff --git a/app/configurations/config.oulu.js b/app/configurations/config.oulu.js
@@ -1,15 +1,12 @@
 import configMerger from '../util/configMerger';
+import { IS_DEV } from '../util/envUtils';
 import walttiConfig from './config.waltti';
 
 const CONFIG = 'oulu';
 const APP_DESCRIPTION = 'Oulun seudun reittiopas';
 const APP_TITLE = 'Reittiopas';
 
-const IS_DEV =
-  process.env.RUN_ENV === 'development' ||
-  process.env.NODE_ENV !== 'production';
-
-const virtualMonitorBaseUrl = IS_DEV
+const virtualMonitorBaseUrl = IS_DEV()
   ? 'https://dev-oulumonitori.digitransit.fi'
   : 'https://pysakkinaytto.osl.fi';
 
diff --git a/app/configurations/config.tampere.js b/app/configurations/config.tampere.js
@@ -1,4 +1,5 @@
 import configMerger from '../util/configMerger';
+import { IS_DEV } from '../util/envUtils';
 import { BIKEAVL_WITHMAX } from '../util/vehicleRentalUtils';
 import walttiConfig from './config.waltti';
 import ttConfig from './timetableConfigUtils';
@@ -9,11 +10,7 @@ const APP_TITLE = 'Nyssen reittiopas';
 const APP_DESCRIPTION = 'Nyssen reittiopas';
 const CDN_URL = process.env.MAP_URL || 'https://dev-cdn.digitransit.fi';
 
-const IS_DEV =
-  process.env.RUN_ENV === 'development' ||
-  process.env.NODE_ENV !== 'production';
-
-const virtualMonitorBaseUrl = IS_DEV
+const virtualMonitorBaseUrl = IS_DEV()
   ? 'https://dev-tremonitori.digitransit.fi'
   : 'https://tremonitori.digitransit.fi';
 
diff --git a/app/configurations/config.vaasa.js b/app/configurations/config.vaasa.js
@@ -1,4 +1,5 @@
 import configMerger from '../util/configMerger';
+import { IS_DEV } from '../util/envUtils';
 import walttiConfig from './config.waltti';
 
 const CONFIG = 'vaasa';
@@ -10,11 +11,7 @@ const maxLat = 63.19;
 const minLon = 21.42;
 const maxLon = 22.18;
 
-const IS_DEV =
-  process.env.RUN_ENV === 'development' ||
-  process.env.NODE_ENV !== 'production';
-
-const virtualMonitorBaseUrl = IS_DEV
+const virtualMonitorBaseUrl = IS_DEV()
   ? 'https://dev-vaasamonitori.digitransit.fi'
   : 'https://pysakit-vaasa.digitransit.fi';
 
diff --git a/app/configurations/config.waltti.js b/app/configurations/config.waltti.js
@@ -1,3 +1,5 @@
+import { IS_DEV } from '../util/envUtils';
+
 const API_URL = process.env.API_URL || 'https://dev-api.digitransit.fi';
 const OTP_URL = process.env.OTP_URL || `${API_URL}/routing/v2/waltti/`;
 const MAP_URL = process.env.MAP_URL || 'https://dev-cdn.digitransit.fi';
@@ -268,12 +270,8 @@ export default {
 
   // features that should not be deployed to production
   experimental: {
-    allowFlexJourneys:
-      process.env.RUN_ENV === 'development' ||
-      process.env.NODE_ENV !== 'production',
-    allowDirectFlexJourneys:
-      process.env.RUN_ENV === 'development' ||
-      process.env.NODE_ENV !== 'production',
+    allowFlexJourneys: IS_DEV(),
+    allowDirectFlexJourneys: IS_DEV(),
   },
 
   replacementBusNotification: {
diff --git a/app/configurations/realtimeUtils.js b/app/configurations/realtimeUtils.js
@@ -1,3 +1,5 @@
+import { IS_DEV } from '../util/envUtils';
+
 /* eslint-disable prefer-template */
 function defaultRouteSelector(routePageProps) {
   const route = routePageProps.route.gtfsId.split(':');
@@ -188,10 +190,9 @@ function hslTopicResolver(
   );
 }
 
-const mqttAddress =
-  process.env.RUN_ENV === 'development' || process.env.NODE_ENV !== 'production'
-    ? 'wss://dev-mqtt.digitransit.fi'
-    : 'wss://mqtt.digitransit.fi';
+const mqttAddress = IS_DEV()
+  ? 'wss://dev-mqtt.digitransit.fi'
+  : 'wss://mqtt.digitransit.fi';
 
 const baseMqtt = {
   mqtt: mqttAddress,
diff --git a/app/store/MapLayerStore.js b/app/store/MapLayerStore.js
@@ -39,14 +39,12 @@ class MapLayerStore extends Store {
     const { config } = dispatcher.getContext();
     this.mapLayers.citybike = showRentalVehiclesOfType(
       config.vehicleRental?.networks,
-      config,
       TransportMode.Citybike,
     );
     this.mapLayers.scooter =
       config.transportModes.scooter?.showIfSelectedForRouting &&
       showRentalVehiclesOfType(
         config.vehicleRental?.networks,
-        config,
         TransportMode.Scooter,
       );
     if (config.hideMapLayersByDefault) {
diff --git a/app/store/TimeStore.js b/app/store/TimeStore.js
@@ -5,17 +5,14 @@ class TimeStore extends Store {
 
   static TWICE_PER_MINUTE = 30 * 1000;
 
-  config = {};
-
   constructor(dispatcher) {
     super(dispatcher);
-    this.config = dispatcher.getContext().config;
     this.updateCurrentTime();
     setInterval(this.updateCurrentTime, TimeStore.TWICE_PER_MINUTE);
   }
 
   updateCurrentTime = () => {
-    if (this.config.NODE_ENV === 'test') {
+    if (process.env.NODE_ENV === 'test') {
       // Set current time to Tue Dec 28 2021 for E2E-tests
       this.currentTime = Math.floor(
         Date.parse('2021-12-28T12:57:00+00:00') / 1000,
diff --git a/app/util/envUtils.js b/app/util/envUtils.js
@@ -1,6 +1,17 @@
-/** Check if application is running in a dev environment. RUN_ENV is defined in kubernetes-deploy for dev instances. For running dev locally, NODE_ENV is checked * */
-export const isDevelopmentEnvironment = config => {
+/**
+ * Check if the application is running in a dev environment.
+ * RUN_ENV='development' is set in digitransit-kubernetes-deploy for Kubernetes dev instances.
+ * Setting NODE_ENV to a specific value determines how the local environment behaves.
+ * NODE_ENV can be set to test, development, and production.
+ *
+ * ***IMPORTANT! Sometimes it is desireable to only use NODE_ENV for setting a local dev configuration.
+ * This variable should mainly be used as a config dev flag.***
+ *
+ * @returns boolean value determining if any dev environment flag is active
+ */
+export function IS_DEV() {
   return (
-    config?.RUN_ENV === 'development' || process.env.NODE_ENV === 'development'
+    process.env.RUN_ENV === 'development' ||
+    process.env.NODE_ENV !== 'production'
   );
-};
+}
diff --git a/app/util/fareUtils.js b/app/util/fareUtils.js
@@ -32,7 +32,7 @@ export const getFaresFromLegs = (legs, config) => {
     price: leg.fareProducts[0].product.price.amount,
     ticketName:
       // E2E-testing does not work without this check
-      (config.NODE_ENV === 'test' &&
+      (process.env.NODE_ENV === 'test' &&
         leg.fareProducts[0].product.id.split(':')[1]) ||
       config.fareMapping(leg.fareProducts[0].product.id),
   }));
diff --git a/app/util/modeUtils.js b/app/util/modeUtils.js
diff --git a/docs/Docker.md b/docs/Docker.md
diff --git a/docs/Installation.md b/docs/Installation.md
diff --git a/package.json b/package.json
diff --git a/win-launch-scripts/hsl-win-launch-script.bat b/win-launch-scripts/hsl-win-launch-script.bat
diff --git a/win-launch-scripts/national-win-launch-script.bat b/win-launch-scripts/national-win-launch-script.bat

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ import { startMqttClient, changeTopics } from '../util/mqttClient';`
`2`	`2`
`3`	`3`	`export function startRealTimeClient(actionContext, settings, done) {`
`4`	`4`	`/* settings may have changed, so reset old store content */`
`5`		`- if (actionContext.config.NODE_ENV === 'test') {`
	`5`	`+ if (process.env.NODE_ENV === 'test') {`
`6`	`6`	`return;`
`7`	`7`	`}`
`8`	`8`	`actionContext.dispatch('RealTimeClientReset');`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ export function settingsLimitRouting(config) {`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`export function setCurrentTimeToURL(config, match) {`
`208`		`- if (config.NODE_ENV !== 'test' && !match.location?.query?.time) {`
	`208`	`+ if (process.env.NODE_ENV !== 'test' && !match.location?.query?.time) {`
`209`	`209`	`const newLocation = {`
`210`	`210`	`...match.location,`
`211`	`211`	`query: {`