Merge branch 'master' of https://github.com/source-academy/frontend into 2024-vite

Author: RichDom2185

.env.example

@@ -44,6 +44,11 @@ REACT_APP_SAML_PROVIDER1=
 REACT_APP_SAML_PROVIDER1_NAME=
 REACT_APP_SAML_PROVIDER1_ENDPOINT=
 
+# NUS guidelines a separate, standardised login page, thus separated for compliance
+REACT_APP_NUS_SAML_PROVIDER1=
+REACT_APP_NUS_SAML_PROVIDER1_NAME=
+REACT_APP_NUS_SAML_PROVIDER1_ENDPOINT=
+
 REACT_APP_MODULE_BACKEND_URL=https://source-academy.github.io/modules
 REACT_APP_SHAREDB_BACKEND_URL=
 REACT_APP_SICPJS_BACKEND_URL="http://127.0.0.1:8080/"
@@ -65,3 +70,6 @@ REACT_APP_CADET_LOGGER_INTERVAL=10000
 # Continuous Assessment (CA) Fulfillment Level
 # Used in src/commons/achievement/overview/AchievementMilestone.tsx
 REACT_APP_CA_FULFILLMENT_LEVEL=24
+
+# Feature flags
+REACT_APP_FEATURE_ENABLE_SICP_CHATBOT=FALSE

.github/workflows/build-development.yml

@@ -11,11 +11,6 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-      - name: Install dependencies (apt)
-        run: |
-          sudo apt-get update && \
-          sudo apt-get install -y --no-install-recommends \
-          libxi-dev libgl1-mesa-dev
       - name: Setup node
         uses: actions/setup-node@v4
         with:

.github/workflows/ci.yml

@@ -26,11 +26,6 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-      - name: Install dependencies (apt)
-        run: |
-          sudo apt-get update && \
-          sudo apt-get install -y --no-install-recommends \
-          libxi-dev libgl1-mesa-dev
       - name: Setup node
         uses: actions/setup-node@v4
         with:

craco.config.cjs

@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
+/* eslint-disable @typescript-eslint/no-require-imports */
 const webpack = require('webpack');
 
 const cracoConfig = {
@@ -178,4 +178,4 @@ const replaceSlashes = target => {
   return target.replaceAll('/', '[/\\\\]');
 };
 
-module.exports = cracoConfig
+module.exports = cracoConfig;

eslint.config.cjs

@@ -58,11 +58,11 @@ module.exports = tseslint.config(
       '@typescript-eslint/no-explicit-any': 'off',
       '@typescript-eslint/explicit-module-boundary-types': 'off',
       '@typescript-eslint/ban-ts-comment': 'warn',
-      '@typescript-eslint/ban-types': [
+      '@typescript-eslint/no-empty-object-type': 'off',
+      '@typescript-eslint/no-unsafe-function-type': 'off',
+      '@typescript-eslint/no-restricted-types': [
         'error',
         {
-          // TODO: Change this to true someday
-          extendDefaults: false,
           types: {
             'React.FunctionComponent': {
               message: 'Use React.FC instead',

package.json

@@ -39,7 +39,7 @@
     "@octokit/rest": "^20.0.0",
     "@reduxjs/toolkit": "^1.9.7",
     "@sentry/browser": "^7.57.0",
-    "@sourceacademy/c-slang": "^1.0.20",
+    "@sourceacademy/c-slang": "^1.0.21",
     "@sourceacademy/sharedb-ace": "^2.0.3",
     "@sourceacademy/sling-client": "^0.1.0",
     "@szhsin/react-menu": "^4.0.0",
@@ -52,21 +52,22 @@
     "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",
     "hastscript": "^9.0.0",
     "i18next": "^23.11.2",
     "i18next-browser-languagedetector": "^7.2.1",
     "java-slang": "^1.0.13",
     "js-cookie": "^3.0.5",
-    "js-slang": "^1.0.74",
+    "js-slang": "^1.0.76",
     "js-yaml": "^4.1.0",
     "konva": "^9.2.0",
     "lodash": "^4.17.21",
     "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",
@@ -92,7 +93,6 @@
     "react-sortable-hoc": "^2.0.0",
     "react-syntax-highlighter": "^15.5.0",
     "react-textarea-autosize": "^8.5.2",
-    "redux": "^4.2.1",
     "redux-mock-store": "^1.5.4",
     "redux-saga": "^1.2.3",
     "rehype-react": "^8.0.0",
@@ -115,14 +115,14 @@
     "@rollup/plugin-inject": "^5.0.5",
     "@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/acorn": "^6.0.0",
+    "@types/dompurify": "^3.0.5",
     "@types/estree": "^1.0.5",
     "@types/gapi": "^0.0.44",
     "@types/gapi.auth2": "^0.0.57",
     "@types/gapi.client": "^1.0.5",
-    "@types/gapi.client.drive": "^3.0.14",
+    "@types/gapi.client.drive-v3": "^0.0.5",
     "@types/google.picker": "^0.0.39",
     "@types/jest": "^29.0.0",
     "@types/js-cookie": "^3.0.6",
@@ -132,11 +132,8 @@
     "@types/react-copy-to-clipboard": "^5.0.4",
     "@types/react-dom": "^18.3.0",
     "@types/react-redux": "^7.1.24",
-    "@types/react-router": "^5.1.20",
-    "@types/react-router-dom": "^5.3.3",
     "@types/react-syntax-highlighter": "^15.5.7",
     "@types/react-test-renderer": "^18.0.0",
-    "@types/react-textarea-autosize": "^8.0.0",
     "@types/redux-mock-store": "^1.0.3",
     "@types/showdown": "^2.0.1",
     "@types/uuid": "^9.0.0",
@@ -148,12 +145,12 @@
     "constants-browserify": "^1.0.0",
     "coveralls": "^3.1.1",
     "cross-env": "^7.0.3",
-    "eslint": "^9.1.1",
-    "eslint-plugin-react": "^7.34.1",
+    "eslint": "^9.9.0",
+    "eslint-plugin-react": "^7.35.0",
     "//": "See: https://github.com/facebook/react/issues/28313#issuecomment-2076798972, https://github.com/t3-oss/create-t3-turbo/issues/984#issuecomment-2076413457",
     "eslint-plugin-react-hooks": "5.1.0-canary-cb151849e1-20240424",
-    "eslint-plugin-react-refresh": "^0.4.6",
-    "eslint-plugin-simple-import-sort": "^12.0.0",
+    "eslint-plugin-react-refresh": "^0.4.9",
+    "eslint-plugin-simple-import-sort": "^12.1.1",
     "https-browserify": "^1.0.0",
     "husky": "^9.0.0",
     "jest": "^27.4.3",
@@ -162,7 +159,7 @@
     "npm-run-all2": "^6.0.0",
     "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.1",
-    "prettier": "~3.0.0",
+    "prettier": "^3.3.3",
     "process": "^0.11.10",
     "react-error-overlay": "^6.0.11",
     "react-scripts": "^5.0.1",
@@ -175,7 +172,7 @@
     "stream-http": "^3.2.0",
     "timers-browserify": "^2.0.12",
     "typescript": "^5.5.3",
-    "typescript-eslint": "^7.14.1",
+    "typescript-eslint": "^8.1.0",
     "url": "^0.11.1",
     "vite": "^5.3.2",
     "vite-plugin-svgr": "^4.2.0",
@@ -184,7 +181,7 @@
     "webpack-bundle-analyzer": "^4.9.0"
   },
   "resolutions": {
-    "**/gl": "^6.0.2"
+    "**/gl": "^8.0.2"
   },
   "browserslist": {
     "production": [

src/commons/Markdown.tsx

@@ -1,5 +1,6 @@
 import { Classes } from '@blueprintjs/core';
 import classNames from 'classnames';
+import DOMPurify from 'dompurify';
 import React from 'react';
 import { Converter } from 'showdown';
 
@@ -24,7 +25,12 @@ const Markdown: React.FC<Props> = props => {
   return (
     <div
       className={classNames(props.className ? props.className : 'md', Classes.RUNNING_TEXT)}
-      dangerouslySetInnerHTML={{ __html: converter.makeHtml(props.content) }}
+      dangerouslySetInnerHTML={{
+        __html: DOMPurify.sanitize(converter.makeHtml(props.content), {
+          USE_PROFILES: { html: true },
+          ADD_ATTR: ['target']
+        })
+      }}
     />
   );
 };

src/commons/XMLParser/XMLParserHelper.ts

@@ -87,7 +87,8 @@ const makeAssessmentOverview = (result: any, maxXpVal: number): AssessmentOvervi
     isGradingPublished: false,
     xp: 0,
     maxTeamSize: 1,
-    hasVotingFeatures: false
+    hasVotingFeatures: false,
+    hoursBeforeEarlyXpDecay: 0
   };
 };
 

src/commons/__tests__/__snapshots__/Markdown.tsx.snap

@@ -6,10 +6,10 @@ exports[`Markdown page renders correctly 1`] = `
   dangerouslySetInnerHTML={
     Object {
       "__html": "<p>Welcome to the Source Academy playground!</p>
-<p>The book <a href=\\"https://sourceacademy.org/sicpjs/\\" rel=\\"noopener noreferrer\\" target=\\"_blank\\"><em>Structure and Interpretation of Computer Programs, JavaScript Edition</em></a>
-uses JavaScript sublanguages that we call <a href=\\"https://docs.sourceacademy.org/\\" rel=\\"noopener noreferrer\\" target=\\"_blank\\"><em>Source</em></a>. You have chosen the sublanguage <a href=\\"https://docs.sourceacademy.org/source_1/\\" rel=\\"noopener noreferrer\\" target=\\"_blank\\"><em>Source §1</em></a>.</p>
-<p>In the editor on the left, you can use the <a href=\\"https://github.com/ajaxorg/ace/wiki/Default-Keyboard-Shortcuts\\" rel=\\"noopener noreferrer\\" target=\\"_blank\\"><em>Ace keyboard shortcuts</em></a> 
-and also the <a href=\\"https://github.com/source-academy/frontend/wiki/Source-Academy-Keyboard-Shortcuts\\" rel=\\"noopener noreferrer\\" target=\\"_blank\\"><em>Source Academy keyboard shortcuts</em></a>.</p>",
+<p>The book <a target=\\"_blank\\" rel=\\"noopener noreferrer\\" href=\\"https://sourceacademy.org/sicpjs/\\"><em>Structure and Interpretation of Computer Programs, JavaScript Edition</em></a>
+uses JavaScript sublanguages that we call <a target=\\"_blank\\" rel=\\"noopener noreferrer\\" href=\\"https://docs.sourceacademy.org/\\"><em>Source</em></a>. You have chosen the sublanguage <a target=\\"_blank\\" rel=\\"noopener noreferrer\\" href=\\"https://docs.sourceacademy.org/source_1/\\"><em>Source §1</em></a>.</p>
+<p>In the editor on the left, you can use the <a target=\\"_blank\\" rel=\\"noopener noreferrer\\" href=\\"https://github.com/ajaxorg/ace/wiki/Default-Keyboard-Shortcuts\\"><em>Ace keyboard shortcuts</em></a> 
+and also the <a target=\\"_blank\\" rel=\\"noopener noreferrer\\" href=\\"https://github.com/source-academy/frontend/wiki/Source-Academy-Keyboard-Shortcuts\\"><em>Source Academy keyboard shortcuts</em></a>.</p>",
     }
   }
 />

src/commons/achievement/AchievementManualEditor.tsx

@@ -50,8 +50,8 @@ const AchievementManualEditor: React.FC<Props> = props => {
             user1.name != null && user2.name != null
               ? user1.name.localeCompare(user2.name)
               : user1.name == null
-              ? 1 // user1.name is null, user1 > user2
-              : -1 // user2.name is null, user1 < user2
+                ? 1 // user1.name is null, user1 > user2
+                : -1 // user2.name is null, user1 < user2
         )
       : props.users
           .filter(user => user.group === studio)
@@ -60,8 +60,8 @@ const AchievementManualEditor: React.FC<Props> = props => {
               user1.name != null && user2.name != null
                 ? user1.name.localeCompare(user2.name)
                 : user1.name == null
-                ? 1 // user1.name is null, user1 > user2
-                : -1 // user2.name is null, user1 < user2
+                  ? 1 // user1.name is null, user1 > user2
+                  : -1 // user2.name is null, user1 < user2
           );
 
   useEffect(() => {
@@ -88,8 +88,12 @@ const AchievementManualEditor: React.FC<Props> = props => {
       };
       updateGoalProgress(selectedUser.courseRegId, progress);
     } else {
-      !goal && showWarningMessage('Goal not selected');
-      !selectedUser && showWarningMessage('User not selected');
+      if (!goal) {
+        showWarningMessage('Goal not selected');
+      }
+      if (!selectedUser) {
+        showWarningMessage('User not selected');
+      }
     }
   };