Merge pull request #5102 from HSLdevcom/DT-6400

DT-6400 analytics for scooters
HSLdevcom · Sep 30, 2024 · aade6c4 · aade6c4
2 parents defbbb0 + e14a6c7
commit aade6c4
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 23 deletions.
diff --git a/app/component/itinerary/BicycleLeg.js b/app/component/itinerary/BicycleLeg.js
@@ -375,9 +375,9 @@ export default function BicycleLeg(
             <div
               role="button"
               tabIndex="0"
-              onClick={() => openSettings(true)}
+              onClick={() => openSettings(true, true)}
               onKeyPress={e =>
-                isKeyboardSelectionEvent(e) && openSettings(true)
+                isKeyboardSelectionEvent(e) && openSettings(true, true)
               }
               className="itinerary-transit-leg-route-bike"
             >

diff --git a/app/component/itinerary/ItineraryPage.js b/app/component/itinerary/ItineraryPage.js
@@ -872,7 +872,7 @@ export default function ItineraryPage(props, context) {
     router.replace(newLocationState);
   };
 
-  const showSettingsPanel = open => {
+  const showSettingsPanel = (open, changeScooterSettings) => {
     addAnalyticsEvent({
       event: 'sendMatomoEvent',
       category: 'ItinerarySettings',
@@ -885,6 +885,7 @@ export default function ItineraryPage(props, context) {
         ...settingsState,
         settingsOpen: true,
         settingsOnOpen: getSettings(config),
+        changeScooterSettings,
       });
       if (breakpoint !== 'large') {
         router.push({
@@ -897,6 +898,17 @@ export default function ItineraryPage(props, context) {
       }
       return;
     }
+    if (
+      settingsState.changeScooterSettings &&
+      settingsState.settingsOnOpen.scooterNetworks.length <
+        getSettings(config).scooterNetworks.length
+    ) {
+      addAnalyticsEvent({
+        category: 'ItinerarySettings',
+        action: 'SettingsEnableScooterNetwork',
+        name: 'AfterOnlyScooterRoutesFound',
+      });
+    }
 
     const settingsChanged = !isEqual(
       settingsState.settingsOnOpen,
@@ -908,6 +920,7 @@ export default function ItineraryPage(props, context) {
       ...settingsState,
       settingsOpen: false,
       settingsChanged,
+      changeScooterSettings: false,
     });
 
     if (settingsChanged && detailView) {

diff --git a/app/component/itinerary/customizesearch/RentalNetworkSelector.js b/app/component/itinerary/customizesearch/RentalNetworkSelector.js
@@ -57,6 +57,7 @@ const RentalNetworkSelector = (
                 const newNetworks = updateVehicleNetworks(
                   getCitybikeNetworks(config),
                   network.networkName,
+                  network.type,
                 );
                 const newSettings = { allowedBikeRentalNetworks: newNetworks };
                 executeAction(saveRoutingSettings, newSettings);

diff --git a/app/component/itinerary/customizesearch/ScooterNetworkSelector.js b/app/component/itinerary/customizesearch/ScooterNetworkSelector.js
@@ -56,6 +56,7 @@ const ScooterNetworkSelector = (
                 const newNetworks = updateVehicleNetworks(
                   getScooterNetworks(config),
                   network.networkName,
+                  network.type,
                 );
                 const newSettings = { scooterNetworks: newNetworks };
                 executeAction(saveRoutingSettings, newSettings);

diff --git a/app/util/vehicleRentalUtils.js b/app/util/vehicleRentalUtils.js
@@ -131,33 +131,30 @@ const addAnalytics = (action, name) => {
  * Updates the list of allowed networks either by removing or adding.
  * Note: legacy settings had network names always in uppercase letters.
  *
- * @param currentSettings the current settings
- * @param newValue the network to be added/removed
- * @param config The configuration for the software installation
- * @param isUsingCitybike if citybike is enabled
+ * @param networks the previously selected networks
+ * @param networkName the network to be added/removed
+ * @param type the type of the network
  * @returns the updated citybike networks
  */
 
-export const updateVehicleNetworks = (currentSettings, newValue) => {
-  let chosenNetworks;
+export const updateVehicleNetworks = (networks, networkName, type) => {
+  let updatedNetworks;
+  let toggleAction;
 
-  if (currentSettings) {
-    chosenNetworks = currentSettings.find(
-      o => o.toLowerCase() === newValue.toLowerCase(),
-    )
-      ? without(currentSettings, newValue, newValue.toUpperCase())
-      : currentSettings.concat([newValue]);
+  if (networks.find(o => o.toLowerCase() === networkName.toLowerCase())) {
+    updatedNetworks = without(networks, networkName, networkName.toUpperCase());
+    toggleAction = 'Disable';
   } else {
-    chosenNetworks = [newValue];
+    updatedNetworks = networks.concat([networkName]);
+    toggleAction = 'Enable';
   }
 
-  if (Array.isArray(currentSettings) && Array.isArray(chosenNetworks)) {
-    const action = `Settings${
-      currentSettings.length > chosenNetworks.length ? 'Disable' : 'Enable'
-    }CityBikeNetwork`;
-    addAnalytics(action, newValue);
-  }
-  return chosenNetworks;
+  const action = `Settings${toggleAction}${
+    type === 'citybike' ? 'CityBikeNetwork' : 'ScooterNetwork'
+  }`;
+  addAnalytics(action, networkName);
+
+  return updatedNetworks;
 };
 
 export const getVehicleMinZoomOnStopsNearYou = (config, override) => {