From c929ae742bc5e91e1de4cbd822f8ec29d3622cd7 Mon Sep 17 00:00:00 2001
From: positivelyjon <positivelyjon@gmail.com>
Date: Tue, 13 Feb 2024 12:21:06 +0800
Subject: [PATCH 1/3] Rename contest leaderboard to score leaderboard

---
 src/commons/assessment/AssessmentTypes.ts                 | 2 +-
 src/commons/assessmentWorkspace/AssessmentWorkspace.tsx   | 6 +++---
 src/commons/mocks/AssessmentMocks.ts                      | 2 +-
 src/commons/sideContent/SideContentContestLeaderboard.tsx | 2 +-
 src/commons/sideContent/SideContentTypes.ts               | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/commons/assessment/AssessmentTypes.ts b/src/commons/assessment/AssessmentTypes.ts
index 0169f52ad0..6b1144e931 100644
--- a/src/commons/assessment/AssessmentTypes.ts
+++ b/src/commons/assessment/AssessmentTypes.ts
@@ -121,7 +121,7 @@ export interface IContestVotingQuestion extends BaseQuestion {
   prepend: string;
   postpend: string;
   contestEntries: ContestEntry[];
-  contestLeaderboard: ContestEntry[];
+  scoreLeaderboard: ContestEntry[];
   type: 'voting';
 }
 
diff --git a/src/commons/assessmentWorkspace/AssessmentWorkspace.tsx b/src/commons/assessmentWorkspace/AssessmentWorkspace.tsx
index 6aa3fd43c9..7aec87268c 100644
--- a/src/commons/assessmentWorkspace/AssessmentWorkspace.tsx
+++ b/src/commons/assessmentWorkspace/AssessmentWorkspace.tsx
@@ -444,15 +444,15 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
           id: SideContentType.contestVoting
         },
         {
-          label: 'Contest Leaderboard',
+          label: 'Score Leaderboard',
           iconName: IconNames.CROWN,
           body: (
             <SideContentContestLeaderboard
               handleContestEntryClick={handleContestEntryClick}
-              orderedContestEntries={(question as IContestVotingQuestion)?.contestLeaderboard ?? []}
+              orderedContestEntries={(question as IContestVotingQuestion)?.scoreLeaderboard ?? []}
             />
           ),
-          id: SideContentType.contestLeaderboard
+          id: SideContentType.scoreLeaderboard
         }
       );
     } else {
diff --git a/src/commons/mocks/AssessmentMocks.ts b/src/commons/mocks/AssessmentMocks.ts
index c79600441c..5f7deaca51 100644
--- a/src/commons/mocks/AssessmentMocks.ts
+++ b/src/commons/mocks/AssessmentMocks.ts
@@ -862,7 +862,7 @@ const mockContestEntryQuestion: Array<IContestVotingQuestion> = [
         answer: { code: 'function voting_test() { return true; }' }
       }
     ],
-    contestLeaderboard: [
+    scoreLeaderboard: [
       {
         submission_id: 1,
         student_name: 'student_1',
diff --git a/src/commons/sideContent/SideContentContestLeaderboard.tsx b/src/commons/sideContent/SideContentContestLeaderboard.tsx
index 85bc9d7311..3f123cfdce 100644
--- a/src/commons/sideContent/SideContentContestLeaderboard.tsx
+++ b/src/commons/sideContent/SideContentContestLeaderboard.tsx
@@ -79,7 +79,7 @@ const SideContentContestLeaderboard: React.FunctionComponent<
         minimal={true}
         onClick={() => setShowLeaderboard(!showLeaderboard)}
       >
-        <span>Contest Leaderboard</span>
+        <span>Score Leaderboard</span>
         <Tooltip2 content={contestLeaderboardTooltipContent}>
           <Icon icon={IconNames.HELP} />
         </Tooltip2>
diff --git a/src/commons/sideContent/SideContentTypes.ts b/src/commons/sideContent/SideContentTypes.ts
index c962f3cb98..16911a57b0 100644
--- a/src/commons/sideContent/SideContentTypes.ts
+++ b/src/commons/sideContent/SideContentTypes.ts
@@ -8,7 +8,7 @@ export enum SideContentType {
   autograder = 'autograder',
   briefing = 'briefing',
   contestVoting = 'contest_voting',
-  contestLeaderboard = 'contest_leaderboard',
+  scoreLeaderboard = 'score_leaderboard',
   dataVisualizer = 'data_visualizer',
   editorGrading = 'editor_grading',
   editorAutograder = 'editor_autograder',

From 12f3e4a94e6c8bf88fc38805c6d472f34089efb7 Mon Sep 17 00:00:00 2001
From: positivelyjon <positivelyjon@gmail.com>
Date: Tue, 13 Feb 2024 12:44:52 +0800
Subject: [PATCH 2/3] Modify tests

---
 .../__snapshots__/AssessmentWorkspace.tsx.snap     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/commons/assessmentWorkspace/__tests__/__snapshots__/AssessmentWorkspace.tsx.snap b/src/commons/assessmentWorkspace/__tests__/__snapshots__/AssessmentWorkspace.tsx.snap
index 34f8d721fa..c936aa38ae 100644
--- a/src/commons/assessmentWorkspace/__tests__/__snapshots__/AssessmentWorkspace.tsx.snap
+++ b/src/commons/assessmentWorkspace/__tests__/__snapshots__/AssessmentWorkspace.tsx.snap
@@ -470,13 +470,13 @@ exports[`AssessmentWorkspace AssessmentWorkspace page with ContestVoting questio
                           </span>
                         </div>
                         <div
-                          aria-controls="bp5-tab-panel_side-content-tabs_contest_leaderboard"
+                          aria-controls="bp5-tab-panel_side-content-tabs_score_leaderboard"
                           aria-disabled="false"
                           aria-expanded="false"
                           aria-selected="false"
                           class="bp5-tab side-content-tab"
-                          data-tab-id="contest_leaderboard"
-                          id="bp5-tab-title_side-content-tabs_contest_leaderboard"
+                          data-tab-id="score_leaderboard"
+                          id="bp5-tab-title_side-content-tabs_score_leaderboard"
                           role="tab"
                           tabindex="-1"
                         >
@@ -486,7 +486,7 @@ exports[`AssessmentWorkspace AssessmentWorkspace page with ContestVoting questio
                             <div
                               aria-expanded="false"
                               class="side-content-tooltip"
-                              id="contest_leaderboard-icon"
+                              id="score_leaderboard-icon"
                               tabindex="0"
                             >
                               <span
@@ -735,9 +735,9 @@ exports[`AssessmentWorkspace AssessmentWorkspace page with ContestVoting questio
                       </div>
                       <div
                         aria-hidden="true"
-                        aria-labelledby="bp5-tab-title_side-content-tabs_contest_leaderboard"
+                        aria-labelledby="bp5-tab-title_side-content-tabs_score_leaderboard"
                         class="bp5-tab-panel side-content-tab"
-                        id="bp5-tab-panel_side-content-tabs_contest_leaderboard"
+                        id="bp5-tab-panel_side-content-tabs_score_leaderboard"
                         role="tabpanel"
                       >
                         <div
@@ -771,7 +771,7 @@ exports[`AssessmentWorkspace AssessmentWorkspace page with ContestVoting questio
                                 class="bp5-button-text"
                               >
                                 <span>
-                                  Contest Leaderboard
+                                  Score Leaderboard
                                 </span>
                                 <span
                                   class="bp5-popover-target"

From e2c765a30e1b209f85e11d55f71023b3a802156e Mon Sep 17 00:00:00 2001
From: positivelyjon <positivelyjon@gmail.com>
Date: Tue, 13 Feb 2024 13:47:21 +0800
Subject: [PATCH 3/3] Update snapshots

---
 .../__snapshots__/SideContentContestLeaderboard.tsx.snap        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commons/sideContent/__tests__/__snapshots__/SideContentContestLeaderboard.tsx.snap b/src/commons/sideContent/__tests__/__snapshots__/SideContentContestLeaderboard.tsx.snap
index 86b14bf633..1ad02b1ca5 100644
--- a/src/commons/sideContent/__tests__/__snapshots__/SideContentContestLeaderboard.tsx.snap
+++ b/src/commons/sideContent/__tests__/__snapshots__/SideContentContestLeaderboard.tsx.snap
@@ -11,7 +11,7 @@ exports[`SideContentContestLeaderboard matches snapshot 1`] = `
     onClick={[Function]}
   >
     <span>
-      Contest Leaderboard
+      Score Leaderboard
     </span>
     <Blueprint5.Tooltip
       compact={false}