Merge pull request #5406 from HSLdevcom/keep-location-state-variables

DT-6918 - Fix unnecessary page reloads caused by errorBoundaryKey being removed from state

Author: vesameskanen

app/component/itinerary/ItineraryListContainer.js

@@ -61,7 +61,10 @@ function ItineraryListContainer(
     });
     const newLocation = {
       ...match.location,
-      state: { selectedItineraryIndex: index },
+      state: {
+        ...match.location.state,
+        selectedItineraryIndex: index,
+      },
     };
     const basePath = `${getItineraryPagePath(
       params.from,
@@ -82,7 +85,10 @@ function ItineraryListContainer(
     } else {
       router.replace({
         ...match.location,
-        state: { selectedItineraryIndex: index },
+        state: {
+          ...match.location.state,
+          selectedItineraryIndex: index,
+        },
       });
 
       addAnalyticsEvent({

app/component/itinerary/ItineraryPage.js

@@ -209,7 +209,10 @@ export default function ItineraryPage(props, context) {
     });
     const newLocationState = {
       ...location,
-      state: { selectedItineraryIndex: 0 },
+      state: {
+        ...location.state,
+        selectedItineraryIndex: 0,
+      },
     };
     const basePath = getItineraryPagePath(params.from, params.to);
     let pagePath = basePath;
@@ -1093,7 +1096,10 @@ export default function ItineraryPage(props, context) {
 
     const newLocationState = {
       ...location,
-      state: { selectedItineraryIndex: index },
+      state: {
+        ...location.state,
+        selectedItineraryIndex: index,
+      },
     };
     const pagePath = `${getItineraryPagePath(
       params.from,