implement review comments

rudderlabs · Oct 2, 2019 · bc0cd75 · bc0cd75
1 parent 52034e2
commit bc0cd75
Show file tree

Hide file tree

Showing 20 changed files with 199 additions and 183 deletions.
diff --git a/rudder-client-javascript/analytics/analytics.js b/rudder-client-javascript/analytics/analytics.js
@@ -10,9 +10,9 @@ import ECommercePromotion from "./utils/ECommercePromotion";
 
 //https://unpkg.com/test-rudder-sdk@1.0.5/dist/browser.js
 
-if (process.prod) {
+/* if (process.prod) {
   console.log = () => {};
-}
+} */
 
 function flush(rudderElement) {
   if (!this.eventRepository) {
@@ -112,7 +112,6 @@ class Analytics {
     if (typeof category === "string" && typeof name !== "string")
       (name = category), (category = null);
     this.processPage(category, name, properties, options, callback);
-
   }
 
   track(event, properties, options, callback) {
@@ -129,11 +128,11 @@ class Analytics {
       (callback = traits), (options = null), (traits = null);
     if (typeof userId == "object")
       (options = traits), (traits = userId), (userId = this.userId);
-    
+
     this.processIdentify(userId, traits, options, callback);
   }
 
-  processPage(category, name, properties, options, callback){
+  processPage(category, name, properties, options, callback) {
     if (!this.userId) {
       this.userId = generateUUID();
       this.storage.setUserId(this.userId);
@@ -142,7 +141,7 @@ class Analytics {
     let rudderElement = new RudderElementBuilder().setType("page").build();
     if (name) {
       console.log("name ", name);
-      rudderElement["rl_message"]["rl_name"] = name;
+      rudderElement["message"]["name"] = name;
     }
     if (category) {
       if (!properties) {
@@ -152,14 +151,14 @@ class Analytics {
     }
     if (properties) {
       console.log(JSON.parse(JSON.stringify(properties)));
-      rudderElement["rl_message"]["rl_properties"] = properties;
+      rudderElement["message"]["properties"] = properties;
     }
 
-    rudderElement["rl_message"]["rl_context"]["rl_traits"] = this.userTraits;
-    rudderElement["rl_message"]["rl_anonymous_id"] = rudderElement[
-      "rl_message"
-    ]["rl_user_id"] = rudderElement["rl_message"]["rl_context"]["rl_traits"][
-      "rl_anonymous_id"
+    rudderElement["message"]["context"]["traits"] = this.userTraits;
+    rudderElement["message"]["anonymous_id"] = rudderElement["message"][
+      "user_id"
+    ] = rudderElement["message"]["context"]["traits"][
+      "anonymous_id"
     ] = this.userId;
 
     console.log(JSON.stringify(rudderElement));
@@ -184,7 +183,7 @@ class Analytics {
     }
   }
 
-  processTrack(event, properties, options, callback){
+  processTrack(event, properties, options, callback) {
     if (!this.userId) {
       this.userId = generateUUID();
       this.storage.setUserId(this.userId);
@@ -198,11 +197,11 @@ class Analytics {
       rudderElement.setProperty(properties);
     }
 
-    rudderElement["rl_message"]["rl_context"]["rl_traits"] = this.userTraits;
-    rudderElement["rl_message"]["rl_anonymous_id"] = rudderElement[
-      "rl_message"
-    ]["rl_user_id"] = rudderElement["rl_message"]["rl_context"]["rl_traits"][
-      "rl_anonymous_id"
+    rudderElement["message"]["context"]["traits"] = this.userTraits;
+    rudderElement["message"]["anonymous_id"] = rudderElement["message"][
+      "user_id"
+    ] = rudderElement["message"]["context"]["traits"][
+      "anonymous_id"
     ] = this.userId;
 
     console.log(JSON.stringify(rudderElement));
@@ -229,7 +228,7 @@ class Analytics {
     }
   }
 
-  processIdentify(userId, traits, options, callback){
+  processIdentify(userId, traits, options, callback) {
     this.userId = userId;
     this.storage.setUserId(this.userId);
 
@@ -241,11 +240,11 @@ class Analytics {
       this.storage.setUserTraits(this.userTraits);
     }
 
-    rudderElement["rl_message"]["rl_context"]["rl_traits"] = this.userTraits;
-    rudderElement["rl_message"]["rl_anonymous_id"] = rudderElement[
-      "rl_message"
-    ]["rl_user_id"] = rudderElement["rl_message"]["rl_context"]["rl_traits"][
-      "rl_anonymous_id"
+    rudderElement["message"]["context"]["traits"] = this.userTraits;
+    rudderElement["message"]["anonymous_id"] = rudderElement["message"][
+      "user_id"
+    ] = rudderElement["message"]["context"]["traits"][
+      "anonymous_id"
     ] = this.userId;
 
     console.log(JSON.stringify(rudderElement));
@@ -272,22 +271,25 @@ class Analytics {
     }
   }
 
-  identifyUser(rudderElement, callback){
+  identifyUser(rudderElement, callback) {
     this.userId = userId;
     this.storage.setUserId(this.userId);
 
-    if (rudderElement && rudderElement["rl_message"]
-        && rudderElement["rl_message"]["rl_context"] 
-        && rudderElement["rl_message"]["rl_context"]["rl_traits"] ) {
+    if (
+      rudderElement &&
+      rudderElement["message"] &&
+      rudderElement["message"]["context"] &&
+      rudderElement["message"]["context"]["traits"]
+    ) {
       this.userTraits = traits;
       this.storage.setUserTraits(this.userTraits);
     }
 
-    rudderElement["rl_message"]["rl_context"]["rl_traits"] = this.userTraits;
-    rudderElement["rl_message"]["rl_anonymous_id"] = rudderElement[
-      "rl_message"
-    ]["rl_user_id"] = rudderElement["rl_message"]["rl_context"]["rl_traits"][
-      "rl_anonymous_id"
+    rudderElement["message"]["context"]["traits"] = this.userTraits;
+    rudderElement["message"]["anonymous_id"] = rudderElement["message"][
+      "user_id"
+    ] = rudderElement["message"]["context"]["traits"][
+      "anonymous_id"
     ] = this.userId;
 
     console.log(JSON.stringify(rudderElement));
@@ -314,17 +316,17 @@ class Analytics {
     }
   }
 
-  trackPage(rudderElement, callback){
+  trackPage(rudderElement, callback) {
     if (!this.userId) {
       this.userId = generateUUID();
       this.storage.setUserId(this.userId);
     }
 
-    rudderElement["rl_message"]["rl_context"]["rl_traits"] = this.userTraits;
-    rudderElement["rl_message"]["rl_anonymous_id"] = rudderElement[
-      "rl_message"
-    ]["rl_user_id"] = rudderElement["rl_message"]["rl_context"]["rl_traits"][
-      "rl_anonymous_id"
+    rudderElement["message"]["context"]["traits"] = this.userTraits;
+    rudderElement["message"]["anonymous_id"] = rudderElement["message"][
+      "user_id"
+    ] = rudderElement["message"]["context"]["traits"][
+      "anonymous_id"
     ] = this.userId;
 
     console.log(JSON.stringify(rudderElement));
@@ -349,17 +351,17 @@ class Analytics {
     }
   }
 
-  trackEvent(rudderElement, callback){
+  trackEvent(rudderElement, callback) {
     if (!this.userId) {
       this.userId = generateUUID();
       this.storage.setUserId(this.userId);
     }
 
-    rudderElement["rl_message"]["rl_context"]["rl_traits"] = this.userTraits;
-    rudderElement["rl_message"]["rl_anonymous_id"] = rudderElement[
-      "rl_message"
-    ]["rl_user_id"] = rudderElement["rl_message"]["rl_context"]["rl_traits"][
-      "rl_anonymous_id"
+    rudderElement["message"]["context"]["traits"] = this.userTraits;
+    rudderElement["message"]["anonymous_id"] = rudderElement["message"][
+      "user_id"
+    ] = rudderElement["message"]["context"]["traits"][
+      "anonymous_id"
     ] = this.userId;
 
     console.log(JSON.stringify(rudderElement));

diff --git a/rudder-client-javascript/analytics/dist/browser.js b/rudder-client-javascript/analytics/dist/browser.js
diff --git a/rudder-client-javascript/analytics/dist/node.js b/rudder-client-javascript/analytics/dist/node.js
diff --git a/rudder-client-javascript/analytics/integrations/HubSpot/browser.js b/rudder-client-javascript/analytics/integrations/HubSpot/browser.js
@@ -15,12 +15,12 @@ class HubSpot {
   identify(rudderElement) {
     console.log("in HubspotAnalyticsManager identify");
 
-    let traits = rudderElement.rl_message.rl_context.rl_traits;
+    let traits = rudderElement.message.context.traits;
     let traitsValue = {};
 
     for (let k in traits) {
       if (!!Object.getOwnPropertyDescriptor(traits, k) && traits[k]) {
-        let hubspotkey = k.startsWith("rl_") ? k.substring(3, k.length) : k;
+        let hubspotkey = k.startsWith("") ? k.substring(3, k.length) : k;
         traitsValue[hubspotkey] = traits[k];
       }
     }
@@ -30,19 +30,19 @@ class HubSpot {
       delete traitsValue["address"];
       for (let k in address) {
         if (!!Object.getOwnPropertyDescriptor(address, k) && address[k]) {
-          let hubspotkey = k.startsWith("rl_") ? k.substring(3, k.length) : k;
+          let hubspotkey = k.startsWith("") ? k.substring(3, k.length) : k;
           hubspotkey = hubspotkey == "street" ? "address" : hubspotkey;
           traitsValue[hubspotkey] = address[k];
         }
       }
     }
-    let userProperties = rudderElement.rl_message.rl_context.rl_user_properties;
+    let userProperties = rudderElement.message.context.user_properties;
     for (let k in userProperties) {
       if (
         !!Object.getOwnPropertyDescriptor(userProperties, k) &&
         userProperties[k]
       ) {
-        let hubspotkey = k.startsWith("rl_") ? k.substring(3, k.length) : k;
+        let hubspotkey = k.startsWith("") ? k.substring(3, k.length) : k;
         traitsValue[hubspotkey] = userProperties[k];
       }
     }
@@ -59,30 +59,30 @@ class HubSpot {
     console.log("in HubspotAnalyticsManager track");
     let _hsq = (window._hsq = window._hsq || []);
     let eventValue = {};
-    eventValue["id"] = rudderElement.rl_message.rl_event;
+    eventValue["id"] = rudderElement.message.event;
     if (
-      rudderElement.rl_message.rl_properties &&
-      rudderElement.rl_message.rl_properties.revenue
+      rudderElement.message.properties &&
+      rudderElement.message.properties.revenue
     ) {
-      console.log("revenue: " + rudderElement.rl_message.rl_properties.revenue);
-      eventValue["value"] = rudderElement.rl_message.rl_properties.revenue;
+      console.log("revenue: " + rudderElement.message.properties.revenue);
+      eventValue["value"] = rudderElement.message.properties.revenue;
     }
     _hsq.push(["trackEvent", eventValue]);
   }
 
   page(rudderElement) {
     console.log("in HubspotAnalyticsManager page");
     let _hsq = (window._hsq = window._hsq || []);
-    //console.log("path: " + rudderElement.rl_message.rl_properties.path);
-    //_hsq.push(["setPath", rudderElement.rl_message.rl_properties.path]);
+    //console.log("path: " + rudderElement.message.properties.path);
+    //_hsq.push(["setPath", rudderElement.message.properties.path]);
     /* _hsq.push(["identify",{
         email: "testtrackpage@email.com"
     }]); */
     if (
-      rudderElement.rl_message.rl_properties &&
-      rudderElement.rl_message.rl_properties.path
+      rudderElement.message.properties &&
+      rudderElement.message.properties.path
     ) {
-      _hsq.push(["setPath", rudderElement.rl_message.rl_properties.path]);
+      _hsq.push(["setPath", rudderElement.message.properties.path]);
     }
     _hsq.push(["trackPageView"]);
   }

diff --git a/rudder-client-javascript/analytics/package-lock.json b/rudder-client-javascript/analytics/package-lock.json
diff --git a/rudder-client-javascript/analytics/package.json b/rudder-client-javascript/analytics/package.json
@@ -29,6 +29,7 @@
     "rollup-plugin-eslint": "^7.0.0",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-replace": "^2.2.0",
+    "rollup-plugin-strip": "^1.2.2",
     "rollup-plugin-terser": "^5.1.2",
     "rollup-plugin-uglify": "^6.0.3",
     "xmlhttprequest": "^1.8.0"

diff --git a/rudder-client-javascript/analytics/rollup.config.js b/rudder-client-javascript/analytics/rollup.config.js
@@ -3,6 +3,7 @@ import commonjs from "rollup-plugin-commonjs";
 import resolve from "rollup-plugin-node-resolve";
 import replace from "rollup-plugin-replace";
 import { terser } from "rollup-plugin-terser";
+import strip from "rollup-plugin-strip";
 
 export default {
   input: "analytics.js",
@@ -23,6 +24,7 @@ export default {
       "process.browser": process.env.NODE_ENV == "true" ? false : true,
       "process.prod": process.env.ENV == "prod" ? true : false
     }),
+    process.env.ENV == "prod" && strip(),
     resolve(),
     commonjs(),
     babel({

diff --git a/rudder-client-javascript/analytics/utils/CartViewedEvent.js b/rudder-client-javascript/analytics/utils/CartViewedEvent.js
@@ -13,7 +13,7 @@ class CartViewedEvent {
     if (!this.products) {
       this.products = products;
     } else {
-      this.products.pushValues(products);
+      this.products.pushValues(...products);
     }
     return this; //keeping code aligned with builder pattern
   }

diff --git a/rudder-client-javascript/analytics/utils/ECommerceCart.js b/rudder-client-javascript/analytics/utils/ECommerceCart.js
@@ -8,7 +8,7 @@ class ECommerceCart {
   addProducts(productsToBeAdded) {
     if (productsToBeAdded) {
       //add only if not-null
-      this.products.pushValues(productsToBeAdded);
+      this.products.pushValues(...productsToBeAdded);
     }
     return this; //to aid builder pattern
   }

diff --git a/rudder-client-javascript/analytics/utils/ECommerceOrder.js b/rudder-client-javascript/analytics/utils/ECommerceOrder.js
@@ -77,7 +77,7 @@ class ECommerceOrder {
         //check for null array
         this.products = [];
       }
-      this.products.pushValues(productsToBeAdded);
+      this.products.pushValues(...productsToBeAdded);
     }
     return this; //to aid builder pattern
   }

diff --git a/rudder-client-javascript/analytics/utils/EventRepository.js b/rudder-client-javascript/analytics/utils/EventRepository.js
@@ -41,7 +41,8 @@ class EventRepository {
     }
 
     console.log("==== in flush sending to Rudder BE ====");
-    console.log(JSON.stringify(payload, replacer).replace(/rl_/g, ""));
+    //console.log(JSON.stringify(payload, replacer).replace(/rl_/g, ""));
+    console.log(JSON.stringify(payload, replacer));
 
     xhr.open("POST", repo.url, true);
     xhr.setRequestHeader("Content-Type", "application/json");
@@ -58,7 +59,8 @@ class EventRepository {
       }
       repo.state = "READY";
     };
-    xhr.send(JSON.stringify(payload, replacer).replace(/rl_/g, ""));
+    //xhr.send(JSON.stringify(payload, replacer).replace(/rl_/g, ""));
+    xhr.send(JSON.stringify(payload, replacer));
     repo.state = "PROCESSING";
   }
 

diff --git a/rudder-client-javascript/analytics/utils/ProductListFilteredEvent.js b/rudder-client-javascript/analytics/utils/ProductListFilteredEvent.js
@@ -22,7 +22,7 @@ class ProductListFilteredEvent {
     if (!this.products) {
       this.products = products;
     } else {
-      this.products.pushValues(products);
+      this.products.pushValues(...products);
     }
     return this;
   }
@@ -39,7 +39,7 @@ class ProductListFilteredEvent {
     if (!this.filters) {
       this.filters = filters;
     } else {
-      this.filters.pushValues(filters);
+      this.filters.pushValues(...filters);
     }
     return this;
   }
@@ -56,7 +56,7 @@ class ProductListFilteredEvent {
     if (!this.sorts) {
       this.sorts = sorts;
     } else {
-      this.sorts.pushValues(sorts);
+      this.sorts.pushValues(...sorts);
     }
     return this;
   }