Merge branch 'master' into master

Author: RichDom2185

package.json

@@ -35,17 +35,18 @@
     "@blueprintjs/datetime2": "^2.3.3",
     "@blueprintjs/icons": "^6.0.0",
     "@blueprintjs/select": "^5.1.3",
+    "@convergencelabs/ace-collab-ext": "^0.6.0",
     "@mantine/hooks": "^7.11.2",
     "@octokit/rest": "^22.0.0",
     "@reduxjs/toolkit": "^1.9.7",
     "@sentry/browser": "^8.33.0",
     "@sourceacademy/c-slang": "^1.0.21",
-    "@sourceacademy/sharedb-ace": "^2.0.3",
+    "@sourceacademy/sharedb-ace": "^2.1.1",
     "@sourceacademy/sling-client": "^0.1.0",
     "@szhsin/react-menu": "^4.0.0",
     "@tanstack/react-table": "^8.9.3",
     "@tremor/react": "^1.8.2",
-    "ace-builds": "^1.36.3",
+    "ace-builds": "^1.42.1",
     "acorn": "^8.9.0",
     "ag-grid-community": "^32.3.1",
     "ag-grid-react": "^32.3.1",
@@ -60,6 +61,7 @@
     "hastscript": "^9.0.0",
     "i18next": "^25.0.0",
     "i18next-browser-languagedetector": "^8.0.0",
+    "immer": "^9.0.21",
     "java-slang": "^1.0.13",
     "js-cookie": "^3.0.5",
     "js-slang": "^1.0.84",
@@ -115,7 +117,6 @@
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@babel/preset-typescript": "^7.24.1",
     "@babel/runtime": "^7.24.5",
-    "@convergencelabs/ace-collab-ext": "^0.6.0",
     "@rsbuild/core": "^1.3.12",
     "@rsbuild/plugin-eslint": "^1.1.1",
     "@rsbuild/plugin-node-polyfill": "^1.3.0",
@@ -127,7 +128,7 @@
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^16.0.0",
-    "@testing-library/user-event": "^14.4.3",
+    "@testing-library/user-event": "^14.6.0",
     "@types/estree": "^1.0.5",
     "@types/gapi": "^0.0.47",
     "@types/gapi.auth2": "^0.0.61",
@@ -154,7 +155,7 @@
     "canvas": "^3.1.0",
     "constants-browserify": "^1.0.0",
     "coveralls": "^3.1.1",
-    "cross-env": "^7.0.3",
+    "cross-env": "^10.0.0",
     "eslint": "^9.9.0",
     "eslint-plugin-react": "^7.35.0",
     "eslint-plugin-react-hooks": "^5.2.0",
@@ -163,7 +164,7 @@
     "https-browserify": "^1.0.0",
     "husky": "^9.0.0",
     "identity-obj-proxy": "^3.0.0",
-    "jsdom": "^25.0.1",
+    "jsdom": "^26.0.0",
     "npm-run-all2": "^8.0.0",
     "os-browserify": "^0.3.0",
     "path": "^0.12.7",

src/commons/application/ApplicationTypes.ts

@@ -348,7 +348,6 @@ export const defaultAchievement: AchievementState = {
 };
 
 export const defaultLeaderboard: LeaderboardState = {
-  userXp: [],
   paginatedUserXp: { rows: [], userCount: 0 },
   contestScore: [],
   contestPopularVote: [],
@@ -430,7 +429,8 @@ export const createDefaultWorkspace = (workspaceLocation: WorkspaceLocation): Wo
   enableDebugging: true,
   debuggerContext: {} as DebuggerContext,
   lastDebuggerResult: undefined,
-  files: {}
+  files: {},
+  updateUserRoleCallback: () => {}
 });
 
 const defaultFileName = 'program.js';

src/commons/assessmentWorkspace/AssessmentWorkspace.tsx

@@ -464,6 +464,7 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
     const isTeamAssessment =
       assessmentOverview !== undefined ? assessmentOverview.maxTeamSize > 1 : false;
     const isContestVoting = question?.type === QuestionTypes.voting;
+    const isPublished = assessmentOverview?.isPublished;
     const handleContestEntryClick = (_submissionId: number, answer: string) => {
       // TODO: Hardcoded to make use of the first editor tab. Refactoring is needed for this workspace to enable Folder mode.
       handleEditorValueChange(0, answer);
@@ -538,34 +539,38 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
             />
           ),
           id: SideContentType.contestVoting
-        },
-        {
-          label: 'Score Leaderboard',
-          iconName: IconNames.CROWN,
-          body: (
-            <SideContentContestLeaderboard
-              handleContestEntryClick={handleContestEntryClick}
-              orderedContestEntries={(question as IContestVotingQuestion)?.scoreLeaderboard ?? []}
-              leaderboardType={SideContentType.scoreLeaderboard}
-            />
-          ),
-          id: SideContentType.scoreLeaderboard
-        },
-        {
-          label: 'Popular Vote Leaderboard',
-          iconName: IconNames.PEOPLE,
-          body: (
-            <SideContentContestLeaderboard
-              handleContestEntryClick={handleContestEntryClick}
-              orderedContestEntries={
-                (question as IContestVotingQuestion)?.popularVoteLeaderboard ?? []
-              }
-              leaderboardType={SideContentType.popularVoteLeaderboard}
-            />
-          ),
-          id: SideContentType.popularVoteLeaderboard
         }
       );
+      if (isPublished) {
+        tabs.push(
+          {
+            label: 'Score Leaderboard',
+            iconName: IconNames.CROWN,
+            body: (
+              <SideContentContestLeaderboard
+                handleContestEntryClick={handleContestEntryClick}
+                orderedContestEntries={(question as IContestVotingQuestion)?.scoreLeaderboard ?? []}
+                leaderboardType={SideContentType.scoreLeaderboard}
+              />
+            ),
+            id: SideContentType.scoreLeaderboard
+          },
+          {
+            label: 'Popular Vote Leaderboard',
+            iconName: IconNames.PEOPLE,
+            body: (
+              <SideContentContestLeaderboard
+                handleContestEntryClick={handleContestEntryClick}
+                orderedContestEntries={
+                  (question as IContestVotingQuestion)?.popularVoteLeaderboard ?? []
+                }
+                leaderboardType={SideContentType.popularVoteLeaderboard}
+              />
+            ),
+            id: SideContentType.popularVoteLeaderboard
+          }
+        );
+      }
     } else {
       tabs.push(
         {