Try to fix tests: assertPrimaryNav & help link

analytics_dashboard/courses/tests/test_views/__init__.py

@@ -227,9 +227,13 @@ class CourseEnrollmentViewTestMixin(CourseViewTestMixin):
         expected = {
             'icon': 'fa-child',
             'href': reverse('courses:enrollment:activity', kwargs={'course_id': course_id}),
-            'label': _('Enrollment'),
+            'label': 'lens+enrollment',
             'name': 'enrollment',
-            'fragment': ''
+            'fragment': '',
+            'scope': 'course',
+            'lens': 'enrollment',
+            'report': 'actvity',
+            'depth': ''
         }
         self.assertDictEqual(nav, expected)
 

analytics_dashboard/courses/tests/test_views/test_engagement.py

@@ -40,9 +40,13 @@ class CourseEngagementViewTestMixin(PatchMixin, CourseAPIMixin):  # pylint: disa
         expected = {
             'icon': 'fa-bar-chart',
             'href': reverse('courses:engagement:content', kwargs={'course_id': course_id}),
-            'label': _('Engagement'),
+            'label': 'lens+engagement',
             'name': 'engagement',
-            'fragment': ''
+            'fragment': '',
+            'scope': 'course',
+            'lens': 'engagement',
+            'report': 'content',
+            'depth': ''
         }
         self.assertDictEqual(nav, expected)
 

analytics_dashboard/courses/tests/test_views/test_performance.py

@@ -43,9 +43,13 @@ class CoursePerformanceViewTestMixin(PatchMixin, CourseStructureViewMixin, Cours
         expected = {
             'icon': 'fa-check-square-o',
             'href': reverse('courses:performance:graded_content', kwargs={'course_id': course_id}),
-            'label': _('Performance'),
+            'label': 'lens+performance',
             'name': 'performance',
-            'fragment': ''
+            'fragment': '',
+            'scope': 'course',
+            'lens': 'performance',
+            'report': 'graded',
+            'depth': ''
         }
         self.assertDictEqual(nav, expected)
 

analytics_dashboard/courses/views/__init__.py

@@ -454,7 +454,7 @@ class CourseTemplateView(ContextSensitiveHelpMixin, CourseContextMixin, CourseVi
     @property
     def help_token(self):
         # Rather than duplicate the definition, simply return the page name.
-        return self.page_name
+        return self.page_name.get('name', 'default')
 
     def get_last_updated_message(self, last_updated):
         if last_updated:

analytics_dashboard/static/js/test/specs/tracking-view-spec.js

@@ -77,7 +77,13 @@ define(['jquery', 'models/course-model', 'models/tracking-model', 'models/user-m
                 });
                 trackingModel.set({
                     segmentApplicationId: 'applicationId',
-                    page: 'mypage'
+                    page: {
+                        scope: 'course',
+                        lens: 'mylens',
+                        report: 'myreport',
+                        depth: '',
+                        name: 'course_mylens_myreport'
+                    }
                 });
                 userModel.set(USER_DETAILS);
 
@@ -86,7 +92,7 @@ define(['jquery', 'models/course-model', 'models/tracking-model', 'models/user-m
                 expect(view.segment.page).toHaveBeenCalledWith({
                     courseId: 'this/is/a/course',
                     org: 'org',
-                    label: 'mypage'
+                    label: 'course_mylens_myreport'
                 });
                 expect(view.segment.load).toHaveBeenCalled();
             });
@@ -128,7 +134,13 @@ define(['jquery', 'models/course-model', 'models/tracking-model', 'models/user-m
                         org: 'org'
                     }),
                     trackingModel = new TrackingModel({
-                        page: 'mypage'
+                        page: {
+                            scope: 'course',
+                            lens: 'mylens',
+                            report: 'myreport',
+                            depth: '',
+                            name: 'course_mylens_myreport'
+                        }
                     }),
                     userModel = new TrackingModel();
 
@@ -159,7 +171,7 @@ define(['jquery', 'models/course-model', 'models/tracking-model', 'models/user-m
                 trackingModel.trigger('segment:track', 'trackingEvent', {param: 'my-param'});
                 expect(view.segment.track).toHaveBeenCalledWith(
                     'trackingEvent', {
-                        label: 'mypage',
+                        label: 'course_mylens_myreport',
                         courseId: 'my/course/id',
                         org: 'org',
                         param: 'my-param'
@@ -173,7 +185,13 @@ define(['jquery', 'models/course-model', 'models/tracking-model', 'models/user-m
                         org: 'org'
                     }),
                     trackingModel = new TrackingModel({
-                        page: 'mypage'
+                        page: {
+                            scope: 'course',
+                            lens: 'mylens',
+                            report: 'myreport',
+                            depth: '',
+                            name: 'course_mylens_myreport'
+                        }
                     }),
                     userModel = new TrackingModel();
 
@@ -204,7 +222,7 @@ define(['jquery', 'models/course-model', 'models/tracking-model', 'models/user-m
                 trackingModel.trigger('segment:page', 'pageName', {param: 'my-param'});
                 expect(view.segment.page).toHaveBeenCalledWith(
                     'pageName', {
-                        label: 'mypage',
+                        label: 'course_mylens_myreport',
                         courseId: 'my/course/id',
                         org: 'org',
                         param: 'my-param'
@@ -228,7 +246,13 @@ define(['jquery', 'models/course-model', 'models/tracking-model', 'models/user-m
                         org: 'org'
                     }),
                     trackingModel = new TrackingModel({
-                        page: 'mypage',
+                        page: {
+                            scope: 'course',
+                            lens: 'mylens',
+                            report: 'myreport',
+                            depth: '',
+                            name: 'course_mylens_myreport'
+                        },
                         segmentApplicationId: 'some ID'
                     }),
                     userModel = new TrackingModel(),
@@ -277,7 +301,7 @@ define(['jquery', 'models/course-model', 'models/tracking-model', 'models/user-m
 
                 test.expectEventEmitted(
                     'trackingEvent', {
-                        label: 'mypage',
+                        label: 'course_mylens_myreport',
                         courseId: 'my/course/id',
                         org: 'org',
                         param: 'my-param',

docs/config.ini

@@ -14,25 +14,26 @@ pdf_file = edx-analytics-dashboard.pdf
 # corresponding text should be updated in the acceptance tests.
 [pages]
 default = index.html
-enrollment_activity = enrollment/Enrollment_Activity.html
-enrollment_geography = enrollment/Enrollment_Geography.html
-engagement_content = engagement/Engagement_Content.html
-engagement_videos = engagement/Engagement_Video.html
-engagement_video_section= engagement/Engagement_Video.html
-engagement_video_subsection = engagement/Engagement_Video.html
-engagement_video_timeline= engagement/Engagement_Video.html
-enrollment_demographics_age = enrollment/Demographics_Age.html
-enrollment_demographics_education = enrollment/Demographics_Education.html
-enrollment_demographics_gender = enrollment/Demographics_Gender.html
-learners = learners/Learner_Activity.html
-performance_assignment = performance/Performance_Answers.html
-performance_answer_distribution = performance/Performance_Answers.html
-performance_graded_content = performance/Performance_Answers.html
-performance_graded_content_by_type = performance/Performance_Answers.html
-performance_ungraded_content = performance/Performance_Answers.html
-performance_ungraded_by_section = performance/Performance_Answers.html
-performance_ungraded_by_subsection = performance/Performance_Answers.html
-performance_ungraded_answer_distribution = performance/Performance_Answers.html
+course_enrollment_activity = enrollment/Enrollment_Activity.html
+course_enrollment_geography = enrollment/Enrollment_Geography.html
+course_engagement_content = engagement/Engagement_Content.html
+course_engagement_videos = engagement/Engagement_Video.html
+course_engagement_videos_section= engagement/Engagement_Video.html
+course_engagement_videos_subsection = engagement/Engagement_Video.html
+course_engagement_videos_timeline= engagement/Engagement_Video.html
+course_enrollment_demographics_age = enrollment/Demographics_Age.html
+course_enrollment_demographics_education = enrollment/Demographics_Education.html
+course_enrollment_demographics_gender = enrollment/Demographics_Gender.html
+course_learners_roster = learners/Learner_Activity.html
+course_learners_detail = learners/Learner_Activity.html
+course_performance_graded = performance/Performance_Answers.html
+course_performance_graded_problem = performance/Performance_Answers.html
+course_performance_graded_section = performance/Performance_Answers.html
+course_performance_graded_subsection = performance/Performance_Answers.html
+course_performance_ungraded = performance/Performance_Answers.html
+course_performance_ungraded_section = performance/Performance_Answers.html
+course_performance_ungraded_subsection = performance/Performance_Answers.html
+course_performance_ungraded_problem = performance/Performance_Answers.html
 
 
 # below are the language directory names for the different locales