Leaderboard

src/commons/application/ApplicationTypes.ts

@@ -2,6 +2,7 @@ import { Chapter, Language, SourceError, Variant } from 'js-slang/dist/types';
 
 import { AchievementState } from '../../features/achievement/AchievementTypes';
 import { DashboardState } from '../../features/dashboard/DashboardTypes';
+import { LeaderboardState } from '../../features/leaderboard/LeaderboardTypes';
 import { PlaygroundState } from '../../features/playground/PlaygroundTypes';
 import { PlaybackStatus, RecordingStatus } from '../../features/sourceRecorder/SourceRecorderTypes';
 import { StoriesEnvState, StoriesState } from '../../features/stories/StoriesTypes';
@@ -21,11 +22,12 @@ import {
 import { RouterState } from './types/CommonsTypes';
 import { ExternalLibraryName } from './types/ExternalTypes';
 import { SessionState } from './types/SessionTypes';
-import { VscodeState as VscodeState } from './types/VscodeTypes';
+import { VscodeState } from './types/VscodeTypes';
 
 export type OverallState = {
   readonly router: RouterState;
   readonly achievement: AchievementState;
+  readonly leaderboard: LeaderboardState;
   readonly playground: PlaygroundState;
   readonly session: SessionState;
   readonly stories: StoriesState;
@@ -347,6 +349,16 @@ export const defaultAchievement: AchievementState = {
   assessmentOverviews: []
 };
 
+export const defaultLeaderboard: LeaderboardState = {
+  userXp: [],
+  paginatedUserXp: { rows: [], userCount: 0 },
+  contestScore: [],
+  contestPopularVote: [],
+  code: '',
+  contests: [],
+  initialRun: {}
+};
+
 const getDefaultLanguageConfig = (): SALanguage => {
   const languageConfig = ALL_LANGUAGES.find(
     sublang =>
@@ -606,6 +618,7 @@ export const defaultVscode: VscodeState = {
 export const defaultState: OverallState = {
   router: defaultRouter,
   achievement: defaultAchievement,
+  leaderboard: defaultLeaderboard,
   dashboard: defaultDashboard,
   playground: defaultPlayground,
   session: defaultSession,

src/commons/application/reducers/RootReducer.ts

@@ -1,9 +1,10 @@
 import { combineReducers, Reducer } from '@reduxjs/toolkit';
-import { FeatureFlagsReducer as featureFlags } from 'src/commons/featureFlags';
 import { SourceActionType } from 'src/commons/utils/ActionsHelper';
 
+import { FeatureFlagsReducer as featureFlags } from '../../..//commons/featureFlags';
 import { AchievementReducer as achievement } from '../../../features/achievement/AchievementReducer';
 import { DashboardReducer as dashboard } from '../../../features/dashboard/DashboardReducer';
+import { LeaderboardReducer as leaderboard } from '../../../features/leaderboard/LeaderboardReducer';
 import { PlaygroundReducer as playground } from '../../../features/playground/PlaygroundReducer';
 import { StoriesReducer as stories } from '../../../features/stories/StoriesReducer';
 import { FileSystemReducer as fileSystem } from '../../fileSystem/FileSystemReducer';
@@ -17,6 +18,7 @@ import { VscodeReducer as vscode } from './VscodeReducer';
 const rootReducer: Reducer<OverallState, SourceActionType> = combineReducers({
   router,
   achievement,
+  leaderboard,
   dashboard,
   playground,
   session,

src/commons/application/types/SessionTypes.ts

@@ -39,6 +39,10 @@ export type SessionState = {
   readonly enableAchievements?: boolean;
   readonly enableSourcecast?: boolean;
   readonly enableStories?: boolean;
+  readonly enableOverallLeaderboard?: boolean;
+  readonly enableContestLeaderboard?: boolean;
+  readonly topLeaderboardDisplay?: number;
+  readonly topContestLeaderboardDisplay?: number;
   readonly sourceChapter?: Chapter;
   readonly sourceVariant?: Variant;
   readonly moduleHelpText?: string;
@@ -105,6 +109,10 @@ export type CourseConfiguration = {
   enableAchievements: boolean;
   enableSourcecast: boolean;
   enableStories: boolean;
+  enableOverallLeaderboard: boolean;
+  enableContestLeaderboard: boolean;
+  topLeaderboardDisplay: number;
+  topContestLeaderboardDisplay: number;
   sourceChapter: Chapter;
   sourceVariant: Variant;
   moduleHelpText: string;

src/commons/assessment/Assessment.tsx

@@ -40,7 +40,7 @@ import NotificationBadge from '../notificationBadge/NotificationBadge';
 import { filterNotificationsByAssessment } from '../notificationBadge/NotificationBadgeHelper';
 import Constants from '../utils/Constants';
 import { beforeNow, getPrettyDate, getPrettyDateAfterHours } from '../utils/DateHelper';
-import { useResponsive, useSession } from '../utils/Hooks';
+import { useResponsive, useSession, useTypedSelector } from '../utils/Hooks';
 import { assessmentTypeLink, convertParamToInt } from '../utils/ParamParseHelper';
 import AssessmentNotFound from './AssessmentNotFound';
 import {
@@ -262,6 +262,8 @@ const Assessment: React.FC = () => {
     [assessmentConfigToLoad.type, assessmentOverviewsUnfiltered]
   );
 
+  const fromLeaderboard: boolean = useTypedSelector(store => store.leaderboard.code) ? true : false;
+
   // If assessmentId or questionId is defined but not numeric, redirect back to the Assessment overviews page
   if (
     (params.assessmentId && !params.assessmentId?.match(numberRegExp)) ||
@@ -290,7 +292,8 @@ const Assessment: React.FC = () => {
       canSave:
         role !== Role.Student ||
         (overview.status !== AssessmentStatuses.submitted && !beforeNow(overview.closeAt)),
-      assessmentConfiguration: assessmentConfigToLoad
+      assessmentConfiguration: assessmentConfigToLoad,
+      fromContestLeaderboard: fromLeaderboard
     };
     return <AssessmentWorkspace {...assessmentWorkspaceProps} />;
   }

src/commons/assessment/AssessmentTypes.ts

@@ -194,6 +194,7 @@ export type ContestEntry = {
   score?: number;
   final_score?: number;
   student_name?: string;
+  rank?: number;
 };
 
 export type ContestEntryCodeAnswer = {

src/commons/assessmentWorkspace/AssessmentWorkspace.tsx

@@ -19,6 +19,7 @@
 import { useNavigate } from 'react-router';
 import { showSimpleConfirmDialog } from 'src/commons/utils/DialogHelper';
 import { onClickProgress } from 'src/features/assessments/AssessmentUtils';
+import LeaderboardActions from 'src/features/leaderboard/LeaderboardActions';
 import Messages, { sendToWebview } from 'src/features/vscode/messages';
 import { mobileOnlyTabIds } from 'src/pages/playground/PlaygroundTabs';
 
@@ -85,6 +86,7 @@
   notAttempted: boolean;
   canSave: boolean;
   assessmentConfiguration: AssessmentConfiguration;
+  fromContestLeaderboard: boolean;
 };
 
 const workspaceLocation: WorkspaceLocation = 'assessment';
@@ -186,6 +188,17 @@
     };
   }, [dispatch]);
 
+  const code = useTypedSelector(store => store.leaderboard.code);
+  const initialRunCompleted = useTypedSelector(store => store.leaderboard.initialRun);
+  const votingId = props.assessmentId;
+
+  useEffect(() => {
+    if (initialRunCompleted[votingId] && props.fromContestLeaderboard && code != '') {
+      dispatch(WorkspaceActions.updateEditorValue(workspaceLocation, 0, code));
+      dispatch(LeaderboardActions.clearCode());
+    }
+  }, [dispatch]);
+
   useEffect(() => {
     if (assessmentOverview && assessmentOverview.maxTeamSize > 1) {
       handleTeamOverviewFetch(props.assessmentId);
@@ -216,8 +229,7 @@
     if (!assessment) {
       return;
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   /**
    * Once there is an update (due to the assessment being fetched), check
@@ -225,7 +237,10 @@
    */
   useEffect(() => {
     checkWorkspaceReset();
-  });
+    if (assessment != undefined && question.type == 'voting') {
+      dispatch(LeaderboardActions.setWorkspaceInitialRun(votingId));
+    }
+  }, [dispatch, assessment]);
 
   /**
    * Handles toggling enabling and disabling token counter depending on assessment properties
@@ -367,6 +382,7 @@
       case QuestionTypes.voting:
         const votingQuestionData: IContestVotingQuestion = question;
         options.programPrependValue = votingQuestionData.prepend;
+        if (props.fromContestLeaderboard) options.editorValue = code;
         options.programPostpendValue = votingQuestionData.postpend;
         break;
       case QuestionTypes.mcq: