rudderlabs · utsabc · Jul 12, 2022 · Jul 12, 2022 · Jul 12, 2022
diff --git a/integrations/Matomo/browser.js b/integrations/Matomo/browser.js
@@ -181,12 +181,12 @@ class Matomo {
    const trimmedEvent = event.toLowerCase().trim();

    // For every type of track calls we consider the trackGoal function.
-    if (goalListMap.has(trimmedEvent)) {
+    if (goalListMap[trimmedEvent]) {
      goalIdMapping(trimmedEvent, goalListMap, message);
    }

    // Mapping Standard Events
-    if (standardEventsMap.has(trimmedEvent)) {
+    if (standardEventsMap[trimmedEvent]) {
      standardEventsMapping(trimmedEvent, standardEventsMap, message);
    }

@@ -204,4 +204,4 @@ class Matomo {
  }
 }

-export default Matomo;
+export default Matomo;
diff --git a/integrations/Matomo/util.js b/integrations/Matomo/util.js
@@ -1,3 +1,4 @@
+import each from "@ndhoule/each";
 import logger from "../../utils/logUtil";
 import { getHashFromArray } from "../utils/commonUtils";
 import { NAME } from "./constants";
@@ -9,15 +10,15 @@ import { NAME } from "./constants";
 */
 const goalIdMapping = (event, goalListMap, message) => {
  let revenue;
-  if (message.properties) revenue = message.properties.revenue;
-  goalListMap.forEach((val, key) => {
+  revenue = message.properties?.revenue;
+  each((val, key) => {
    if (key === event) {
      val.forEach((v) => {
        if (revenue) window._paq.push(["trackGoal", v, revenue]);
        else window._paq.push(["trackGoal", v]);
      });
    }
-  });
+  }, goalListMap);
 };

 /** Mapping Standard Events 
@@ -27,7 +28,7 @@ const goalIdMapping = (event, goalListMap, message) => {
 @param  {} message
 */
 const standardEventsMapping = (event, standardEventsMap, message) => {
-  standardEventsMap.forEach((val, key) => {
+  each((val, key) => {
    if (key === event) {
      let url;
      let linkType;
@@ -132,7 +133,7 @@ const standardEventsMapping = (event, standardEventsMap, message) => {
        }
      });
    }
-  });
+  }, standardEventsMap);
 };

 /** Mapping Ecommerce Events
@@ -344,9 +345,9 @@ const checkCustomDimensions = (message) => {
        "dimensionId",
        "dimensionValue"
      );
-      customDimensionsMap.forEach((val, key) => {
+      each((val, key) => {
        window._paq.push(["setCustomDimension", key, val]);
-      });
+      }, customDimensionsMap);
    }
  }
 };
@@ -356,4 +357,4 @@ export {
  ecommerceEventsMapping,
  standardEventsMapping,
  checkCustomDimensions,
-};
+};
diff --git a/integrations/utils/commonUtils.js b/integrations/utils/commonUtils.js
@@ -31,20 +31,18 @@ const getHashFromArrayWithDuplicate = (
  toKey = "to",
  isLowerCase = true
 ) => {
-  const hashMap = new Map();
+  const hashMap = {};
  if (Array.isArray(arrays)) {
    arrays.forEach((array) => {
      if (!isNotEmpty(array[fromKey])) return;
      const key = isLowerCase
        ? array[fromKey].toLowerCase().trim()
        : array[fromKey].trim();

-      if (hashMap.has(key)) {
-        const valueArray = hashMap.get(key);
-        valueArray.push(array[toKey]);
-        hashMap.set(key, valueArray);
+      if (hashMap[key]) {
+        hashMap[key].push(array[toKey]);
      } else {
-        hashMap.set(key, [array[toKey]]);
+        hashMap[key]= [array[toKey]];
      }
    });
  }
@@ -132,4 +130,4 @@ export {
  isDefinedAndNotNullAndNotEmpty,
  isBlank,
  pick,
-};
+};