Merge branch 'leaderboard' of https://github.com/source-academy/frontend into leaderboard

Author: Blerargh

src/commons/sagas/RequestsSaga.ts

@@ -1336,7 +1336,7 @@ export const dispatchContestXp = async (
 };
 
 /**
- * GET /courses/{courseId}/admin/assessments/{assessmentId}/scoreLeaderboard
+ * GET /courses/{courseId}/assessments/{assessmentId}/scoreLeaderboard
  */
 export const getScoreLeaderboard = async (
   assessmentId: number,
@@ -1345,7 +1345,7 @@ export const getScoreLeaderboard = async (
 ): Promise<ContestEntry[] | null> => {
   const params = new URLSearchParams({ visible_entries: `${visibleEntries}` });
   const resp = await request(
-    `${courseId()}/admin/assessments/${assessmentId}/scoreLeaderboard?${params.toString()}`,
+    `${courseId()}/assessments/${assessmentId}/scoreLeaderboard?${params.toString()}`,
     'GET',
     {
       ...tokens
@@ -1368,7 +1368,7 @@ export const getScoreLeaderboard = async (
 };
 
 /**
- * GET /courses/{courseId}/admin/assessments/{assessmentId}/popularVoteLeaderboard
+ * GET /courses/{courseId}/assessments/{assessmentId}/popularVoteLeaderboard
  */
 export const getPopularVoteLeaderboard = async (
   assessmentId: number,
@@ -1377,7 +1377,7 @@ export const getPopularVoteLeaderboard = async (
 ): Promise<ContestEntry[] | null> => {
   const params = new URLSearchParams({ visible_entries: `${visibleEntries}` });
   const resp = await request(
-    `${courseId()}/admin/assessments/${assessmentId}/popularVoteLeaderboard?${params.toString()}`,
+    `${courseId()}/assessments/${assessmentId}/popularVoteLeaderboard?${params.toString()}`,
     'GET',
     {
       ...tokens

src/pages/leaderboard/subcomponents/LeaderboardExportButton.tsx

@@ -53,14 +53,20 @@ const LeaderboardExportButton: React.FC<Props> = ({ type, contest, contestID })
     }
   }, [data]);
 
+  const escapeCodeField = (value: any) => {
+    const str = value?.toString() ?? '';
+    const escaped = str.replace(/"/g, '""');
+    return `"${escaped}"`;
+  };
+
   const role = useTypedSelector(store => store.session.role);
   const exportCSV = () => {
     const headers = [
       'Rank',
       'Name',
       'Username',
       type === 'overall' ? 'XP' : 'Score',
-      type === 'overall' ? 'Achievements' : 'Submission Id'
+      type === 'overall' ? 'Achievements' : 'Code'
     ];
     const rows = data?.map(
       (player: {
@@ -83,7 +89,7 @@ const LeaderboardExportButton: React.FC<Props> = ({ type, contest, contestID })
           : (player as ContestLeaderboardRow).score,
         type === 'overall'
           ? (player as LeaderboardRow).achievements
-          : (player as ContestLeaderboardRow).submissionId
+          : escapeCodeField((player as ContestLeaderboardRow).code)
       ]
     );