Merge branch 'master' into sayomaki-patch

Author: sayomaki

package.json

@@ -33,8 +33,8 @@
     "@mantine/hooks": "^7.11.2",
     "@octokit/rest": "^20.0.0",
     "@reduxjs/toolkit": "^1.9.7",
-    "@sentry/browser": "^7.57.0",
-    "@sourceacademy/c-slang": "^1.0.20",
+    "@sentry/browser": "^8.33.0",
+    "@sourceacademy/c-slang": "^1.0.21",
     "@sourceacademy/sharedb-ace": "^2.0.3",
     "@sourceacademy/sling-client": "^0.1.0",
     "@szhsin/react-menu": "^4.0.0",
@@ -47,6 +47,7 @@
     "array-move": "^4.0.0",
     "browserfs": "^1.4.3",
     "classnames": "^2.3.2",
+    "dayjs": "^1.11.13",
     "dompurify": "^3.1.6",
     "flexboxgrid": "^6.3.1",
     "flexboxgrid-helpers": "^1.1.3",
@@ -62,7 +63,6 @@
     "lz-string": "^1.4.4",
     "mdast-util-from-markdown": "^2.0.0",
     "mdast-util-to-hast": "^13.0.0",
-    "moment": "^2.29.4",
     "normalize.css": "^8.0.1",
     "phaser": "^3.55.2",
     "query-string": "^9.0.0",
@@ -108,7 +108,7 @@
     "@craco/craco": "^7.1.0",
     "@svgr/webpack": "^8.0.0",
     "@testing-library/jest-dom": "^6.0.0",
-    "@testing-library/react": "^14.0.0",
+    "@testing-library/react": "^15.0.6",
     "@testing-library/user-event": "^14.4.3",
     "@types/dompurify": "^3.0.5",
     "@types/estree": "^1.0.5",

src/commons/achievement/utils/DateHelper.ts

@@ -1,4 +1,4 @@
-import moment from 'moment';
+import dayjs from 'dayjs';
 
 const now = new Date();
 
@@ -38,12 +38,12 @@ export const timeFromExpired = (deadline?: Date) =>
 export const prettifyDate = (deadline?: Date) => {
   if (deadline === undefined) return '';
 
-  return moment(deadline).format('D MMMM YYYY HH:mm');
+  return dayjs(deadline).format('D MMMM YYYY HH:mm');
 };
 
 export const prettifyTime = (time?: Date) => {
   if (time === undefined) return '';
-  return moment(time).format('HH:mm');
+  return dayjs(time).format('HH:mm');
 };
 
 // Converts Date to deadline countdown
@@ -54,11 +54,11 @@ export const prettifyDeadline = (deadline?: Date) => {
     return 'Expired';
   }
 
-  const now = moment();
+  const now = dayjs();
 
-  const weeksAway = Math.ceil(moment(deadline).diff(now, 'weeks', true));
-  const daysAway = Math.ceil(moment(deadline).diff(now, 'days', true));
-  const hoursAway = Math.ceil(moment(deadline).diff(now, 'hours', true));
+  const weeksAway = Math.ceil(dayjs(deadline).diff(now, 'weeks', true));
+  const daysAway = Math.ceil(dayjs(deadline).diff(now, 'days', true));
+  const hoursAway = Math.ceil(dayjs(deadline).diff(now, 'hours', true));
 
   let prettifiedDeadline = '';
   if (weeksAway > 1) {

src/commons/achievement/utils/InsertFakeAchievements.ts

@@ -1,4 +1,4 @@
-import moment from 'moment';
+import dayjs from 'dayjs';
 
 import {
   cardBackgroundUrl,
@@ -23,7 +23,7 @@ function insertFakeAchievements(
   inferencer: AchievementInferencer
 ) {
   const sortedOverviews = [...assessmentOverviews].sort((overview1, overview2) =>
-    moment(overview1.closeAt).diff(moment(overview2.closeAt))
+    dayjs(overview1.closeAt).diff(dayjs(overview2.closeAt))
   );
   const length = assessmentOverviews.length;
 

src/commons/application/ApplicationTypes.ts

@@ -214,6 +214,10 @@ export function isSchemeLanguage(chapter: Chapter): boolean {
   ].includes(chapter);
 }
 
+export function isCseVariant(variant: Variant): boolean {
+  return variant == Variant.EXPLICIT_CONTROL;
+}
+
 const pySubLanguages: Array<Pick<SALanguage, 'chapter' | 'variant' | 'displayName'>> = [
   { chapter: Chapter.PYTHON_1, variant: Variant.DEFAULT, displayName: 'Python \xa71' }
   //{ chapter: Chapter.PYTHON_2, variant: Variant.DEFAULT, displayName: 'Python \xa72' },

src/commons/utils/DateHelper.ts

@@ -1,4 +1,9 @@
-import moment from 'moment';
+import dayjs from 'dayjs';
+import advancedFormat from 'dayjs/plugin/advancedFormat';
+import relativeTime from 'dayjs/plugin/relativeTime';
+
+dayjs.extend(advancedFormat);
+dayjs.extend(relativeTime);
 
 /**
  * Checks if a date is before or at the current time.
@@ -9,8 +14,8 @@ import moment from 'moment';
  *   is before the time of execution of this function.
  */
 export const beforeNow = (dateString: string): boolean => {
-  const date = moment(dateString);
-  const now = moment();
+  const date = dayjs(dateString);
+  const now = dayjs();
   return date.isBefore(now);
 };
 
@@ -25,25 +30,25 @@ export const beforeNow = (dateString: string): boolean => {
  *   e.g 7th June, 20:09
  */
 export const getPrettyDate = (dateString: string): string => {
-  const date = moment(dateString);
+  const date = dayjs(dateString);
   const prettyDate = date.format('Do MMMM, HH:mm');
   return prettyDate;
 };
 
 export const getStandardDateTime = (dateString: string): string => {
-  const date = moment(dateString);
+  const date = dayjs(dateString);
   const prettyDate = date.format('MMMM Do YYYY, HH:mm');
   return prettyDate;
 };
 
 export const getStandardDate = (dateString: string): string => {
-  const date = moment(dateString);
+  const date = dayjs(dateString);
   const prettyDate = date.format('MMMM Do YYYY');
   return prettyDate;
 };
 
 export const getPrettyDateAfterHours = (dateString: string, hours: number): string => {
-  const date = moment(dateString).add(hours, 'hours');
+  const date = dayjs(dateString).add(hours, 'hours');
   const absolutePrettyDate = date.format('Do MMMM, HH:mm');
   const relativePrettyDate = date.fromNow();
   return `${absolutePrettyDate} (${relativePrettyDate})`;

src/pages/academy/groundControl/subcomponents/GroundControlEditCell.tsx

@@ -1,7 +1,7 @@
 import { Dialog, DialogBody, DialogFooter, Intent } from '@blueprintjs/core';
 import { DateInput3 } from '@blueprintjs/datetime2';
 import { IconNames } from '@blueprintjs/icons';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import React, { useCallback, useState } from 'react';
 
 import { AssessmentOverview } from '../../../../commons/assessment/AssessmentTypes';
@@ -21,10 +21,10 @@ const EditCell: React.FC<Props> = ({ data, forOpenDate, handleAssessmentChangeDa
   const maxDate = new Date(2030, 11, 31);
 
   const currentDateString = forOpenDate ? data.openAt : data.closeAt;
-  const currentDate = moment(currentDateString, moment.ISO_8601, true);
+  const currentDate = dayjs(currentDateString, undefined, true);
 
   const [isDialogOpen, setDialogState] = useState(false);
-  const [newDate, setNewDate] = useState<moment.Moment | null>(currentDate);
+  const [newDate, setNewDate] = useState<dayjs.Dayjs | null>(currentDate);
 
   const handleOpenDialog = useCallback(() => setDialogState(true), []);
   const handleCloseDialog = useCallback(() => setDialogState(false), []);
@@ -46,13 +46,13 @@ const EditCell: React.FC<Props> = ({ data, forOpenDate, handleAssessmentChangeDa
   }, [newDate, currentDate, data, handleAssessmentChangeDate, forOpenDate, handleCloseDialog]);
 
   const handleParseDate = (str: string) => {
-    const date = moment(str, dateDisplayFormat, true);
+    const date = dayjs(str, dateDisplayFormat, true);
     return date.isValid() ? date.toDate() : false;
   };
-  const handleFormatDate = (date: Date) => moment(date).format(dateDisplayFormat);
+  const handleFormatDate = (date: Date) => dayjs(date).format(dateDisplayFormat);
 
   const handleDateChange = React.useCallback(
-    (selectedDate: string | null) => setNewDate(moment(selectedDate)),
+    (selectedDate: string | null) => setNewDate(dayjs(selectedDate)),
     []
   );
   const handleDateError = React.useCallback(() => {

src/pages/achievement/control/AchievementControl.tsx

@@ -35,8 +35,18 @@ const AchievementControl: React.FC = () => {
     [dispatch]
   );
 
-  const inferencer = useTypedSelector(
-    state => new AchievementInferencer(state.achievement.achievements, state.achievement.goals)
+  // TODO: This is a hacky fix. By right, we shouldn't need to use an
+  // inferencer instance since we can encapsulate the logic using hooks
+  // and component state.
+  const [initialAchievements, initialGoals] = useTypedSelector(state => [
+    state.achievement.achievements,
+    state.achievement.goals
+  ]);
+  const inferencer = useMemo(
+    () => new AchievementInferencer(initialAchievements, initialGoals),
+    // We only want to create the inferencer once
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
   );
 
   /**

src/pages/playground/Playground.tsx

@@ -18,6 +18,7 @@ import {
   setSessionDetails,
   setSharedbConnected
 } from 'src/commons/collabEditing/CollabEditingActions';
+import { ControlBarExecutionTime } from 'src/commons/controlBar/ControlBarExecutionTime';
 import makeCseMachineTabFrom from 'src/commons/sideContent/content/SideContentCseMachine';
 import makeDataVisualizerTabFrom from 'src/commons/sideContent/content/SideContentDataVisualizer';
 import makeHtmlDisplayTabFrom from 'src/commons/sideContent/content/SideContentHtmlDisplay';
@@ -49,6 +50,7 @@ import {
 import {
   getDefaultFilePath,
   getLanguageConfig,
+  isCseVariant,
   isSourceLanguage,
   OverallState,
   ResultOutput,
@@ -59,7 +61,6 @@ import { ControlBarAutorunButtons } from '../../commons/controlBar/ControlBarAut
 import { ControlBarChapterSelect } from '../../commons/controlBar/ControlBarChapterSelect';
 import { ControlBarClearButton } from '../../commons/controlBar/ControlBarClearButton';
 import { ControlBarEvalButton } from '../../commons/controlBar/ControlBarEvalButton';
-import { ControlBarExecutionTime } from '../../commons/controlBar/ControlBarExecutionTime';
 import { ControlBarGoogleDriveButtons } from '../../commons/controlBar/ControlBarGoogleDriveButtons';
 import { ControlBarSessionButtons } from '../../commons/controlBar/ControlBarSessionButton';
 import { ControlBarShareButton } from '../../commons/controlBar/ControlBarShareButton';
@@ -210,8 +211,8 @@ const Playground: React.FC<PlaygroundProps> = props => {
     editorTabs,
     editorSessionId,
     sessionDetails,
-    execTime,
     stepLimit,
+    execTime,
     isEditorAutorun,
     isRunning,
     isDebugging,
@@ -977,11 +978,11 @@ const Playground: React.FC<PlaygroundProps> = props => {
         languageConfig.supports.multiFile ? toggleFolderModeButton : null,
         persistenceButtons,
         githubButtons,
-        usingRemoteExecution || !isSourceLanguage(languageConfig.chapter)
-          ? null
-          : usingSubst || usingCse
-            ? stepperStepLimit
-            : executionTime
+        usingSubst || usingCse || isCseVariant(languageConfig.variant)
+          ? stepperStepLimit
+          : isSourceLanguage(languageConfig.chapter)
+            ? executionTime
+            : null
       ]
     },
     editorContainerProps: editorContainerProps,