Merge pull request #1455 from alisman/fixGA

Fix google analytics. 3rd party analytics library was interfering wit…
cBioPortal · Sep 14, 2018 · 3cbf4d8 · 3cbf4d8
2 parents 631e56a + 369231a
commit 3cbf4d8
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 81 deletions.
diff --git a/end-to-end-tests/specs/home.spec.js b/end-to-end-tests/specs/home.spec.js
diff --git a/src/appBootstrapper.jsx b/src/appBootstrapper.jsx
@@ -15,9 +15,10 @@ import { getHost } from './shared/api/urls';
 import { validateParametersPatientView } from './shared/lib/validateParameters';
 import AppConfig from "appConfig";
 import browser from 'bowser';
-import './shared/lib/tracking';
+
 import 'script-loader!raven-js/dist/raven.js';
 import {correctPatientUrl} from "shared/lib/urlCorrection";
+import {activateAnalytics} from "shared/lib/tracking";
 
 
 if (localStorage.localdev === 'true' || localStorage.localdist === 'true') {
@@ -174,6 +175,8 @@ window.routingStore = routingStore;
 
 let render = () => {
 
+    activateAnalytics();
+
     const rootNode = document.getElementById("reactRoot");
 
     ReactDOM.render(

diff --git a/src/pages/resultsView/ResultsViewPage.tsx b/src/pages/resultsView/ResultsViewPage.tsx
@@ -38,7 +38,6 @@ import ResultsViewOncoprint from "shared/components/oncoprint/ResultsViewOncopri
 import QuerySummary from "./querySummary/QuerySummary";
 import {QueryStore} from "../../shared/components/query/QueryStore";
 import Loader from "../../shared/components/loadingIndicator/LoadingIndicator";
-import {getGAInstance} from "../../shared/lib/tracking";
 import ExpressionWrapper from "./expression/ExpressionWrapper";
 import CoExpressionTabContainer from "./coExpression/CoExpressionTabContainer";
 import EnrichmentsTab from 'pages/resultsView/enrichments/EnrichmentsTab';
@@ -170,11 +169,6 @@ export default class ResultsViewPage extends React.Component<IResultsViewPagePro
                 $('a#data-download-result-tab').parent().hide();
             }
 
-            if (win.cancerStudyIdList !== 'null') {
-                getGAInstance().event('results view', 'show', { eventLabel: win.cancerStudyIdList  });
-            } else if (_.includes(['all','null'],win.cancerStudyId) === false) {
-                getGAInstance().event('results view', 'show', { eventLabel: win.cancerStudyId  });
-            }
         });
     }
 

diff --git a/src/routes.jsx b/src/routes.jsx
@@ -51,8 +51,6 @@ let getBlankPage = function(){
     return <div />
 }
 
-console.log(getBasePath());
-
 export const makeRoutes = (routing) => {
     return (<Route path="/" component={Container}>
                 <Route path="/home" getComponent={lazyLoadComponent(HomePage)}/>

diff --git a/src/shared/lib/tracking.ts b/src/shared/lib/tracking.ts
@@ -1,6 +1,4 @@
-import analytics from 'universal-ga';
 import $ from 'jquery';
-import * as _ from 'lodash';
 import mixpanel from 'mixpanel-browser';
 import AppConfig from "appConfig";
 
@@ -9,70 +7,10 @@ interface trackingCodes {
   mixpanel?:string;
 };
 
-export function getGAInstance(){
-    return analytics.name('newGA');
-}
-
 const win = (window as any);
 
 function setCustomTrackingEvents(){
 
-    // tabs on result page
-
-    $('#tabs').on('click','.ui-tabs-nav a', function(){
-        getGAInstance().screenview($(this).text() + ' tab');
-        getGAInstance().event('results tab', 'show', { eventLabel: $(this).text()  });
-        const studies = _.map(win.resultsViewPageStore.studies.result,'studyId').join(',');
-        mixpanel.track(`results tab clicked (${$(this).text()})`,{ tab:$(this).text() ,studyIds:studies });
-    });
-
-    $("#pancancer_study_summary").on('click','.pillTabs a', (e)=>{
-        const text = $(e.currentTarget).text();
-        const studies = _.map(win.resultsViewPageStore.studies.result,'studyId').join(',');
-        mixpanel.track(`cancer type summary gene tab (${text})`,{ tab:text, studyIds:studies });
-    });
-
-
-    if ($(".studyContainer").length > 0) {
-
-        const matches = window.location.search.match(/id=([a-z_]*)/);
-        const studyName = (matches && matches[1]) ? matches[1] : "";
-
-        let interactionCount = 0;
-
-        $(".studyContainer").on("click",".dc-chart",(e)=>{
-
-            getGAInstance().event('study view filter', 'click', {
-                eventLabel: e.currentTarget.id,
-                dimension1: studyName,
-                metric1:interactionCount
-            });
-            interactionCount++;
-        });
-
-        $("body").on("click","div[id^='qtip-chart-']",(e)=>{
-            getGAInstance().event('study view filter', 'click', {
-                eventLabel: e.currentTarget.id,
-                dimension1: studyName,
-                metric1: interactionCount
-            });
-            interactionCount++;
-        });
-
-        $(".studyContainer").on("click",
-            "#iviz-header-left-patient-select, .share-virtual-study, #iviz-header-left-patient-select, #iviz-header-left-case-download, #iviz-header-left-1, #custom-case-input-button, #iviz_add_chart_chosen",
-            (e)=>{
-                var name = e.currentTarget.id || e.currentTarget.className;
-                getGAInstance().event('study view button', 'click', {
-                    eventLabel: name,
-                    dimension1: studyName
-                });
-            }
-        );
-
-
-    }
-
 
 }
 
@@ -116,19 +54,38 @@ const conditions = [
 
 ];
 
-
 let trackingEnabled = false;
 
+const tracking = {
+
+    trackerName:'newGA',
+
+    trackPageView(){
+        if (win.ga && trackingEnabled)
+        win.ga(`${this.trackerName}.send`, 'pageview');
+    },
+
+    createTracker(code:string){
+        if (win.ga && trackingEnabled)
+        win.ga('create', code, 'auto', this.trackerName);
+    },
+
+};
+
+export default tracking;
+
+
 /*
  * for simplicity all tracking code fires on all instances of portal
  * but actual calls to google api are only made for given hosts
  */
-function activateAnalytics(){
+export function activateAnalytics(){
+
     let trackingCodes: trackingCodes | undefined;
 
     conditions.forEach((config:any)=>{ trackingCodes = trackingCodes || ((config.condition()) ? config.trackingCodes() : undefined) });
 
-    if (trackingCodes && !localStorage.e2etest) {
+    if (trackingCodes && !window.navigator.webdriver) {
 
         trackingEnabled = true;
         const debugTracking = localStorage.debugTracking;
@@ -144,9 +101,8 @@ function activateAnalytics(){
         mixpanel.identify(userId);
         mixpanel.people.set_once('$first_name', userId);
 
-        // google analytics
-        analytics.initialize(trackingCodes.ga,{ debug:!!debugTracking });
-        analytics.create(trackingCodes.ga, { name:'newGA', debug:!!debugTracking });
+        tracking.createTracker(trackingCodes.ga!);
+        tracking.trackPageView();
 
         $(document).ready(function(){
             setCustomTrackingEvents();
@@ -156,4 +112,5 @@ function activateAnalytics(){
 
 }
 
-activateAnalytics();
+
+