Merge pull request #2058 from CodeNow/add-events-to-new-auth

Add events to new auth

Author: taylordolan

client/config/routes.js

@@ -334,8 +334,12 @@ module.exports = [
         return fetchInstancesByPod()
           .catch(goToStateOnError($q, $state, $timeout, 'orgSelect', 'Unauthorized'));
       },
-      booted: function (eventTracking) {
-        eventTracking.visitedContainersPage();
+      booted: function (
+        currentOrg,
+        eventTracking,
+        populateCurrentOrgService
+      ) {
+        eventTracking.visitedContainersPage(currentOrg.isPersonalAccount());
       }
     }
   }, {

client/controllers/controllerApp.js

@@ -20,6 +20,7 @@ function ControllerApp(
   debounce,
   demoFlowService,
   errs,
+  eventTracking,
   featureFlags,
   fetchInstancesByPod,
   keypather,
@@ -44,6 +45,10 @@ function ControllerApp(
       CA.instancesByPod = instancesByPod;
     });
 
+  CA.openedFirstAuthPrimer = function () {
+    eventTracking.openedFirstAuthPrimer();
+  };
+
   CA.showDemoRepo = function () {
     return ahaGuide.isAddingFirstRepo() && !ahaGuide.hasConfirmedSetup() && ahaGuide.hasDemoRepo();
   };

client/directives/components/newContainer/newContainerController.js

@@ -16,6 +16,7 @@ function NewContainerController(
   currentOrg,
   demoFlowService,
   errs,
+  eventTracking,
   fetchInstances,
   fetchInstancesByPod,
   fetchOwnerRepos,
@@ -74,6 +75,10 @@ function NewContainerController(
       loading('newContainerRepos', false);
     });
 
+  NCC.openedFirstAuthPrimer = function () {
+    eventTracking.openedFirstAuthPrimer();
+  };
+
   NCC.fetchTemplateServers = function () {
     loading('newContainerTemplates', true);
     // Fetch all non-repo containres

client/directives/instances/instance/branchMenuPopover/templateMenuEmptyPopoverView.jade

@@ -6,9 +6,15 @@
   )
   p.p.text-center To add your own repositories and services, try Runnable with a GitHub team.
   button.btn.btn-sm.gray.margin-top-xs(
+    ng-if = "!$root.featureFlags.demoPersistentAddTeam"
     ui-sref = "orgSelect"
     ui-sref-opts = "{reload: true}"
   ) Switch to a Team
+  button.btn.btn-sm.gray.margin-top-xs(
+    internal-modal-helper = "gitHubScopeView"
+    ng-click = "NCC.openedFirstAuthPrimer()"
+    ng-if = "$root.featureFlags.demoPersistentAddTeam"
+  ) Switch to a Team
 
 .grid-block.align-center.vertical.padding-md.empty(
   ng-if = "!NCC.isPersonalAccount() && !$root.featureFlags.demoPersonalOnly"

client/directives/modals/modalChooseOrganization/chooseOrganizationModalController.js

@@ -56,15 +56,16 @@ function ChooseOrganizationModalController(
 
   COMC.grantAccess = function (isDemo) {
     var loadingString = 'grantAccess';
-    if (isDemo) {
-      loadingString = 'grantAccessDemo';
-    }
-
     var connectionUrl = '/githubAuth';
 
     if (isDemo) {
+      loadingString = 'grantAccessDemo';
       connectionUrl = connectionUrl + '?isDemo=true';
     }
+
+    // tracking with mixpanel
+    eventTracking.openedSecondAuthPrimer();
+
     var customWindow = customWindowService(connectionUrl, {
       width: 1020, // match github minimum width
       height: 660

client/directives/navBar/viewNav.jade

@@ -40,7 +40,9 @@ a.grid-block.align-center.justify-center.shrink.btn-add-team(
 //- with tooltip
 //- show for personal accounts outside the "add team step"
 a.grid-block.align-center.justify-center.shrink.btn-add-team(
-  ng-click = "CA.demoAddOrg()"
+  data-event-name = "Open First Auth Primer"
+  internal-modal-helper = "gitHubScopeView"
+  ng-click = "CA.openedFirstAuthPrimer()"
   ng-if = "$root.featureFlags.demoPersistentAddTeam"
   tooltip = "Add a team"
   tooltip-options = "{\"class\":\"right\",\"left\":42,\"top\":3}"

client/services/serviceEventTracking.js

@@ -424,10 +424,10 @@ function EventTracking(
    *   - mixpanel
    * @return this
    */
-  ETS.visitedContainersPage = function () {
+  ETS.visitedContainersPage = function (isPersonalAccount) {
     var eventName = 'Visited containers page';
 
-    ETS._mixpanel('track', eventName);
+    ETS._mixpanel('track', eventName, {isPersonalAccount: isPersonalAccount});
     return ETS;
   };
 
@@ -631,6 +631,30 @@ function EventTracking(
     return ETS;
   };
 
+  /**
+   * Opened auth primer (1)
+   * Reports to:
+   *   - mixpanel
+   * @return this
+   */
+  ETS.openedFirstAuthPrimer = function () {
+    var eventName = 'Opened First Auth Primer';
+    ETS._mixpanel('track', eventName);
+    return ETS;
+  };
+
+  /**
+   * Opened auth primer (2)
+   * Reports to:
+   *   - mixpanel
+   * @return this
+   */
+  ETS.openedSecondAuthPrimer = function () {
+    var eventName = 'Opened Second Auth Primer';
+    ETS._mixpanel('track', eventName);
+    return ETS;
+  };
+
   /**
    * Clicked ‘Change Team’
    * Reports to:

test/unit/directives/modals/chooseOrganizationModal/chooseOrganizationModalController.unit.js

@@ -130,7 +130,8 @@ describe('ChooseOrganizationModalController', function () {
         eventTrackingStub = {
           updateCurrentPersonProfile: sinon.stub(),
           spunUpInfrastructure: sinon.stub(),
-          spunUpInfrastructureForOrg: sinon.stub()
+          spunUpInfrastructureForOrg: sinon.stub(),
+          openedSecondAuthPrimer: sinon.stub()
         };
         return eventTrackingStub;
       });