From 76cbaf6bc07480f897079ae40699addc1742972a Mon Sep 17 00:00:00 2001
From: Rupesh Parab <rupeshparab.rp@gmail.com>
Date: Thu, 23 Jul 2020 20:18:43 +0530
Subject: [PATCH] #1206 -  move paramters from user details event to custom
 attributes

---
 src/components/index.js        |  7 ++++++-
 src/redux/userProfile/sagas.js | 26 ++------------------------
 src/services/mathshare.js      | 11 +++++++++++
 3 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/components/index.js b/src/components/index.js
index 2ecb74ee..669cacbc 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -55,6 +55,7 @@ import keyMap from '../constants/hotkeyConfig.json';
 import { stopEvent, passEventForKeys } from '../services/events';
 import { getPathTo } from '../services/dom';
 import './styles.scss';
+import { getFormattedUserType } from '../services/mathshare';
 
 
 const mathLive = process.env.MATHLIVE_DEBUG_MODE
@@ -468,11 +469,15 @@ class App extends Component {
             modal, problemList, problemStore, userProfile,
         } = this.props;
         const { email, name } = userProfile;
+        const { userType, role, grades } = userProfile.info;
 
         const intercomAttributes = {
             user_id: email,
             email,
             name,
+            userType: getFormattedUserType(userType),
+            userRole: role,
+            grades,
         };
         return (
             <React.Fragment>
@@ -568,7 +573,7 @@ class App extends Component {
                             <Route render={p => <NotFound {...p} />} />
                         </Switch>
                     </div>
-                    {['teacher', 'other'].includes(userProfile.info.userType) && <Intercom {...intercomAttributes} appID={process.env.INTERCOM_APP_ID} />}
+                    {['teacher', 'other'].includes(userType) && <Intercom {...intercomAttributes} appID={process.env.INTERCOM_APP_ID} />}
                     <footer id="footer">
                         <h2 className="sROnly">
                             {' '}
diff --git a/src/redux/userProfile/sagas.js b/src/redux/userProfile/sagas.js
index f0a7a185..adbb8e2c 100644
--- a/src/redux/userProfile/sagas.js
+++ b/src/redux/userProfile/sagas.js
@@ -45,20 +45,13 @@ import { getCookie } from '../../scripts/cookie';
 import Locales from '../../strings';
 import { sessionStore } from '../../scripts/storage';
 import { waitForIntercomToBoot } from '../../services/intercom';
+import { getFormattedUserType } from '../../services/mathshare';
 
 const loginAlertId = 'login-alert';
 const redirectAlertId = 'redirect-info';
 const redirectWait = 2500;
 
-const getFormattedUserType = (userType) => {
-    if (userType === 'teacher') {
-        return 'Teacher';
-    }
-    if (userType === 'student') {
-        return 'Student';
-    }
-    return 'Undefined';
-};
+
 
 function* checkUserLoginSaga() {
     yield throttle(60000, 'CHECK_USER_LOGIN', function* workerSaga() {
@@ -198,12 +191,9 @@ function* saveUserInfoSaga() {
             email,
             redirectTo,
         } = yield select(getState);
-        let intercomPayload = null;
         try {
             const {
                 userType,
-                grades,
-                role,
             } = payload;
             const userInfoResponse = yield call(saveUserInfoApi, {
                 ...payload,
@@ -211,24 +201,12 @@ function* saveUserInfoSaga() {
                 email,
             });
             yield put(setUserInfo(userInfoResponse.data));
-            if (['teacher', 'other'].includes(userType)) {
-                intercomPayload = {
-                    userType: getFormattedUserType(userType),
-                    userRole: role,
-                    grades,
-                };
-            }
         } catch (error) {
             yield put({
                 type: 'SAVE_USER_INFO_FAILURE',
             });
         } finally {
             yield put(replace(redirectTo));
-            if (intercomPayload) {
-                if (yield call(waitForIntercomToBoot, 5)) {
-                    IntercomAPI('trackEvent', 'user-details', intercomPayload);
-                }
-            }
         }
     });
 }
diff --git a/src/services/mathshare.js b/src/services/mathshare.js
index 8693888a..e988ec3f 100644
--- a/src/services/mathshare.js
+++ b/src/services/mathshare.js
@@ -16,6 +16,17 @@ export const getMathshareLink = (params, currentSolution, problem) => {
     return null;
 };
 
+export const getFormattedUserType = (userType) => {
+    if (userType === 'teacher') {
+        return 'Teacher';
+    }
+    if (userType === 'student') {
+        return 'Student';
+    }
+    return 'Undefined';
+};
+
 export default {
+    getFormattedUserType,
     getMathshareLink,
 };