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

Author: alsonleej

package.json

@@ -135,7 +135,7 @@
     "@types/xml2js": "^0.4.11",
     "babel-jest": "^29.7.0",
     "buffer": "^6.0.3",
-    "canvas": "^2.11.2",
+    "canvas": "^3.1.0",
     "constants-browserify": "^1.0.0",
     "coveralls": "^3.1.1",
     "cross-env": "^7.0.3",
@@ -162,7 +162,7 @@
     "stream-browserify": "^3.0.0",
     "stream-http": "^3.2.0",
     "timers-browserify": "^2.0.12",
-    "typescript": "^5.5.3",
+    "typescript": "^5.8.2",
     "typescript-eslint": "^8.1.0",
     "url": "^0.11.1",
     "webpack-bundle-analyzer": "^4.9.0"

public/assets/mockChapter0.txt

@@ -4,9 +4,9 @@ objectives
     finish
 
 gameStartActions
-    // replace 173 with assessment id
-    show_dialogue(welcome) if userstate.assessments.173
-    show_dialogue(unwelcome) if !userstate.assessments.173
+    // replace S0 with assessment number
+    show_dialogue(welcome) if userstate.assessments.S0
+    show_dialogue(unwelcome) if !userstate.assessments.S0
 
 checkpointCompleteActions
     show_dialogue(done)
@@ -96,8 +96,8 @@ dialogues
         1
         @scottie, sad
         You haven't finished assessment
-        Finish assessment 173 first and come back?
-            navigate_to_assessment(173)
+        Finish assessment S0 first and come back?
+            navigate_to_assessment(S0)
         goto 2 
         2
         @scottie
@@ -113,7 +113,7 @@ dialogues
         Hmmm
             update_assessment_status*()
         Let me check
-        goto 1 if !userstate.assessments.173 else 3
+        goto 1 if !userstate.assessments.S0 else 3
 
     what, What should I do now, Scottie?
         @you

src/commons/application/actions/__tests__/SessionActions.ts

@@ -264,6 +264,7 @@ test('setAssessmentConfigurations generates correct action object', () => {
       isManuallyGraded: true,
       isGradingAutoPublished: false,
       displayInDashboard: true,
+      isMinigame: false,
       hasTokenCounter: false,
       hasVotingFeatures: false,
       hoursBeforeEarlyXpDecay: 48,
@@ -275,6 +276,7 @@ test('setAssessmentConfigurations generates correct action object', () => {
       isManuallyGraded: true,
       isGradingAutoPublished: false,
       displayInDashboard: true,
+      isMinigame: false,
       hasTokenCounter: false,
       hasVotingFeatures: false,
       hoursBeforeEarlyXpDecay: 48,
@@ -286,6 +288,7 @@ test('setAssessmentConfigurations generates correct action object', () => {
       isManuallyGraded: true,
       isGradingAutoPublished: false,
       displayInDashboard: true,
+      isMinigame: false,
       hasTokenCounter: false,
       hasVotingFeatures: false,
       hoursBeforeEarlyXpDecay: 48,
@@ -714,6 +717,7 @@ test('updateAssessmentTypes generates correct action object', () => {
       isManuallyGraded: true,
       isGradingAutoPublished: false,
       displayInDashboard: true,
+      isMinigame: false,
       hasTokenCounter: false,
       hasVotingFeatures: false,
       hoursBeforeEarlyXpDecay: 48,
@@ -725,6 +729,7 @@ test('updateAssessmentTypes generates correct action object', () => {
       isManuallyGraded: true,
       isGradingAutoPublished: false,
       displayInDashboard: true,
+      isMinigame: false,
       hasTokenCounter: false,
       hasVotingFeatures: false,
       hoursBeforeEarlyXpDecay: 48,
@@ -736,6 +741,7 @@ test('updateAssessmentTypes generates correct action object', () => {
       isManuallyGraded: false,
       isGradingAutoPublished: true,
       displayInDashboard: true,
+      isMinigame: false,
       hasTokenCounter: false,
       hasVotingFeatures: false,
       hoursBeforeEarlyXpDecay: 48,
@@ -747,6 +753,7 @@ test('updateAssessmentTypes generates correct action object', () => {
       isManuallyGraded: true,
       isGradingAutoPublished: false,
       displayInDashboard: true,
+      isMinigame: false,
       hasTokenCounter: false,
       hasVotingFeatures: false,
       hoursBeforeEarlyXpDecay: 48,
@@ -758,6 +765,7 @@ test('updateAssessmentTypes generates correct action object', () => {
       isManuallyGraded: false,
       isGradingAutoPublished: false,
       displayInDashboard: true,
+      isMinigame: false,
       hasTokenCounter: false,
       hasVotingFeatures: false,
       hoursBeforeEarlyXpDecay: 0,
@@ -769,6 +777,7 @@ test('updateAssessmentTypes generates correct action object', () => {
       isManuallyGraded: true,
       isGradingAutoPublished: false,
       displayInDashboard: true,
+      isMinigame: false,
       hasTokenCounter: false,
       hasVotingFeatures: false,
       hoursBeforeEarlyXpDecay: 48,
@@ -789,6 +798,7 @@ test('deleteAssessmentConfig generates correct action object', () => {
     isManuallyGraded: true,
     isGradingAutoPublished: false,
     displayInDashboard: true,
+    isMinigame: false,
     hasTokenCounter: false,
     hasVotingFeatures: false,
     hoursBeforeEarlyXpDecay: 48,

src/commons/application/reducers/__tests__/SessionReducer.ts

@@ -147,6 +147,7 @@ test('SET_ASSESSMENT_CONFIGURATIONS works correctly', () => {
       isManuallyGraded: false,
       isGradingAutoPublished: false,
       displayInDashboard: true,
+      isMinigame: false,
       hasTokenCounter: false,
       hasVotingFeatures: false
     },
@@ -161,6 +162,7 @@ test('SET_ASSESSMENT_CONFIGURATIONS works correctly', () => {
       isManuallyGraded: false,
       isGradingAutoPublished: false,
       displayInDashboard: true,
+      isMinigame: false,
       hasTokenCounter: false,
       hasVotingFeatures: false
     },
@@ -175,6 +177,7 @@ test('SET_ASSESSMENT_CONFIGURATIONS works correctly', () => {
       isManuallyGraded: false,
       isGradingAutoPublished: false,
       displayInDashboard: true,
+      isMinigame: false,
       hasTokenCounter: false,
       hasVotingFeatures: false
     }

src/commons/assessment/AssessmentTypes.ts

@@ -92,6 +92,7 @@ export type Assessment = {
   globalDeployment?: Library; // For mission control
   graderDeployment?: Library; // For mission control
   hasTokenCounter?: boolean;
+  isMinigame?: boolean;
   id: number;
   longSummary: string;
   missionPDF: string;
@@ -105,6 +106,7 @@ export type AssessmentConfiguration = {
   isManuallyGraded: boolean;
   isGradingAutoPublished: boolean;
   displayInDashboard: boolean;
+  isMinigame: boolean;
   hoursBeforeEarlyXpDecay: number;
   earlySubmissionXp: number;
   hasTokenCounter: boolean;

src/commons/assessment/__tests__/Assessment.tsx

@@ -17,6 +17,7 @@ const mockAssessmentConfig: AssessmentConfiguration = {
   isManuallyGraded: true,
   isGradingAutoPublished: false,
   displayInDashboard: true,
+  isMinigame: false,
   hasTokenCounter: false,
   hasVotingFeatures: false,
   hoursBeforeEarlyXpDecay: 48,

src/commons/assessmentWorkspace/AssessmentWorkspace.tsx

@@ -94,6 +94,7 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
   const [isSaving, setIsSaving] = useState(false);
   const [showResetTemplateOverlay, setShowResetTemplateOverlay] = useState(false);
   const [sessionId, setSessionId] = useState('');
+  const [isSubmitted, setIsSubmitted] = useState(false);
   const { isMobileBreakpoint } = useResponsive();
 
   const assessment = useTypedSelector(state => state.session.assessments[props.assessmentId]);
@@ -600,6 +601,10 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
       setSelectedTab(SideContentType.questionOverview);
     };
     const onClickReturn = () => navigate(listingPath);
+    const onClickSubmit = () => {
+      dispatch(SessionActions.submitAssessment(assessment.id));
+      setIsSubmitted(true);
+    };
 
     const onClickSave = () => {
       if (isSaving) return;
@@ -664,8 +669,14 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
             ? onClickProgress(onClickReturn, question, editorTestcases, isBlocked)
             : onClickReturn
         }
+        onClickSubmit={
+          question.blocking
+            ? onClickProgress(onClickSubmit, question, editorTestcases, isBlocked)
+            : onClickSubmit
+        }
         questionProgress={questionProgress}
         key="next_question"
+        submitOnFinish={assessment.isMinigame}
       />
     );
 
@@ -834,6 +845,18 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
     </Dialog>
   );
 
+  const submissionOverlay = (
+    <Dialog className="assessment-briefing" isOpen={isSubmitted}>
+      <Card>
+        <Markdown
+          content={`## ${assessment.type.substring(0, assessment.type.length - 1)} complete!
+You've successfully submitted this ${assessment.type.substring(0, assessment.type.length - 1)}!
+It is safe to close this window.`}
+        />
+      </Card>
+    </Dialog>
+  );
+
   const closeOverlay = () => setShowResetTemplateOverlay(false);
   const resetTemplateOverlay = (
     <Dialog
@@ -942,6 +965,7 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
   };
   return (
     <div className={classNames('WorkspaceParent', Classes.DARK)}>
+      {submissionOverlay}
       {overlay}
       {resetTemplateOverlay}
       {!isMobileBreakpoint ? (

src/commons/assessmentWorkspace/__tests__/AssessmentWorkspace.tsx

@@ -21,6 +21,7 @@ const defaultProps = assertType<AssessmentWorkspaceProps>()({
     isManuallyGraded: true,
     isGradingAutoPublished: false,
     displayInDashboard: true,
+    isMinigame: false,
     hasTokenCounter: false,
     hasVotingFeatures: false,
     hoursBeforeEarlyXpDecay: 48,

src/commons/controlBar/ControlBarNextButton.tsx

@@ -3,22 +3,29 @@ import React from 'react';
 
 import ControlButton from '../ControlButton';
 import { ControlBarReturnToAcademyButton } from './ControlBarReturnToAcademyButton';
+import { ControlBarSubmit } from './ControlBarSubmit';
 
 type ControlBarNextButtonProps = DispatchProps & StateProps;
 
 type DispatchProps = {
   onClickNext?(): any;
   onClickReturn?(): any;
+  onClickSubmit?(): any;
 };
 
 type StateProps = {
   key: string;
   questionProgress: [number, number] | null;
+  submitOnFinish?: boolean;
 };
 
 export const ControlBarNextButton: React.FC<ControlBarNextButtonProps> = props => {
   return props.questionProgress![0] === props.questionProgress![1] ? (
-    <ControlBarReturnToAcademyButton onClick={props.onClickReturn} key="return_to_academy" />
+    props.submitOnFinish ? (
+      <ControlBarSubmit onClick={props.onClickSubmit} />
+    ) : (
+      <ControlBarReturnToAcademyButton onClick={props.onClickReturn} key="return_to_academy" />
+    )
   ) : (
     <ControlButton
       label="Next"

src/commons/controlBar/ControlBarSubmit.tsx

@@ -0,0 +1,19 @@
+import { IconNames } from '@blueprintjs/icons';
+import React from 'react';
+
+import ControlButton from '../ControlButton';
+
+type Props = {
+  onClick?(): any;
+};
+
+export const ControlBarSubmit: React.FC<Props> = ({ onClick }) => {
+  return (
+    <ControlButton
+      label="Submit"
+      icon={IconNames.ARROW_RIGHT}
+      onClick={onClick}
+      options={{ iconOnRight: true }}
+    />
+  );
+};