Merge branch 'sourceMaster'

Author: s-kybound

craco.config.js

@@ -1,7 +1,7 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
+/* eslint-disable @typescript-eslint/no-var-requires */
 const webpack = require('webpack');
 
-const cracoConfig = (module.exports = {
+const cracoConfig = {
   webpack: {
     configure: webpackConfig => {
       // avoid the entire process.env being inserted into the service worker
@@ -62,11 +62,16 @@ const cracoConfig = (module.exports = {
         },
       });
 
-      // Ignore warnings for dependencies that do not ship with a source map.
-      // This is because we cannot do anything about our dependencies.
-      webpackConfig.ignoreWarnings = [{
+      webpackConfig.ignoreWarnings = [{ 
+        // Ignore warnings for dependencies that do not ship with a source map.
+        // This is because we cannot do anything about our dependencies.
         module: /node_modules/,
         message: /Failed to parse source map/
+      }, {
+        // Ignore the warnings that occur because js-slang uses dynamic imports
+        // to load Source modules
+        module: /js-slang\/dist\/modules\/loader\/loaders.js/,
+        message: /Critical dependency: the request of a dependency is an expression/
       }];
 
       webpackConfig.plugins = [
@@ -78,7 +83,7 @@ const cracoConfig = (module.exports = {
         // Make the 'buffer' Node.js module available in the browser.
         new webpack.ProvidePlugin({
           Buffer: ['buffer', 'Buffer'],
-        })
+        }),
       ];
 
       // Workaround to suppress warnings caused by ts-morph in js-slang
@@ -153,7 +158,7 @@ const cracoConfig = (module.exports = {
       ['@babel/preset-typescript']
     ]
   }
-});
+}
 
 const ignoreModulePaths = (...paths) => {
   const moduleRoot = replaceSlashes('/node_modules/');
@@ -166,3 +171,5 @@ const ignoreModulePaths = (...paths) => {
 const replaceSlashes = target => {
   return target.replaceAll('/', '[/\\\\]');
 };
+
+module.exports = cracoConfig

package.json

@@ -50,7 +50,8 @@
     "flexboxgrid": "^6.3.1",
     "flexboxgrid-helpers": "^1.1.3",
     "hastscript": "^9.0.0",
-    "js-slang": "^1.0.60",
+    "java-slang": "^1.0.3",
+    "js-slang": "^1.0.62",
     "js-yaml": "^4.1.0",
     "konva": "^9.2.0",
     "lodash": "^4.17.21",

src/commons/application/ApplicationTypes.ts

@@ -122,13 +122,15 @@ export enum SupportedLanguage {
   JAVASCRIPT = 'JavaScript',
   SCHEME = 'Scheme',
   PYTHON = 'Python',
+  JAVA = 'Java',
   C = 'C'
 }
 
 export const SUPPORTED_LANGUAGES = [
   SupportedLanguage.JAVASCRIPT,
   SupportedLanguage.SCHEME,
   SupportedLanguage.PYTHON,
+  SupportedLanguage.JAVA,
   SupportedLanguage.C
 ];
 
@@ -225,6 +227,15 @@ export const pyLanguages: SALanguage[] = pySubLanguages.map(sublang => {
   return { ...sublang, mainLanguage: SupportedLanguage.PYTHON, supports: { repl: true } };
 });
 
+export const javaLanguages: SALanguage[] = [
+  {
+    chapter: Chapter.FULL_JAVA,
+    variant: Variant.DEFAULT,
+    displayName: 'Java',
+    mainLanguage: SupportedLanguage.JAVA,
+    supports: {}
+  }
+];
 export const cLanguages: SALanguage[] = [
   {
     chapter: Chapter.FULL_C,
@@ -304,6 +315,7 @@ export const ALL_LANGUAGES: readonly SALanguage[] = [
   htmlLanguage,
   ...schemeLanguages,
   ...pyLanguages,
+  ...javaLanguages,
   ...cLanguages
 ];
 // TODO: Remove this function once logic has been fully migrated

src/commons/assessment/AssessmentTypes.ts

@@ -64,6 +64,7 @@ export type AssessmentOverview = {
   isPublished?: boolean;
   hasVotingFeatures: boolean;
   hasTokenCounter?: boolean;
+  isVotingPublished?: boolean;
   maxXp: number;
   earlySubmissionXp: number;
   number?: string; // For mission control

src/commons/editor/Editor.tsx

@@ -435,8 +435,8 @@ const EditorBase = React.memo((props: EditorProps & LocalStateProps) => {
     session.on('changeAnnotation' as any, makeHandleAnnotationChange(session));
 
     // Start autocompletion
-    if (props.sourceChapter === Chapter.FULL_C) {
-      // for C language, use the default autocomplete provided by ace editor
+    if (props.sourceChapter === Chapter.FULL_C || props.sourceChapter === Chapter.FULL_JAVA) {
+      // for C, Java language, use the default autocomplete provided by ace editor
       const { textCompleter, keyWordCompleter, setCompleters } = acequire('ace/ext/language_tools');
       setCompleters([textCompleter, keyWordCompleter]);
     } else {

src/commons/navigationBar/subcomponents/NavigationBarLangSelectButton.tsx

@@ -4,6 +4,7 @@ import { useDispatch } from 'react-redux';
 import {
   cLanguages,
   getLanguageConfig,
+  javaLanguages,
   pyLanguages,
   SALanguage,
   schemeLanguages,
@@ -23,6 +24,7 @@ const defaultSublanguages: {
   [SupportedLanguage.JAVASCRIPT]: sourceLanguages[0],
   [SupportedLanguage.PYTHON]: pyLanguages[0],
   [SupportedLanguage.SCHEME]: schemeLanguages[0],
+  [SupportedLanguage.JAVA]: javaLanguages[0],
   [SupportedLanguage.C]: cLanguages[0]
 };
 

src/commons/sagas/BackendSaga.ts

@@ -16,6 +16,7 @@ import {
   GradingQuestion
 } from '../../features/grading/GradingTypes';
 import {
+  ASSIGN_ENTRIES_FOR_VOTING,
   CHANGE_DATE_ASSESSMENT,
   CHANGE_TEAM_SIZE_ASSESSMENT,
   CONFIGURE_ASSESSMENT,
@@ -1386,6 +1387,28 @@ function* BackendSaga(): SagaIterator {
       yield call(showSuccessMessage, 'Updated successfully!', 1000);
     }
   );
+
+  yield takeEvery(
+    ASSIGN_ENTRIES_FOR_VOTING,
+    function* (action: ReturnType<typeof actions.assignEntriesForVoting>): any {
+      const tokens: Tokens = yield selectTokens();
+      const id = action.payload.id;
+
+      const resp: Response | null = yield updateAssessment(
+        id,
+        {
+          assignEntriesForVoting: true
+        },
+        tokens
+      );
+      if (!resp || !resp.ok) {
+        return yield handleResponseError(resp);
+      }
+
+      yield put(actions.fetchAssessmentOverviews());
+      yield call(showSuccessMessage, 'Updated successfully!', 1000);
+    }
+  );
 }
 
 function* handleReautogradeResponse(resp: Response | null): any {

src/commons/sagas/RequestsSaga.ts

@@ -1128,6 +1128,48 @@ export const deleteSourcecastEntry = async (
   return resp;
 };
 
+/**
+ * GET /courses/{courseId}/admin/assessments/{assessmentId}/scoreLeaderboard
+ */
+export const getScoreLeaderboard = async (
+  assessmentId: number,
+  tokens: Tokens
+): Promise<ContestEntry[] | null> => {
+  const resp = await request(
+    `${courseId()}/admin/assessments/${assessmentId}/scoreLeaderboard`,
+    'GET',
+    {
+      ...tokens
+    }
+  );
+  if (!resp || !resp.ok) {
+    return null; // invalid accessToken _and_ refreshToken
+  }
+  const scoreLeaderboard = await resp.json();
+  return scoreLeaderboard as ContestEntry[];
+};
+
+/**
+ * GET /courses/{courseId}/admin/assessments/{assessmentId}/popularVoteLeaderboard
+ */
+export const getPopularVoteLeaderboard = async (
+  assessmentId: number,
+  tokens: Tokens
+): Promise<ContestEntry[] | null> => {
+  const resp = await request(
+    `${courseId()}/admin/assessments/${assessmentId}/popularVoteLeaderboard`,
+    'GET',
+    {
+      ...tokens
+    }
+  );
+  if (!resp || !resp.ok) {
+    return null; // invalid accessToken _and_ refreshToken
+  }
+  const popularVoteLeaderboard = await resp.json();
+  return popularVoteLeaderboard as ContestEntry[];
+};
+
 /**
  * POST /courses/{courseId}/admin/assessments/{assessmentId}
  */
@@ -1140,6 +1182,7 @@ export const updateAssessment = async (
     maxTeamSize?: number;
     hasTokenCounter?: boolean;
     hasVotingFeatures?: boolean;
+    assignEntriesForVoting?: boolean;
   },
   tokens: Tokens
 ): Promise<Response | null> => {

src/commons/sagas/WorkspaceSaga/helpers/evalCode.ts

@@ -9,6 +9,7 @@ import { SagaIterator } from 'redux-saga';
 import { call, put, race, select, take } from 'redux-saga/effects';
 import * as Sourceror from 'sourceror';
 import { makeCCompilerConfig, specialCReturnObject } from 'src/commons/utils/CToWasmHelper';
+import { javaRun } from 'src/commons/utils/JavaHelper';
 import { notifyStoriesEvaluated } from 'src/features/stories/StoriesActions';
 import { EVAL_STORY } from 'src/features/stories/StoriesTypes';
 
@@ -245,6 +246,7 @@ export function* evalCode(
   const isLazy: boolean = context.variant === Variant.LAZY;
   const isWasm: boolean = context.variant === Variant.WASM;
   const isC: boolean = context.chapter === Chapter.FULL_C;
+  const isJava: boolean = context.chapter === Chapter.FULL_JAVA;
 
   let lastDebuggerResult = yield select(
     (state: OverallState) => state.workspaces[workspaceLocation].lastDebuggerResult
@@ -264,6 +266,8 @@ export function* evalCode(
         ? call_variant(context.variant)
         : isC
         ? call(cCompileAndRun, entrypointCode, context)
+        : isJava
+        ? call(javaRun, entrypointCode, context)
         : call(
             runFilesInContext,
             isFolderModeEnabled

src/commons/utils/AceHelper.ts

@@ -50,6 +50,8 @@ export const getModeString = (chapter: Chapter, variant: Variant, library: strin
     case Chapter.SCHEME_4:
     case Chapter.FULL_SCHEME:
       return 'scheme';
+    case Chapter.FULL_JAVA:
+      return 'java';
     case Chapter.FULL_C:
       return 'c_cpp';
     default: