From e8945ebdc5329d1dd74a3618a31df4cf2825044f Mon Sep 17 00:00:00 2001
From: Robert Raposa <rraposa@edx.org>
Date: Thu, 5 Oct 2017 14:10:50 -0400
Subject: [PATCH] Course home event clean-up.

- Convert hero events to BI events.
- Upgrade click event clean-up

LEARNER-2026
---
 lms/static/js/courseware/course_home_events.js           | 2 +-
 lms/static/js/spec/courseware/course_home_events_spec.js | 6 ++++--
 .../static/course_experience/js/CourseHome.js            | 9 +++++----
 .../static/course_experience/js/spec/CourseHome_spec.js  | 5 +++--
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/lms/static/js/courseware/course_home_events.js b/lms/static/js/courseware/course_home_events.js
index 2485e393a1..1d8670adc3 100644
--- a/lms/static/js/courseware/course_home_events.js
+++ b/lms/static/js/courseware/course_home_events.js
@@ -9,7 +9,7 @@
                 });
             });
             $('.date-summary-verified-upgrade-deadline .date-summary-link').on('click', function() {
-                Logger.log('edx.course.enrollment.upgrade.clicked', {location: 'sidebar'});
+                Logger.log('edx.course.enrollment.upgrade.clicked', {location: 'date-sidebar'});
             });
         };
     });
diff --git a/lms/static/js/spec/courseware/course_home_events_spec.js b/lms/static/js/spec/courseware/course_home_events_spec.js
index 07ec6784fd..3a4459dbd7 100644
--- a/lms/static/js/spec/courseware/course_home_events_spec.js
+++ b/lms/static/js/spec/courseware/course_home_events_spec.js
@@ -17,9 +17,11 @@ define(['jquery', 'logger', 'js/courseware/course_home_events'], function($, Log
             });
         });
 
-        it('sends an event when "Upgrade to Verified" is clicked from the sidebar', function() {
+        it('sends an event when "Upgrade to Verified" is clicked from the date sidebar', function() {
             $('.date-summary-link').click();
-            expect(Logger.log).toHaveBeenCalledWith('edx.course.enrollment.upgrade.clicked', {location: 'sidebar'});
+            expect(Logger.log).toHaveBeenCalledWith('edx.course.enrollment.upgrade.clicked',
+                {location: 'date-sidebar'}
+            );
         });
     });
 });
diff --git a/openedx/features/course_experience/static/course_experience/js/CourseHome.js b/openedx/features/course_experience/static/course_experience/js/CourseHome.js
index 166928ee5c..3db834b7b9 100644
--- a/openedx/features/course_experience/static/course_experience/js/CourseHome.js
+++ b/openedx/features/course_experience/static/course_experience/js/CourseHome.js
@@ -96,7 +96,7 @@ export class CourseHome {  // eslint-disable-line import/prefer-default-export
     const $vcDismissToggle = $('.vc-toggle', $vcMessage);
     const logEventProperties = { courseRunKey: this.courseRunKey };
 
-    Logger.log('edx.course.upgrade.hero.displayed', logEventProperties);
+    Logger.log('edx.bi.course.upgrade.hero.displayed', logEventProperties);
 
     // Get height of container and button
     let vcHeight = $vcMessage.outerHeight();
@@ -125,7 +125,7 @@ export class CourseHome {  // eslint-disable-line import/prefer-default-export
     $vcDismissToggle.click(() => {
       if ($vcMessage.hasClass('polite')) {
         // Expand message
-        Logger.log('edx.course.upgrade.hero.expanded', logEventProperties);
+        Logger.log('edx.bi.course.upgrade.hero.expanded', logEventProperties);
         this.persistUpgradeMessageState(false);
 
         $('.vc-fade').fadeOut(400);
@@ -136,14 +136,15 @@ export class CourseHome {  // eslint-disable-line import/prefer-default-export
         });
       } else {
         // Collapse message
-        Logger.log('edx.course.upgrade.hero.collapsed', logEventProperties);
+        Logger.log('edx.bi.course.upgrade.hero.collapsed', logEventProperties);
         this.persistUpgradeMessageState(true);
         collapseMessage();
       }
     });
 
     $('.btn-upgrade', $vcMessage).click(() => {
-      Logger.log('edx.course.upgrade.hero.clicked', logEventProperties);
+      Logger.log('edx.bi.course.upgrade.hero.clicked', logEventProperties);
+      Logger.log('edx.course.enrollment.upgrade.clicked', { location: 'hero' });
     });
   }
 }
diff --git a/openedx/features/course_experience/static/course_experience/js/spec/CourseHome_spec.js b/openedx/features/course_experience/static/course_experience/js/spec/CourseHome_spec.js
index c31eb474c0..45958cc5b9 100644
--- a/openedx/features/course_experience/static/course_experience/js/spec/CourseHome_spec.js
+++ b/openedx/features/course_experience/static/course_experience/js/spec/CourseHome_spec.js
@@ -57,13 +57,14 @@ describe('Course Home factory', () => {
 
     it('should send events to Segment and edX on initial load', () => {
       expect(window.analytics.track).toHaveBeenCalledWith('Promotion Viewed', segmentEventProperties);
-      expect(Logger.log).toHaveBeenCalledWith('edx.course.upgrade.hero.displayed', { courseRunKey: runKey });
+      expect(Logger.log).toHaveBeenCalledWith('edx.bi.course.upgrade.hero.displayed', { courseRunKey: runKey });
     });
 
     it('should send events to Segment and edX after clicking the upgrade button ', () => {
       $('.vc-message .btn-upgrade').click();
       expect(window.analytics.track).toHaveBeenCalledWith('Promotion Viewed', segmentEventProperties);
-      expect(Logger.log).toHaveBeenCalledWith('edx.course.upgrade.hero.clicked', { courseRunKey: runKey });
+      expect(Logger.log).toHaveBeenCalledWith('edx.bi.course.upgrade.hero.clicked', { courseRunKey: runKey });
+      expect(Logger.log).toHaveBeenCalledWith('edx.course.enrollment.upgrade.clicked', { location: 'hero' });
     });
   });