Merge branch 'hotfix/analytics-fix'

Author: Parth Shah

src/config/store.js

@@ -3,14 +3,15 @@ import { createStore, applyMiddleware, compose } from 'redux'
 import reducers from '../reducers'
 import promiseMiddleware from 'redux-promise-middleware'
 import { createTracker } from 'redux-segment'
+import segmentPromiseHelper from '../middleware/segmentPromiseHelper'
 
 const tracker = createTracker()
-
 const middleware = [
   promiseMiddleware({
     promiseTypeSuffixes: ['PENDING', 'SUCCESS', 'FAILURE']
   }),
   thunk,
+  segmentPromiseHelper,
   tracker
 ]
 

src/middleware/segmentPromiseHelper.js

@@ -0,0 +1,15 @@
+
+/**
+ * A hack honestly, but using this to bridge redux-promise-middleware &&
+ * redux-segment. The latter fires a tracking event for both
+ * Pending & Success / Failure events without this work-around
+ */
+export default function segmentPromiseHelper() {
+  return next => action => {
+    const { type, meta } = action
+    if (meta && meta.onSuccessAnalytics && /.*_SUCCESS/.test(type)) {
+      meta.analytics = meta.onSuccessAnalytics
+    }
+    return next(action)
+  }
+}

src/projects/actions/projectTopics.js

@@ -10,7 +10,7 @@ import {
   LOAD_PROJECT_FEEDS_MEMBERS
 } from '../../config/constants'
 import { loadMembers } from '../../actions/members'
-// import { EventTypes } from 'redux-segment'
+import { EventTypes } from 'redux-segment'
 
 /**
  * Load all project data to paint the dashboard
@@ -103,25 +103,25 @@ export function createProjectTopic(projectId, topic) {
     reference: 'project',
     referenceId: projectId.toString()
   }, topic)
-  return (dispatch/*, getState*/) => {
-    // const projectStatus = getState().projectState.project.status
+  return (dispatch, getState) => {
+    const projectStatus = getState().projectState.project.status
     return dispatch({
       type: CREATE_PROJECT_FEED,
       payload: createTopic(updatedTopic),
       meta: {
-        tag: topic.tag
-        // analytics: {
-        //   eventType: EventTypes.track,
-        //   eventPayload: {
-        //     event: 'Project Topic Created',
-        //     properties: {
-        //       text: topic.body,
-        //       topicCategory: topic.tag,
-        //       projectId,
-        //       projectStatus
-        //     }
-        //   }
-        // }
+        tag: topic.tag,
+        onSuccessAnalytics: {
+          eventType: EventTypes.track,
+          eventPayload: {
+            event: 'Project Topic Created',
+            properties: {
+              text: topic.body,
+              topicCategory: topic.tag,
+              projectId,
+              projectStatus
+            }
+          }
+        }
       }
     })
   }
@@ -141,25 +141,25 @@ export function loadFeedComments(feedId, tag, postIds) {
 }
 
 export function addFeedComment(feedId, tag, comment) {
-  return (dispatch/*, getState*/) => {
-    // const projectStatus = getState().projectState.project.status
+  return (dispatch, getState) => {
+    const projectStatus = getState().projectState.project.status
     return dispatch({
       type: CREATE_PROJECT_FEED_COMMENT,
       payload: addTopicPost(feedId, comment),
       meta: {
         feedId,
-        tag
-        // analytics: {
-        //   eventType: EventTypes.track,
-        //   eventPayload: {
-        //     event: 'Project Topic Comment Created',
-        //     properties: {
-        //       topicCategory: tag,
-        //       topicId: feedId,
-        //       projectStatus
-        //     }
-        //   }
-        // }
+        tag,
+        onSuccessAnalytics: {
+          eventType: EventTypes.track,
+          eventPayload: {
+            event: 'Project Topic Comment Created',
+            properties: {
+              topicCategory: tag,
+              topicId: feedId,
+              projectStatus
+            }
+          }
+        }
       }
     })
   }