Revert "Merge pull request #4788 from HSLdevcom/DT-5859"

This reverts commit d603090, reversing changes made to 83b3102. Kela customizations break standard UI. Reverted to allow a new release.
HSLdevcom · Apr 29, 2023 · 762af42 · 762af42
1 parent a3ecfee
commit 762af42
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 101 deletions.
diff --git a/app/component/ItineraryTab.js b/app/component/ItineraryTab.js
@@ -368,7 +368,6 @@ const withRelay = createFragmentContainer(
           mode
           nextLegs(numberOfLegs: 2  originModesWithParentStation: [RAIL]  destinationModesWithParentStation: [RAIL]) {
             mode
-            distance
             route {
               alerts {
                 alertSeverityLevel

diff --git a/app/component/LegInfo.js b/app/component/LegInfo.js
@@ -58,9 +58,6 @@ const LegInfo = (
         </span>
       </Link>
       <div className="headsign">{headsign}</div>
-      {config.showTransitLegDistance && (
-        <div>{(leg.distance / 1000).toFixed(1)} km</div>
-      )}
       {displayTime && (
         <span className={cx('leg-departure-time', { realtime: leg.realTime })}>
           {moment(leg.startTime).format('HH:mm')}

diff --git a/app/component/QuickSettingsPanel.js b/app/component/QuickSettingsPanel.js
@@ -36,18 +36,14 @@ class QuickSettingsPanel extends React.Component {
           <DatetimepickerContainer
             realtime={false}
             embedWhenClosed={
-              !this.context.config.hideItinerarySettings && (
-                <div className="open-advanced-settings">
-                  <RightOffcanvasToggle onToggleClick={toggleSettings} />
-                </div>
-              )
+              <div className="open-advanced-settings">
+                <RightOffcanvasToggle onToggleClick={toggleSettings} />
+              </div>
             }
             embedWhenOpen={
               <div className="open-embed-container">
                 <div className="open-advanced-settings open-embed">
-                  {!this.context.config.hideItinerarySettings && (
-                    <RightOffcanvasToggle onToggleClick={toggleSettings} />
-                  )}
+                  <RightOffcanvasToggle onToggleClick={toggleSettings} />
                 </div>
               </div>
             }

diff --git a/app/component/StreetModeSelector.js b/app/component/StreetModeSelector.js
@@ -5,26 +5,23 @@ import { StreetModeSelectorButton } from './StreetModeSelectorButton';
 import { StreetModeSelectorWeatherLabel } from './StreetModeSelectorWeatherLabel';
 import { StreetModeSelectorShimmer } from './StreetModeSelectorShimmer';
 
-export const StreetModeSelector = (
-  {
-    showWalkOptionButton,
-    showBikeOptionButton,
-    showBikeAndPublicOptionButton,
-    showCarOptionButton,
-    showParkRideOptionButton,
-    toggleStreetMode,
-    setStreetModeAndSelect,
-    weatherData,
-    walkPlan,
-    bikePlan,
-    bikeAndPublicPlan,
-    bikeParkPlan,
-    carPlan,
-    parkRidePlan,
-    loading,
-  },
-  { config },
-) => {
+export const StreetModeSelector = ({
+  showWalkOptionButton,
+  showBikeOptionButton,
+  showBikeAndPublicOptionButton,
+  showCarOptionButton,
+  showParkRideOptionButton,
+  toggleStreetMode,
+  setStreetModeAndSelect,
+  weatherData,
+  walkPlan,
+  bikePlan,
+  bikeAndPublicPlan,
+  bikeParkPlan,
+  carPlan,
+  parkRidePlan,
+  loading,
+}) => {
   const bikeAndVehicle = !loading
     ? {
         itineraries: [
@@ -38,16 +35,14 @@ export const StreetModeSelector = (
       <StreetModeSelectorShimmer loading={loading} />
       {!loading && (
         <div className="street-mode-button-row">
-          {config.showWeatherLabel && (
-            <StreetModeSelectorWeatherLabel
-              active={
-                showWalkOptionButton ||
-                showBikeOptionButton ||
-                showBikeAndPublicOptionButton
-              }
-              weatherData={weatherData}
-            />
-          )}
+          <StreetModeSelectorWeatherLabel
+            active={
+              showWalkOptionButton ||
+              showBikeOptionButton ||
+              showBikeAndPublicOptionButton
+            }
+            weatherData={weatherData}
+          />
           {showWalkOptionButton && (
             <StreetModeSelectorButton
               icon="icon-icon_walk"
@@ -125,8 +120,4 @@ StreetModeSelector.defaultProps = {
   loading: undefined,
 };
 
-StreetModeSelector.contextTypes = {
-  config: PropTypes.object,
-};
-
 export default StreetModeSelector;
diff --git a/app/component/StreetModeSelectorButton.js b/app/component/StreetModeSelectorButton.js
@@ -124,17 +124,8 @@ export const StreetModeSelectorButton = (
           ''
         )}
         <div className="street-mode-button-info">
-          {config.showDistanceBeforeDuration ? (
-            <>
-              <div className="street-mode-button-time">{distance}</div>
-              <div className="street-mode-button-length">{duration}</div>
-            </>
-          ) : (
-            <>
-              <div className="street-mode-button-time">{duration}</div>
-              <div className="street-mode-button-length">{distance}</div>
-            </>
-          )}
+          <div className="street-mode-button-time">{duration}</div>
+          <div className="street-mode-button-length">{distance}</div>
         </div>
       </div>
     </div>

diff --git a/app/component/SummaryPage.js b/app/component/SummaryPage.js
@@ -2235,8 +2235,7 @@ class SummaryPage extends React.Component {
     }
 
     const showWalkOptionButton = Boolean(
-      this.context.config.showWalkOption &&
-        walkPlan &&
+      walkPlan &&
         walkPlan.itineraries &&
         walkPlan.itineraries.length > 0 &&
         !currentSettings.accessibilityOption &&
@@ -2249,6 +2248,7 @@ class SummaryPage extends React.Component {
       bikePlan.itineraries.every(itinerary =>
         itinerary.legs.every(leg => leg.mode === 'WALK'),
       );
+
     const showBikeOptionButton = Boolean(
       bikePlan &&
         bikePlan.itineraries &&

diff --git a/app/component/SummaryRow.js b/app/component/SummaryRow.js
@@ -16,7 +16,6 @@ import {
   getLegBadgeProps,
   isCallAgencyPickupType,
   getInterliningLegs,
-  getTotalDistance,
 } from '../util/legUtils';
 import { dateOrEmpty, isTomorrow } from '../util/timeUtils';
 import withBreakpoint from '../util/withBreakpoint';
@@ -773,13 +772,6 @@ const SummaryRow = (
                 <div className="itinerary-start-time-and-end-time">
                   {itineraryStartAndEndTime}
                 </div>
-
-                <div style={{ flexGrow: 1 }} />
-                {config.showDistanceInItinerarySummary && (
-                  <div className="itinerary-total-distance">
-                    {(getTotalDistance(data) / 1000).toFixed(1)} km
-                  </div>
-                )}
                 <div className="itinerary-duration">
                   <RelativeDuration duration={duration} />
                 </div>

diff --git a/app/component/summary-row.scss b/app/component/summary-row.scss
@@ -95,9 +95,16 @@
     line-height: normal;
     font-style: normal;
     padding-top: 17px;
-    display: flex;
 
+    .itinerary-start-time-and-end-time {
+      float: left;
+    }
+    .itinerary-duration {
+      float: right;
+    }
     .itinerary-start-date {
+      padding-right: 5px;
+      float: left;
       text-transform: capitalize;
       .tomorrow {
         text-transform: capitalize;
@@ -106,12 +113,6 @@
         text-transform: lowercase;
       }
     }
-    .itinerary-total-distance {
-      //float: right;
-      //padding-left: 20px;
-      flex-grow: 1;
-      margin-right: 20px;
-    }
   }
 
   .itinerary-end-time-and-distance {

diff --git a/app/util/geo-utils.js b/app/util/geo-utils.js
@@ -98,9 +98,6 @@ function displayDistanceWithLocale(meters, formatNumber) {
 }
 
 export function displayDistance(meters, config, formatNumber) {
-  if (config.alwaysShowDistanceInKm) {
-    return `${(meters / 1000).toFixed(1)}  km`;
-  }
   if (isImperial(config)) {
     return displayImperialDistance(meters);
   }
@@ -122,10 +119,6 @@ export function displayDistance(meters, config, formatNumber) {
   return `${Math.round(meters / 10000) * 10} km`; // tens of kilometers
 }
 
-/* export function displayDistance2(meters) {
-  return `${(meters / 1000).toFixed(1)}  km`;
-}
- */
 /* eslint-enable yoda */
 
 // Return the bounding box of a latlon array of length > 0

diff --git a/sass/themes/kela/_theme.scss b/sass/themes/kela/_theme.scss
diff --git a/sass/themes/kela/main.scss b/sass/themes/kela/main.scss