Merge pull request #1319 from openedx/saleem-latif/ENT-9436

feat: Updated leaderboard data table to use new API endpoint.
openedx · Sep 25, 2024 · d78920c · d78920c
2 parents 045eefb + 9ba101e
commit d78920c
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 223 deletions.
diff --git a/src/components/AdvanceAnalyticsV2/DownloadCSV.jsx b/src/components/AdvanceAnalyticsV2/DownloadCSV.jsx
diff --git a/src/components/AdvanceAnalyticsV2/data/hooks.test.jsx b/src/components/AdvanceAnalyticsV2/data/hooks.test.jsx
@@ -27,11 +27,11 @@ const mockAnalyticsCompletionsChartsData = {
 const mockAnalyticsLeaderboardTableData = [
   {
     email: 'user@example.com',
-    dailySessions: 243,
+    sessionCount: 243,
     learningTimeSeconds: 1111,
     learningTimeHours: 3.4,
     averageSessionLength: 1.6,
-    courseCompletions: 4,
+    courseCompletionCount: 4,
   },
 ];
 

diff --git a/src/components/AdvanceAnalyticsV2/tabs/AnalyticsTable.jsx b/src/components/AdvanceAnalyticsV2/tabs/AnalyticsTable.jsx
@@ -21,7 +21,7 @@ const AnalyticsTable = ({
 }) => {
   const intl = useIntl();
   const [currentPage, setCurrentPage] = useState(0);
-  const pageSize = 50;
+  const pageSize = 20;
 
   const {
     isFetching, data,

diff --git a/src/components/AdvanceAnalyticsV2/tabs/Leaderboard.jsx b/src/components/AdvanceAnalyticsV2/tabs/Leaderboard.jsx
@@ -50,7 +50,7 @@ const Leaderboard = ({ startDate, endDate, enterpriseId }) => {
                 description: 'Label for the daily sessions column in the leaderboard table',
 
               }),
-              accessor: 'dailySessions',
+              accessor: 'sessionCount',
             },
             {
               Header: intl.formatMessage({
@@ -67,7 +67,7 @@ const Leaderboard = ({ startDate, endDate, enterpriseId }) => {
                 defaultMessage: 'Course Completions',
                 description: 'Label for the course completions column in the leaderboard table',
               }),
-              accessor: 'courseCompletions',
+              accessor: 'courseCompletionCount',
             },
           ]}
         />

diff --git a/src/components/AdvanceAnalyticsV2/tabs/Leaderboard.test.jsx b/src/components/AdvanceAnalyticsV2/tabs/Leaderboard.test.jsx
@@ -28,24 +28,24 @@ const mockLeaderboardData = {
   results: [
     {
       email: 'user100@example.com',
-      daily_sessions: 74,
+      session_count: 74,
       learning_time_hours: 13.1,
       average_session_length: 1.8,
-      course_completions: 3,
+      course_completion_count: 3,
     },
     {
       email: 'user200@example.com',
-      daily_sessions: 48,
+      session_count: 48,
       learning_time_hours: 131.9,
       average_session_length: 2.7,
-      course_completions: 1,
+      course_completion_count: 1,
     },
     {
       email: 'user300@example.com',
-      daily_sessions: 92,
+      session_count: 92,
       learning_time_hours: 130,
       average_session_length: 1.4,
-      course_completions: 3,
+      course_completion_count: 3,
     },
   ],
 };
@@ -134,9 +134,9 @@ describe('Leaderboard Component', () => {
         const rowCells = within(rows[index + 1]).getAllByRole('cell'); // Skip header row
         expect(rowCells[0]).toHaveTextContent(user.email);
         expect(rowCells[1]).toHaveTextContent(user.learning_time_hours);
-        expect(rowCells[2]).toHaveTextContent(user.daily_sessions);
+        expect(rowCells[2]).toHaveTextContent(user.session_count);
         expect(rowCells[3]).toHaveTextContent(user.average_session_length);
-        expect(rowCells[4]).toHaveTextContent(user.course_completions);
+        expect(rowCells[4]).toHaveTextContent(user.course_completion_count);
       });
     });
   });

diff --git a/src/components/AdvanceAnalyticsV2/tests/DownloadCSV.test.jsx b/src/components/AdvanceAnalyticsV2/tests/DownloadCSV.test.jsx
diff --git a/src/data/services/tests/EnterpriseDataApiService.test.js b/src/data/services/tests/EnterpriseDataApiService.test.js
@@ -18,11 +18,11 @@ const mockAnalyticsSkillsData = {
 const mockAnalyticsLeaderboardTableData = [
   {
     email: 'user@example.com',
-    dailySessions: 243,
+    sessionCount: 243,
     learningTimeSeconds: 1111,
     learningTimeHours: 3.4,
     averageSessionLength: 1.6,
-    courseCompletions: 4,
+    courseCompletionCount: 4,
   },
 ];