From b8ef27b3dadec087dd0ee5a9ef657538fc225392 Mon Sep 17 00:00:00 2001
From: clementlemon02 <clementling02@gmail.com>
Date: Sun, 16 Jul 2023 23:18:53 +0200
Subject: [PATCH 01/14] LLM Frontend

---
 .../application/actions/SessionActions.ts     |  1 +
 .../actions/__tests__/SessionActions.ts       |  2 +
 .../application/reducers/SessionsReducer.ts   |  6 ++
 .../reducers/__tests__/SessionReducer.ts      |  1 +
 src/commons/application/types/SessionTypes.ts |  4 ++
 src/commons/dropdown/DropdownCreateCourse.tsx | 40 ++++++++++-
 src/commons/dropdown/DropdownPrompt.tsx       | 46 +++++++++++++
 src/commons/mocks/UserMocks.ts                |  2 +
 src/commons/sagas/RequestsSaga.ts             |  1 +
 src/commons/sagas/__tests__/BackendSaga.ts    |  6 +-
 .../academy/__tests__/AcademyActions.ts       |  3 +-
 src/features/grading/GradingTypes.ts          |  1 +
 src/pages/__tests__/localStorage.test.ts      |  1 +
 src/pages/academy/adminPanel/AdminPanel.tsx   |  6 +-
 .../subcomponents/CourseConfigPanel.tsx       | 66 ++++++++++++++++++-
 src/pages/academy/grading/Grading.tsx         | 34 ++++++++--
 .../grading/subcomponents/GradingEditor.tsx   |  1 +
 .../subcomponents/GradingWorkspace.tsx        | 18 ++---
 src/pages/localStorage.ts                     |  1 +
 19 files changed, 217 insertions(+), 23 deletions(-)
 create mode 100644 src/commons/dropdown/DropdownPrompt.tsx

diff --git a/src/commons/application/actions/SessionActions.ts b/src/commons/application/actions/SessionActions.ts
index e2d842373c..ec1e6da7c7 100644
--- a/src/commons/application/actions/SessionActions.ts
+++ b/src/commons/application/actions/SessionActions.ts
@@ -197,6 +197,7 @@ export const updateAssessment = (assessment: Assessment) => action(UPDATE_ASSESS
 export const updateGradingOverviews = (overviews: GradingOverview[]) =>
   action(UPDATE_GRADING_OVERVIEWS, overviews);
 
+
 /**
  * An extra id parameter is included here because of
  * no id for Grading.
diff --git a/src/commons/application/actions/__tests__/SessionActions.ts b/src/commons/application/actions/__tests__/SessionActions.ts
index b4fa8cba57..4f72a2f583 100644
--- a/src/commons/application/actions/__tests__/SessionActions.ts
+++ b/src/commons/application/actions/__tests__/SessionActions.ts
@@ -231,6 +231,7 @@ test('setCourseConfiguration generates correct action object', () => {
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help text',
+    defaultPrompt: 'default Prompt',
     assessmentTypes: ['Missions', 'Quests', 'Paths', 'Contests', 'Others']
   };
   const action = setCourseConfiguration(courseConfig);
@@ -612,6 +613,7 @@ test('updateCourseConfig generates correct action object', () => {
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help text',
+    defaultPrompt: 'default Prompt',
     assessmentTypes: ['Missions', 'Quests', 'Paths', 'Contests', 'Others']
   };
   const action = updateCourseConfig(courseConfig);
diff --git a/src/commons/application/reducers/SessionsReducer.ts b/src/commons/application/reducers/SessionsReducer.ts
index fd7f49de9c..eb8bfc53af 100644
--- a/src/commons/application/reducers/SessionsReducer.ts
+++ b/src/commons/application/reducers/SessionsReducer.ts
@@ -114,6 +114,12 @@ export const SessionsReducer: Reducer<SessionState> = (
         ...state,
         gradingOverviews: action.payload
       };
+
+      case UPDATE_GRADING_OVERVIEWS:
+      return {
+        ...state,
+        gradingOverviews: action.payload
+      };
     case UPDATE_NOTIFICATIONS:
       return {
         ...state,
diff --git a/src/commons/application/reducers/__tests__/SessionReducer.ts b/src/commons/application/reducers/__tests__/SessionReducer.ts
index 3cafa4cb5f..39dd2eec63 100644
--- a/src/commons/application/reducers/__tests__/SessionReducer.ts
+++ b/src/commons/application/reducers/__tests__/SessionReducer.ts
@@ -99,6 +99,7 @@ test('SET_COURSE_CONFIGURATION works correctly', () => {
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help text',
+    defaultPrompt: 'default Prompt',
     assessmentTypes: ['Missions', 'Quests', 'Paths', 'Contests', 'Others']
   };
   const action = {
diff --git a/src/commons/application/types/SessionTypes.ts b/src/commons/application/types/SessionTypes.ts
index 5472173e89..a5e39ee767 100644
--- a/src/commons/application/types/SessionTypes.ts
+++ b/src/commons/application/types/SessionTypes.ts
@@ -51,6 +51,7 @@ export const UPDATE_TOTAL_XP = 'UPDATE_TOTAL_XP';
 export const UPDATE_ALL_USER_XP = 'UPDATE_ALL_USER_XP';
 export const UPDATE_ASSESSMENT = 'UPDATE_ASSESSMENT';
 export const UPDATE_GRADING_OVERVIEWS = 'UPDATE_GRADING_OVERVIEWS';
+export const UPDATE_GRADING_OVERVIEWS_TEST = 'UPDATE_GRADING_OVERVIEWS_TEST';
 export const UPDATE_GRADING = 'UPDATE_GRADING';
 export const FETCH_NOTIFICATIONS = 'FETCH_NOTIFICATIONS';
 export const ACKNOWLEDGE_NOTIFICATIONS = 'ACKNOWLEDGE_NOTIFICATIONS';
@@ -98,6 +99,7 @@ export type SessionState = {
   readonly sourceChapter?: number;
   readonly sourceVariant?: Variant;
   readonly moduleHelpText?: string;
+  readonly defaultPrompt?: string;
   readonly assetsPrefix?: string;
 
   readonly assessmentConfigurations?: AssessmentConfiguration[];
@@ -110,6 +112,7 @@ export type SessionState = {
   readonly assessmentOverviews?: AssessmentOverview[];
   readonly assessments: Map<number, Assessment>;
   readonly gradingOverviews?: GradingOverview[];
+  readonly gradingOverviewsTest?: GradingOverview[];
   readonly gradings: Map<number, Grading>;
   readonly notifications: Notification[];
   readonly googleUser?: string;
@@ -160,6 +163,7 @@ export type CourseConfiguration = {
   sourceChapter: Chapter;
   sourceVariant: Variant;
   moduleHelpText: string;
+  defaultPrompt: string;
   assetsPrefix: string;
 };
 
diff --git a/src/commons/dropdown/DropdownCreateCourse.tsx b/src/commons/dropdown/DropdownCreateCourse.tsx
index 39b4a34fde..9c39663f62 100644
--- a/src/commons/dropdown/DropdownCreateCourse.tsx
+++ b/src/commons/dropdown/DropdownCreateCourse.tsx
@@ -40,7 +40,8 @@ const DropdownCreateCourse: React.FC<DialogProps> = props => {
     enableSourcecast: true,
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
-    moduleHelpText: ''
+    moduleHelpText: '',
+    defaultPrompt: ''
   });
 
   const [courseHelpTextSelectedTab, setCourseHelpTextSelectedTab] =
@@ -173,6 +174,43 @@ const DropdownCreateCourse: React.FC<DialogProps> = props => {
           )}
         </FormGroup>
 
+        <FormGroup
+          helperText="defaultPrompt"
+          labelFor="defaultPrompt"
+        >
+          <Text tagName="span">Default Prompt&nbsp;</Text>
+          <Text tagName="span" className="optional-text">
+            (optional)
+          </Text>
+          <Tabs
+            selectedTabId={courseHelpTextSelectedTab}
+            onChange={onChangeTabs}
+            className="module-help-text-tabs"
+          >
+            <Tab id={CourseHelpTextEditorTab.WRITE} title="Write" />
+            <Tab id={CourseHelpTextEditorTab.PREVIEW} title="Preview" />
+          </Tabs>
+          {courseHelpTextSelectedTab === CourseHelpTextEditorTab.WRITE && (
+            <TextArea
+              id="defaultPrompt"
+              className="input-textarea"
+              fill={true}
+              value={courseConfig.defaultPrompt}
+              onChange={e =>
+                setCourseConfig({
+                  ...courseConfig,
+                  defaultPrompt: e.target.value
+                })
+              }
+            />
+          )}
+          {courseHelpTextSelectedTab === CourseHelpTextEditorTab.PREVIEW && (
+            <div className="input-markdown">
+              <Markdown content={courseConfig.defaultPrompt || ''} openLinksInNewWindow />
+            </div>
+          )}
+        </FormGroup>
+
         <div className="boolean-container">
           <div>
             <Switch
diff --git a/src/commons/dropdown/DropdownPrompt.tsx b/src/commons/dropdown/DropdownPrompt.tsx
new file mode 100644
index 0000000000..29b31a2459
--- /dev/null
+++ b/src/commons/dropdown/DropdownPrompt.tsx
@@ -0,0 +1,46 @@
+import { Classes, Dialog } from '@blueprintjs/core';
+import { IconNames } from '@blueprintjs/icons';
+import * as React from 'react';
+
+import Markdown from '../Markdown';
+import { Links } from '../utils/Constants';
+import { useTypedSelector } from '../utils/Hooks';
+
+type DialogProps = {
+  isOpen: boolean;
+  onClose: () => void;
+};
+
+const DropdownPrompt: React.SFC<DialogProps> = props => {
+  const defaultPrompt = useTypedSelector(store => store.session.defaultPrompt);
+
+  return (
+    <Dialog
+      className="help"
+      icon={IconNames.ERROR}
+      isCloseButtonShown={true}
+      isOpen={props.isOpen}
+      onClose={props.onClose}
+      title="Help"
+    >
+      <div className={Classes.DIALOG_BODY}>
+        {defaultPrompt ? (
+          <Markdown content={defaultPrompt} openLinksInNewWindow />
+        ) : (
+          <>
+            <p>
+              We recommend recent updates of the browsers <b>Google Chrome</b>,{' '}
+              <b>Microsoft Edge</b>, or <b>Mozilla Firefox</b> to visit the Source Academy.
+            </p>
+            <p>
+              If you encounter issues with the Source Academy using these browsers, please use the
+              issue system of the{' '}
+              <a href={Links.githubIssues}>Source Academy frontend repository on GitHub</a>.
+            </p>
+          </>
+        )}
+      </div>
+    </Dialog>
+  );
+};
+export default DropdownPrompt;
diff --git a/src/commons/mocks/UserMocks.ts b/src/commons/mocks/UserMocks.ts
index 35b1737da0..6565d18d6a 100644
--- a/src/commons/mocks/UserMocks.ts
+++ b/src/commons/mocks/UserMocks.ts
@@ -133,6 +133,7 @@ export const mockCourseConfigurations: CourseConfiguration[] = [
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: '',
+    defaultPrompt:'',
     assetsPrefix: ''
   },
   {
@@ -145,6 +146,7 @@ export const mockCourseConfigurations: CourseConfiguration[] = [
     sourceChapter: Chapter.SOURCE_2,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help Text!',
+    defaultPrompt:'Default Prompt',
     assetsPrefix: ''
   }
 ];
diff --git a/src/commons/sagas/RequestsSaga.ts b/src/commons/sagas/RequestsSaga.ts
index 082ad3c324..360d97223c 100644
--- a/src/commons/sagas/RequestsSaga.ts
+++ b/src/commons/sagas/RequestsSaga.ts
@@ -683,6 +683,7 @@ export const getGradingOverviews = async (
         assessmentType: overview.assessment.type,
         studentId: overview.student.id,
         studentName: overview.student.name,
+        questions: overview.questions,
         submissionId: overview.id,
         submissionStatus: overview.status,
         groupName: overview.student.groupName,
diff --git a/src/commons/sagas/__tests__/BackendSaga.ts b/src/commons/sagas/__tests__/BackendSaga.ts
index b09e5f7173..1bef69e64a 100644
--- a/src/commons/sagas/__tests__/BackendSaga.ts
+++ b/src/commons/sagas/__tests__/BackendSaga.ts
@@ -173,6 +173,7 @@ const mockCourseConfiguration1: CourseConfiguration = {
   sourceChapter: Chapter.SOURCE_1,
   sourceVariant: Variant.DEFAULT,
   moduleHelpText: 'Help text',
+  defaultPrompt: 'default prompt',
   assetsPrefix: ''
 };
 
@@ -203,6 +204,7 @@ const mockCourseConfiguration2: CourseConfiguration = {
   sourceChapter: Chapter.SOURCE_4,
   sourceVariant: Variant.DEFAULT,
   moduleHelpText: 'Help text',
+  defaultPrompt: 'default prompt',
   assetsPrefix: ''
 };
 
@@ -886,6 +888,7 @@ describe('Test UPDATE_COURSE_CONFIG action', () => {
     sourceChapter: Chapter.SOURCE_4,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help',
+    defaultPrompt: 'default prompt',
     assetsPrefix: ''
   };
 
@@ -982,7 +985,8 @@ describe('Test CREATE_COURSE action', () => {
     enableSourcecast: true,
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
-    moduleHelpText: 'Help Text'
+    moduleHelpText: 'Help Text',
+    defaultPrompt: 'default prompt'
   };
   const user = mockUser;
   const courseConfiguration = mockCourseConfiguration1;
diff --git a/src/features/academy/__tests__/AcademyActions.ts b/src/features/academy/__tests__/AcademyActions.ts
index 6e0b1f059e..42ad1a84d9 100644
--- a/src/features/academy/__tests__/AcademyActions.ts
+++ b/src/features/academy/__tests__/AcademyActions.ts
@@ -33,7 +33,8 @@ test('createCourse generates correct action object', () => {
     enableSourcecast: true,
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
-    moduleHelpText: 'Help Text'
+    moduleHelpText: 'Help Text',
+    defaultPrompt: 'default prompt'
   };
 
   const action = createCourse(courseConfig);
diff --git a/src/features/grading/GradingTypes.ts b/src/features/grading/GradingTypes.ts
index 7154e58b58..3d3220a825 100644
--- a/src/features/grading/GradingTypes.ts
+++ b/src/features/grading/GradingTypes.ts
@@ -25,6 +25,7 @@ export type GradingOverview = {
   studentName: string;
   submissionId: number;
   submissionStatus: string;
+  questions:string;
   groupName: string;
   groupLeaderId?: number;
   gradingStatus: GradingStatus;
diff --git a/src/pages/__tests__/localStorage.test.ts b/src/pages/__tests__/localStorage.test.ts
index 49544862e3..9c8336d953 100644
--- a/src/pages/__tests__/localStorage.test.ts
+++ b/src/pages/__tests__/localStorage.test.ts
@@ -20,6 +20,7 @@ const mockShortDefaultState: SavedState = {
     enableAchievements: defaultState.session.enableAchievements,
     enableSourcecast: defaultState.session.enableSourcecast,
     moduleHelpText: defaultState.session.moduleHelpText,
+    defaultPrompt: defaultState.session.defaultPrompt,
     assetsPrefix: defaultState.session.assetsPrefix,
     assessmentConfigurations: defaultState.session.assessmentConfigurations
   },
diff --git a/src/pages/academy/adminPanel/AdminPanel.tsx b/src/pages/academy/adminPanel/AdminPanel.tsx
index d64c29262c..e87544ef4e 100644
--- a/src/pages/academy/adminPanel/AdminPanel.tsx
+++ b/src/pages/academy/adminPanel/AdminPanel.tsx
@@ -39,7 +39,8 @@ const AdminPanel: React.FC = () => {
     enableGame: true,
     enableAchievements: true,
     enableSourcecast: true,
-    moduleHelpText: ''
+    moduleHelpText: '',
+    defaultPrompt:''
   });
 
   const dispatch = useDispatch();
@@ -77,7 +78,8 @@ const AdminPanel: React.FC = () => {
       enableGame: session.enableGame,
       enableAchievements: session.enableAchievements,
       enableSourcecast: session.enableSourcecast,
-      moduleHelpText: session.moduleHelpText
+      moduleHelpText: session.moduleHelpText,
+      defaultPrompt: session.defaultPrompt
     });
 
     // IMPT: To prevent mutation of props
diff --git a/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx b/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx
index 621c5ebe83..b1ae9fd44e 100644
--- a/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx
+++ b/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx
@@ -27,11 +27,20 @@ export enum CourseHelpTextEditorTab {
   PREVIEW = 'PREVIEW'
 }
 
+export enum DefaultPromptTab {
+  WRITE = 'WRITE',
+  PREVIEW = 'PREVIEW'
+}
+
+
 const CourseConfigPanel: React.FC<CourseConfigPanelProps> = props => {
   const { isMobileBreakpoint } = useResponsive();
   const [courseHelpTextSelectedTab, setCourseHelpTextSelectedTab] =
     React.useState<CourseHelpTextEditorTab>(CourseHelpTextEditorTab.WRITE);
 
+  const [defaultPromptSelectedTab, setDefaultPromptSelectedTab] =
+    React.useState<DefaultPromptTab>(DefaultPromptTab.WRITE);  
+
   const {
     courseName,
     courseShortName,
@@ -39,7 +48,8 @@ const CourseConfigPanel: React.FC<CourseConfigPanelProps> = props => {
     enableGame,
     enableAchievements,
     enableSourcecast,
-    moduleHelpText
+    moduleHelpText,
+    defaultPrompt
   } = props.courseConfiguration;
 
   const writePanel = (
@@ -51,7 +61,22 @@ const CourseConfigPanel: React.FC<CourseConfigPanelProps> = props => {
       onChange={e =>
         props.setCourseConfiguration({
           ...props.courseConfiguration,
-          moduleHelpText: e.target.value
+          moduleHelpText: e.target.value,
+        })
+      }
+    />
+  );
+
+  const writePanel1 = (
+    <TextArea
+      id="defaultPrompt"
+      className="input-textarea"
+      fill={true}
+      value={defaultPrompt || ''}
+      onChange={e =>
+        props.setCourseConfiguration({
+          ...props.courseConfiguration,
+          defaultPrompt: e.target.value
         })
       }
     />
@@ -63,6 +88,12 @@ const CourseConfigPanel: React.FC<CourseConfigPanelProps> = props => {
     </div>
   );
 
+  const previewPanel1 = (
+    <div className="input-markdown">
+      <Markdown content={defaultPrompt || ''} openLinksInNewWindow />
+    </div>
+  );
+
   const onChangeTabs = React.useCallback(
     (
       newTabId: CourseHelpTextEditorTab,
@@ -77,6 +108,20 @@ const CourseConfigPanel: React.FC<CourseConfigPanelProps> = props => {
     [setCourseHelpTextSelectedTab]
   );
 
+  const onChangeTab = React.useCallback(
+    (
+      newTabId: DefaultPromptTab,
+      prevTabId: DefaultPromptTab,
+      event: React.MouseEvent<HTMLElement>
+    ) => {
+      if (newTabId === prevTabId) {
+        return;
+      }
+      setDefaultPromptSelectedTab(newTabId);
+    },
+    [setDefaultPromptSelectedTab]
+  );
+
   return (
     <div className="course-configuration">
       <H2>{courseName}</H2>
@@ -134,6 +179,23 @@ const CourseConfigPanel: React.FC<CourseConfigPanelProps> = props => {
             {courseHelpTextSelectedTab === CourseHelpTextEditorTab.WRITE && writePanel}
             {courseHelpTextSelectedTab === CourseHelpTextEditorTab.PREVIEW && previewPanel}
           </FormGroup>
+          <FormGroup
+            helperText="Please enter the default prompt that will be used in this course"
+            inline={true}
+            label="Default Prompt"
+            labelFor="defaultPrompt"
+          >
+            <Tabs
+              selectedTabId={defaultPromptSelectedTab}
+              onChange={onChangeTab}
+              className="default-propmt-tabs"
+            >
+              <Tab id={DefaultPromptTab.WRITE} title="Write" />
+              <Tab id={DefaultPromptTab.PREVIEW} title="Preview" />
+            </Tabs>
+            {defaultPromptSelectedTab === DefaultPromptTab.WRITE && writePanel1}
+            {defaultPromptSelectedTab === DefaultPromptTab.PREVIEW && previewPanel1}
+          </FormGroup>
         </div>
         {!isMobileBreakpoint && <Divider />}
         <div className="booleans">
diff --git a/src/pages/academy/grading/Grading.tsx b/src/pages/academy/grading/Grading.tsx
index 617d1bc121..c89bb13a04 100644
--- a/src/pages/academy/grading/Grading.tsx
+++ b/src/pages/academy/grading/Grading.tsx
@@ -61,19 +61,43 @@ const Grading: React.FC = () => {
       return;
     }
 
+    // const content = new Blob(
+    //   [
+    //     '"Assessment Name","Question Number","Student Name","Group","Status","Grading","Question Count","Questions Graded","Initial XP","XP Adjustment","Current XP (excl. bonus)","Max XP","Bonus XP"\n',
+    //     ...gradingOverviews.map(
+    //       e =>
+    //         [
+    //           e.assessmentName,
+    //           e.studentName,
+    //           e.groupName,
+    //           e.submissionStatus,
+    //           e.gradingStatus,
+    //           e.questionCount,
+    //           e.gradedCount,
+    //           e.initialXp,
+    //           e.xpAdjustment,
+    //           e.currentXp,
+    //           e.maxXp,
+    //           e.xpBonus
+    //         ]
+    //           .map(field => `"${field}"`) // wrap each field in double quotes in case it contains a comma
+    //           .join(',') + '\n'
+    //     )
+    //   ],
+    //   { type: 'text/csv' }
+    // );
+    // const fileName = `SA submissions (${new Date().toISOString()}).csv`;
+
     const content = new Blob(
       [
-        '"Assessment Name","Student Name","Group","Status","Grading","Question Count","Questions Graded","Initial XP","XP Adjustment","Current XP (excl. bonus)","Max XP","Bonus XP"\n',
+        '"Student Name","Group","Status","Question","Initial XP","XP Adjustment","Current XP (excl. bonus)","Max XP","Bonus XP"\n',
         ...gradingOverviews.map(
           e =>
             [
-              e.assessmentName,
               e.studentName,
               e.groupName,
               e.submissionStatus,
-              e.gradingStatus,
-              e.questionCount,
-              e.gradedCount,
+              e.questions,
               e.initialXp,
               e.xpAdjustment,
               e.currentXp,
diff --git a/src/pages/academy/grading/subcomponents/GradingEditor.tsx b/src/pages/academy/grading/subcomponents/GradingEditor.tsx
index c56b3c64d1..43d7e1b8c7 100644
--- a/src/pages/academy/grading/subcomponents/GradingEditor.tsx
+++ b/src/pages/academy/grading/subcomponents/GradingEditor.tsx
@@ -47,6 +47,7 @@ type OwnProps = {
   xpAdjustment: number;
   maxXp: number;
   studentName: string;
+  questions: string;
   comments: string;
   graderName?: string;
   gradedAt?: string;
diff --git a/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx b/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx
index e169ac078c..ebf1b346f6 100644
--- a/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx
+++ b/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx
@@ -234,18 +234,14 @@ const GradingWorkspace: React.FC<GradingWorkspaceProps> = props => {
             xpAdjustment={props.grading![questionId].grade.xpAdjustment}
             maxXp={props.grading![questionId].question.maxXp}
             studentName={props.grading![questionId].student.name}
+            questions={""}
             comments={props.grading![questionId].grade.comments ?? ''}
-            graderName={
-              props.grading![questionId].grade.grader
-                ? props.grading![questionId].grade.grader!.name
-                : undefined
-            }
-            gradedAt={
-              props.grading![questionId].grade.grader
-                ? props.grading![questionId].grade.gradedAt!
-                : undefined
-            }
-          />
+            graderName={props.grading![questionId].grade.grader
+              ? props.grading![questionId].grade.grader!.name
+              : undefined}
+            gradedAt={props.grading![questionId].grade.grader
+              ? props.grading![questionId].grade.gradedAt!
+              : undefined}          />
         ),
         id: SideContentType.grading
       },
diff --git a/src/pages/localStorage.ts b/src/pages/localStorage.ts
index 6f1e01cfcb..e8c12d1608 100644
--- a/src/pages/localStorage.ts
+++ b/src/pages/localStorage.ts
@@ -66,6 +66,7 @@ export const saveState = (state: OverallState) => {
         enableAchievements: state.session.enableAchievements,
         enableSourcecast: state.session.enableSourcecast,
         moduleHelpText: state.session.moduleHelpText,
+        defaultPrompt: state.session.defaultPrompt,
         assetsPrefix: state.session.assetsPrefix,
         assessmentConfigurations: state.session.assessmentConfigurations,
         githubAccessToken: state.session.githubAccessToken

From 9589c55547fe99991f8e16fcccabf2b2beb660ed Mon Sep 17 00:00:00 2001
From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com>
Date: Tue, 18 Jul 2023 13:28:38 +0800
Subject: [PATCH 02/14] Use optional chaining and reformat files

Improves readability.
---
 .../grading/subcomponents/GradingWorkspace.tsx      | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx b/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx
index 4db7d438e7..944a470fb3 100644
--- a/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx
+++ b/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx
@@ -285,14 +285,13 @@ const GradingWorkspace: React.FC<GradingWorkspaceProps> = props => {
             xpAdjustment={grading![questionId].grade.xpAdjustment}
             maxXp={grading![questionId].question.maxXp}
             studentName={grading![questionId].student.name}
-            questions={""}
+            questions={''}
             comments={grading![questionId].grade.comments ?? ''}
-            graderName={grading![questionId].grade.grader
-              ? grading![questionId].grade.grader!.name
-              : undefined}
-            gradedAt={grading![questionId].grade.grader
-              ?grading![questionId].grade.gradedAt!
-              : undefined}          />
+            graderName={grading![questionId].grade.grader?.name}
+            gradedAt={
+              grading![questionId].grade.grader ? grading![questionId].grade.gradedAt! : undefined
+            }
+          />
         ),
         id: SideContentType.grading
       },

From b2cb3529419d3a998a2128549252f283d99e9d13 Mon Sep 17 00:00:00 2001
From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com>
Date: Tue, 18 Jul 2023 13:32:33 +0800
Subject: [PATCH 03/14] Run yarn format

Fixes some lint issues.
---
 src/commons/application/actions/SessionActions.ts         | 1 -
 src/commons/application/reducers/SessionsReducer.ts       | 2 +-
 src/commons/dropdown/DropdownCreateCourse.tsx             | 5 +----
 src/commons/mocks/UserMocks.ts                            | 4 ++--
 src/features/grading/GradingTypes.ts                      | 2 +-
 src/pages/academy/adminPanel/AdminPanel.tsx               | 2 +-
 .../adminPanel/subcomponents/CourseConfigPanel.tsx        | 8 ++++----
 7 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/commons/application/actions/SessionActions.ts b/src/commons/application/actions/SessionActions.ts
index 462b889420..3f86c93269 100644
--- a/src/commons/application/actions/SessionActions.ts
+++ b/src/commons/application/actions/SessionActions.ts
@@ -215,7 +215,6 @@ export const updateAssessment = (assessment: Assessment) => action(UPDATE_ASSESS
 export const updateGradingOverviews = (overviews: GradingOverview[]) =>
   action(UPDATE_GRADING_OVERVIEWS, overviews);
 
-
 /**
  * An extra id parameter is included here because of
  * no id for Grading.
diff --git a/src/commons/application/reducers/SessionsReducer.ts b/src/commons/application/reducers/SessionsReducer.ts
index bfdffb5deb..c050d1d6eb 100644
--- a/src/commons/application/reducers/SessionsReducer.ts
+++ b/src/commons/application/reducers/SessionsReducer.ts
@@ -127,7 +127,7 @@ export const SessionsReducer: Reducer<SessionState> = (
         gradingOverviews: action.payload
       };
 
-      case UPDATE_GRADING_OVERVIEWS:
+    case UPDATE_GRADING_OVERVIEWS:
       return {
         ...state,
         gradingOverviews: action.payload
diff --git a/src/commons/dropdown/DropdownCreateCourse.tsx b/src/commons/dropdown/DropdownCreateCourse.tsx
index d7103f59f7..44d5fac8d6 100644
--- a/src/commons/dropdown/DropdownCreateCourse.tsx
+++ b/src/commons/dropdown/DropdownCreateCourse.tsx
@@ -174,10 +174,7 @@ const DropdownCreateCourse: React.FC<DialogProps> = props => {
           )}
         </FormGroup>
 
-        <FormGroup
-          helperText="defaultPrompt"
-          labelFor="defaultPrompt"
-        >
+        <FormGroup helperText="defaultPrompt" labelFor="defaultPrompt">
           <Text tagName="span">Default Prompt&nbsp;</Text>
           <Text tagName="span" className="optional-text">
             (optional)
diff --git a/src/commons/mocks/UserMocks.ts b/src/commons/mocks/UserMocks.ts
index 6565d18d6a..73412ce215 100644
--- a/src/commons/mocks/UserMocks.ts
+++ b/src/commons/mocks/UserMocks.ts
@@ -133,7 +133,7 @@ export const mockCourseConfigurations: CourseConfiguration[] = [
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: '',
-    defaultPrompt:'',
+    defaultPrompt: '',
     assetsPrefix: ''
   },
   {
@@ -146,7 +146,7 @@ export const mockCourseConfigurations: CourseConfiguration[] = [
     sourceChapter: Chapter.SOURCE_2,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help Text!',
-    defaultPrompt:'Default Prompt',
+    defaultPrompt: 'Default Prompt',
     assetsPrefix: ''
   }
 ];
diff --git a/src/features/grading/GradingTypes.ts b/src/features/grading/GradingTypes.ts
index 3d3220a825..009bff21b5 100644
--- a/src/features/grading/GradingTypes.ts
+++ b/src/features/grading/GradingTypes.ts
@@ -25,7 +25,7 @@ export type GradingOverview = {
   studentName: string;
   submissionId: number;
   submissionStatus: string;
-  questions:string;
+  questions: string;
   groupName: string;
   groupLeaderId?: number;
   gradingStatus: GradingStatus;
diff --git a/src/pages/academy/adminPanel/AdminPanel.tsx b/src/pages/academy/adminPanel/AdminPanel.tsx
index 776913dafd..a9628b5e46 100644
--- a/src/pages/academy/adminPanel/AdminPanel.tsx
+++ b/src/pages/academy/adminPanel/AdminPanel.tsx
@@ -46,7 +46,7 @@ const AdminPanel: React.FC = () => {
     enableAchievements: true,
     enableSourcecast: true,
     moduleHelpText: '',
-    defaultPrompt:''
+    defaultPrompt: ''
   });
 
   const dispatch = useDispatch();
diff --git a/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx b/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx
index b1ae9fd44e..3cd3852832 100644
--- a/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx
+++ b/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx
@@ -32,14 +32,14 @@ export enum DefaultPromptTab {
   PREVIEW = 'PREVIEW'
 }
 
-
 const CourseConfigPanel: React.FC<CourseConfigPanelProps> = props => {
   const { isMobileBreakpoint } = useResponsive();
   const [courseHelpTextSelectedTab, setCourseHelpTextSelectedTab] =
     React.useState<CourseHelpTextEditorTab>(CourseHelpTextEditorTab.WRITE);
 
-  const [defaultPromptSelectedTab, setDefaultPromptSelectedTab] =
-    React.useState<DefaultPromptTab>(DefaultPromptTab.WRITE);  
+  const [defaultPromptSelectedTab, setDefaultPromptSelectedTab] = React.useState<DefaultPromptTab>(
+    DefaultPromptTab.WRITE
+  );
 
   const {
     courseName,
@@ -61,7 +61,7 @@ const CourseConfigPanel: React.FC<CourseConfigPanelProps> = props => {
       onChange={e =>
         props.setCourseConfiguration({
           ...props.courseConfiguration,
-          moduleHelpText: e.target.value,
+          moduleHelpText: e.target.value
         })
       }
     />

From a030c9942db010bef49f0b330b5458523d8cb93e Mon Sep 17 00:00:00 2001
From: clementlemon02 <clementling02@gmail.com>
Date: Tue, 8 Aug 2023 07:47:20 +0200
Subject: [PATCH 04/14] fix lint issues

---
 src/commons/application/actions/__tests__/SessionActions.ts | 1 +
 src/commons/application/reducers/SessionsReducer.ts         | 5 -----
 src/commons/mocks/GradingMocks.ts                           | 3 +++
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/commons/application/actions/__tests__/SessionActions.ts b/src/commons/application/actions/__tests__/SessionActions.ts
index 4f72a2f583..4f03f8b0aa 100644
--- a/src/commons/application/actions/__tests__/SessionActions.ts
+++ b/src/commons/application/actions/__tests__/SessionActions.ts
@@ -511,6 +511,7 @@ test('updateGradingOverviews generates correct action object', () => {
     {
       assessmentId: 1,
       assessmentName: 'test assessment',
+      questions: "",
       assessmentType: 'Contests',
       initialXp: 0,
       xpBonus: 100,
diff --git a/src/commons/application/reducers/SessionsReducer.ts b/src/commons/application/reducers/SessionsReducer.ts
index c050d1d6eb..4d0c45d497 100644
--- a/src/commons/application/reducers/SessionsReducer.ts
+++ b/src/commons/application/reducers/SessionsReducer.ts
@@ -127,11 +127,6 @@ export const SessionsReducer: Reducer<SessionState> = (
         gradingOverviews: action.payload
       };
 
-    case UPDATE_GRADING_OVERVIEWS:
-      return {
-        ...state,
-        gradingOverviews: action.payload
-      };
     case UPDATE_NOTIFICATIONS:
       return {
         ...state,
diff --git a/src/commons/mocks/GradingMocks.ts b/src/commons/mocks/GradingMocks.ts
index 9f1849b858..8f383ea738 100644
--- a/src/commons/mocks/GradingMocks.ts
+++ b/src/commons/mocks/GradingMocks.ts
@@ -11,6 +11,7 @@ export const mockGradingOverviews: GradingOverview[] = [
     assessmentType: 'Missions',
     assessmentId: 0,
     assessmentName: 'Mission 0 ',
+    questions: "",
     currentXp: 69,
     xpBonus: 10,
     initialXp: 69,
@@ -29,6 +30,7 @@ export const mockGradingOverviews: GradingOverview[] = [
     assessmentType: 'Missions',
     assessmentId: 1,
     assessmentName: 'Mission 1',
+    questions: "",
     currentXp: -2,
     xpBonus: 12,
     initialXp: 0,
@@ -47,6 +49,7 @@ export const mockGradingOverviews: GradingOverview[] = [
     assessmentType: 'Missions',
     assessmentId: 0,
     assessmentName: 'Mission 0',
+    questions: "",
     currentXp: 1000,
     xpBonus: 12,
     initialXp: 996,

From bbfa704d522cd8e83a98f533922efc780ffb9980 Mon Sep 17 00:00:00 2001
From: clementlemon02 <clementling02@gmail.com>
Date: Tue, 8 Aug 2023 22:14:35 +0200
Subject: [PATCH 05/14] fix lint issues

---
 src/commons/application/actions/__tests__/SessionActions.ts | 2 +-
 src/commons/mocks/GradingMocks.ts                           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/commons/application/actions/__tests__/SessionActions.ts b/src/commons/application/actions/__tests__/SessionActions.ts
index 4f03f8b0aa..7f278be841 100644
--- a/src/commons/application/actions/__tests__/SessionActions.ts
+++ b/src/commons/application/actions/__tests__/SessionActions.ts
@@ -511,7 +511,7 @@ test('updateGradingOverviews generates correct action object', () => {
     {
       assessmentId: 1,
       assessmentName: 'test assessment',
-      questions: "",
+      questions: '',
       assessmentType: 'Contests',
       initialXp: 0,
       xpBonus: 100,
diff --git a/src/commons/mocks/GradingMocks.ts b/src/commons/mocks/GradingMocks.ts
index 8f383ea738..3bda03f6a7 100644
--- a/src/commons/mocks/GradingMocks.ts
+++ b/src/commons/mocks/GradingMocks.ts
@@ -11,7 +11,7 @@ export const mockGradingOverviews: GradingOverview[] = [
     assessmentType: 'Missions',
     assessmentId: 0,
     assessmentName: 'Mission 0 ',
-    questions: "",
+    questions: '',
     currentXp: 69,
     xpBonus: 10,
     initialXp: 69,
@@ -30,7 +30,7 @@ export const mockGradingOverviews: GradingOverview[] = [
     assessmentType: 'Missions',
     assessmentId: 1,
     assessmentName: 'Mission 1',
-    questions: "",
+    questions: '',
     currentXp: -2,
     xpBonus: 12,
     initialXp: 0,
@@ -49,7 +49,7 @@ export const mockGradingOverviews: GradingOverview[] = [
     assessmentType: 'Missions',
     assessmentId: 0,
     assessmentName: 'Mission 0',
-    questions: "",
+    questions: '',
     currentXp: 1000,
     xpBonus: 12,
     initialXp: 996,

From 137eee2df126da81b43ebad85d78d5269d8cc2eb Mon Sep 17 00:00:00 2001
From: clementlemon02 <clementling02@gmail.com>
Date: Tue, 8 Aug 2023 22:15:49 +0200
Subject: [PATCH 06/14] fix lint issues

---
 src/commons/application/reducers/__tests__/SessionReducer.ts | 2 ++
 tsconfig.json                                                | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/commons/application/reducers/__tests__/SessionReducer.ts b/src/commons/application/reducers/__tests__/SessionReducer.ts
index 39dd2eec63..8a99c92443 100644
--- a/src/commons/application/reducers/__tests__/SessionReducer.ts
+++ b/src/commons/application/reducers/__tests__/SessionReducer.ts
@@ -475,6 +475,7 @@ const gradingOverviewTest1: GradingOverview[] = [
   {
     assessmentId: 1,
     assessmentName: 'test assessment',
+    questions: "",
     assessmentType: 'Contests',
     initialXp: 0,
     xpBonus: 100,
@@ -496,6 +497,7 @@ const gradingOverviewTest2: GradingOverview[] = [
   {
     assessmentId: 2,
     assessmentName: 'another assessment',
+    questions: "",
     assessmentType: 'Quests',
     initialXp: 20,
     xpBonus: 250,
diff --git a/tsconfig.json b/tsconfig.json
index cc12a427ca..618d3d85a4 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -27,6 +27,6 @@
     "noEmit": true,
     "noFallthroughCasesInSwitch": true
   },
-  "include": ["src"],
+  "include": ["src", "rating.ts"],
   "exclude": ["src/setupTests.ts"]
 }

From 21e606a909d08317dd5b2b98bad95b07cd716fdd Mon Sep 17 00:00:00 2001
From: clementlemon02 <clementling02@gmail.com>
Date: Tue, 8 Aug 2023 22:53:20 +0200
Subject: [PATCH 07/14] fix lint issues

---
 src/commons/dropdown/DropdownPrompt.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commons/dropdown/DropdownPrompt.tsx b/src/commons/dropdown/DropdownPrompt.tsx
index 29b31a2459..411b3e8ee8 100644
--- a/src/commons/dropdown/DropdownPrompt.tsx
+++ b/src/commons/dropdown/DropdownPrompt.tsx
@@ -11,7 +11,7 @@ type DialogProps = {
   onClose: () => void;
 };
 
-const DropdownPrompt: React.SFC<DialogProps> = props => {
+const DropdownPrompt: React.FC<DialogProps> = props => {
   const defaultPrompt = useTypedSelector(store => store.session.defaultPrompt);
 
   return (

From 9a5fbfaccc4be88f01f7ed700f57ba3a7c431548 Mon Sep 17 00:00:00 2001
From: clementlemon02 <clementling02@gmail.com>
Date: Tue, 8 Aug 2023 23:01:54 +0200
Subject: [PATCH 08/14] fix lint issues

---
 src/commons/application/reducers/__tests__/SessionReducer.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/commons/application/reducers/__tests__/SessionReducer.ts b/src/commons/application/reducers/__tests__/SessionReducer.ts
index 8a99c92443..d57e7ae916 100644
--- a/src/commons/application/reducers/__tests__/SessionReducer.ts
+++ b/src/commons/application/reducers/__tests__/SessionReducer.ts
@@ -475,7 +475,7 @@ const gradingOverviewTest1: GradingOverview[] = [
   {
     assessmentId: 1,
     assessmentName: 'test assessment',
-    questions: "",
+    questions: '',
     assessmentType: 'Contests',
     initialXp: 0,
     xpBonus: 100,
@@ -497,7 +497,7 @@ const gradingOverviewTest2: GradingOverview[] = [
   {
     assessmentId: 2,
     assessmentName: 'another assessment',
-    questions: "",
+    questions: '',
     assessmentType: 'Quests',
     initialXp: 20,
     xpBonus: 250,

From bd4b401767489129db32bfaa9ded2ca2b6a04f50 Mon Sep 17 00:00:00 2001
From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com>
Date: Thu, 10 Aug 2023 12:32:33 +0800
Subject: [PATCH 09/14] Remove unnecessary empty line

---
 src/commons/application/reducers/SessionsReducer.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/commons/application/reducers/SessionsReducer.ts b/src/commons/application/reducers/SessionsReducer.ts
index 4d0c45d497..32491eadd6 100644
--- a/src/commons/application/reducers/SessionsReducer.ts
+++ b/src/commons/application/reducers/SessionsReducer.ts
@@ -126,7 +126,6 @@ export const SessionsReducer: Reducer<SessionState> = (
         ...state,
         gradingOverviews: action.payload
       };
-
     case UPDATE_NOTIFICATIONS:
       return {
         ...state,

From 5c75726b663f84ff38ffbf36adef545472ee4517 Mon Sep 17 00:00:00 2001
From: clementlemon02 <clementling02@gmail.com>
Date: Sat, 12 Aug 2023 22:40:26 +0200
Subject: [PATCH 10/14] resolving comments

---
 .../actions/__tests__/SessionActions.ts       |   4 +-
 .../reducers/__tests__/SessionReducer.ts      |   2 +-
 src/commons/application/types/SessionTypes.ts |   5 +-
 src/commons/dropdown/DropdownCreateCourse.tsx |  14 +-
 src/commons/dropdown/DropdownPrompt.tsx       |   6 +-
 src/commons/mocks/UserMocks.ts                |   4 +-
 src/commons/sagas/__tests__/BackendSaga.ts    |   8 +-
 .../academy/__tests__/AcademyActions.ts       |   2 +-
 src/pages/__tests__/localStorage.test.ts      |   2 +-
 src/pages/academy/adminPanel/AdminPanel.tsx   |   4 +-
 .../subcomponents/CourseConfigPanel.tsx       | 259 ++++++++++--------
 src/pages/academy/grading/Grading.tsx         |  27 --
 src/pages/localStorage.ts                     |   2 +-
 tsconfig.json                                 |   2 +-
 14 files changed, 171 insertions(+), 170 deletions(-)

diff --git a/src/commons/application/actions/__tests__/SessionActions.ts b/src/commons/application/actions/__tests__/SessionActions.ts
index 7f278be841..90ad14f661 100644
--- a/src/commons/application/actions/__tests__/SessionActions.ts
+++ b/src/commons/application/actions/__tests__/SessionActions.ts
@@ -231,7 +231,7 @@ test('setCourseConfiguration generates correct action object', () => {
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help text',
-    defaultPrompt: 'default Prompt',
+    defaultLlmPrompt: 'defaul Llm Prompt',
     assessmentTypes: ['Missions', 'Quests', 'Paths', 'Contests', 'Others']
   };
   const action = setCourseConfiguration(courseConfig);
@@ -614,7 +614,7 @@ test('updateCourseConfig generates correct action object', () => {
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help text',
-    defaultPrompt: 'default Prompt',
+    defaultLlmPrompt: 'default LLM Prompt',
     assessmentTypes: ['Missions', 'Quests', 'Paths', 'Contests', 'Others']
   };
   const action = updateCourseConfig(courseConfig);
diff --git a/src/commons/application/reducers/__tests__/SessionReducer.ts b/src/commons/application/reducers/__tests__/SessionReducer.ts
index d57e7ae916..2f137c9723 100644
--- a/src/commons/application/reducers/__tests__/SessionReducer.ts
+++ b/src/commons/application/reducers/__tests__/SessionReducer.ts
@@ -99,7 +99,7 @@ test('SET_COURSE_CONFIGURATION works correctly', () => {
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help text',
-    defaultPrompt: 'default Prompt',
+    defaultLlmPrompt: 'default LLM Prompt',
     assessmentTypes: ['Missions', 'Quests', 'Paths', 'Contests', 'Others']
   };
   const action = {
diff --git a/src/commons/application/types/SessionTypes.ts b/src/commons/application/types/SessionTypes.ts
index c1426447de..94668bda7f 100644
--- a/src/commons/application/types/SessionTypes.ts
+++ b/src/commons/application/types/SessionTypes.ts
@@ -107,7 +107,7 @@ export type SessionState = {
   readonly sourceChapter?: number;
   readonly sourceVariant?: Variant;
   readonly moduleHelpText?: string;
-  readonly defaultPrompt?: string;
+  readonly defaultLlmPrompt?: string;
   readonly assetsPrefix?: string;
 
   readonly assessmentConfigurations?: AssessmentConfiguration[];
@@ -123,7 +123,6 @@ export type SessionState = {
   readonly assessmentOverviews?: AssessmentOverview[];
   readonly assessments: Map<number, Assessment>;
   readonly gradingOverviews?: GradingOverview[];
-  readonly gradingOverviewsTest?: GradingOverview[];
   readonly gradings: Map<number, Grading>;
   readonly notifications: Notification[];
   readonly googleUser?: string;
@@ -174,7 +173,7 @@ export type CourseConfiguration = {
   sourceChapter: Chapter;
   sourceVariant: Variant;
   moduleHelpText: string;
-  defaultPrompt: string;
+  defaultLlmPrompt: string;
   assetsPrefix: string;
 };
 
diff --git a/src/commons/dropdown/DropdownCreateCourse.tsx b/src/commons/dropdown/DropdownCreateCourse.tsx
index 44d5fac8d6..cfed4673c7 100644
--- a/src/commons/dropdown/DropdownCreateCourse.tsx
+++ b/src/commons/dropdown/DropdownCreateCourse.tsx
@@ -41,7 +41,7 @@ const DropdownCreateCourse: React.FC<DialogProps> = props => {
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: '',
-    defaultPrompt: ''
+    defaultLlmPrompt: ''
   });
 
   const [courseHelpTextSelectedTab, setCourseHelpTextSelectedTab] =
@@ -174,8 +174,8 @@ const DropdownCreateCourse: React.FC<DialogProps> = props => {
           )}
         </FormGroup>
 
-        <FormGroup helperText="defaultPrompt" labelFor="defaultPrompt">
-          <Text tagName="span">Default Prompt&nbsp;</Text>
+        <FormGroup helperText="defaultLlmPrompt" labelFor="defaultLlmPrompt">
+          <Text tagName="span">Default LLM Prompt&nbsp;</Text>
           <Text tagName="span" className="optional-text">
             (optional)
           </Text>
@@ -189,21 +189,21 @@ const DropdownCreateCourse: React.FC<DialogProps> = props => {
           </Tabs>
           {courseHelpTextSelectedTab === CourseHelpTextEditorTab.WRITE && (
             <TextArea
-              id="defaultPrompt"
+              id="defaultLlmPrompt"
               className="input-textarea"
               fill={true}
-              value={courseConfig.defaultPrompt}
+              value={courseConfig.defaultLlmPrompt}
               onChange={e =>
                 setCourseConfig({
                   ...courseConfig,
-                  defaultPrompt: e.target.value
+                  defaultLlmPrompt: e.target.value
                 })
               }
             />
           )}
           {courseHelpTextSelectedTab === CourseHelpTextEditorTab.PREVIEW && (
             <div className="input-markdown">
-              <Markdown content={courseConfig.defaultPrompt || ''} openLinksInNewWindow />
+              <Markdown content={courseConfig.defaultLlmPrompt || ''} openLinksInNewWindow />
             </div>
           )}
         </FormGroup>
diff --git a/src/commons/dropdown/DropdownPrompt.tsx b/src/commons/dropdown/DropdownPrompt.tsx
index 411b3e8ee8..1e2bacc39f 100644
--- a/src/commons/dropdown/DropdownPrompt.tsx
+++ b/src/commons/dropdown/DropdownPrompt.tsx
@@ -12,7 +12,7 @@ type DialogProps = {
 };
 
 const DropdownPrompt: React.FC<DialogProps> = props => {
-  const defaultPrompt = useTypedSelector(store => store.session.defaultPrompt);
+  const defaultLlmPrompt = useTypedSelector(store => store.session.defaultLlmPrompt);
 
   return (
     <Dialog
@@ -24,8 +24,8 @@ const DropdownPrompt: React.FC<DialogProps> = props => {
       title="Help"
     >
       <div className={Classes.DIALOG_BODY}>
-        {defaultPrompt ? (
-          <Markdown content={defaultPrompt} openLinksInNewWindow />
+        {defaultLlmPrompt ? (
+          <Markdown content={defaultLlmPrompt} openLinksInNewWindow />
         ) : (
           <>
             <p>
diff --git a/src/commons/mocks/UserMocks.ts b/src/commons/mocks/UserMocks.ts
index 73412ce215..eb9e88dca1 100644
--- a/src/commons/mocks/UserMocks.ts
+++ b/src/commons/mocks/UserMocks.ts
@@ -133,7 +133,7 @@ export const mockCourseConfigurations: CourseConfiguration[] = [
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: '',
-    defaultPrompt: '',
+    defaultLlmPrompt: '',
     assetsPrefix: ''
   },
   {
@@ -146,7 +146,7 @@ export const mockCourseConfigurations: CourseConfiguration[] = [
     sourceChapter: Chapter.SOURCE_2,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help Text!',
-    defaultPrompt: 'Default Prompt',
+    defaultLlmPrompt: 'Default LLM Prompt',
     assetsPrefix: ''
   }
 ];
diff --git a/src/commons/sagas/__tests__/BackendSaga.ts b/src/commons/sagas/__tests__/BackendSaga.ts
index 9129a1ae29..a9306b7bdd 100644
--- a/src/commons/sagas/__tests__/BackendSaga.ts
+++ b/src/commons/sagas/__tests__/BackendSaga.ts
@@ -176,7 +176,7 @@ const mockCourseConfiguration1: CourseConfiguration = {
   sourceChapter: Chapter.SOURCE_1,
   sourceVariant: Variant.DEFAULT,
   moduleHelpText: 'Help text',
-  defaultPrompt: 'default prompt',
+  defaultLlmPrompt: 'default LLM prompt',
   assetsPrefix: ''
 };
 
@@ -207,7 +207,7 @@ const mockCourseConfiguration2: CourseConfiguration = {
   sourceChapter: Chapter.SOURCE_4,
   sourceVariant: Variant.DEFAULT,
   moduleHelpText: 'Help text',
-  defaultPrompt: 'default prompt',
+  defaultLlmPrompt: 'default LLM prompt',
   assetsPrefix: ''
 };
 
@@ -891,7 +891,7 @@ describe('Test UPDATE_COURSE_CONFIG action', () => {
     sourceChapter: Chapter.SOURCE_4,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help',
-    defaultPrompt: 'default prompt',
+    defaultLlmPrompt: 'default LLM prompt',
     assetsPrefix: ''
   };
 
@@ -989,7 +989,7 @@ describe('Test CREATE_COURSE action', () => {
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help Text',
-    defaultPrompt: 'default prompt'
+    defaultLlmPrompt: 'default Llm prompt'
   };
   const user = mockUser;
   const courseConfiguration = mockCourseConfiguration1;
diff --git a/src/features/academy/__tests__/AcademyActions.ts b/src/features/academy/__tests__/AcademyActions.ts
index 42ad1a84d9..4c15d804b8 100644
--- a/src/features/academy/__tests__/AcademyActions.ts
+++ b/src/features/academy/__tests__/AcademyActions.ts
@@ -34,7 +34,7 @@ test('createCourse generates correct action object', () => {
     sourceChapter: Chapter.SOURCE_1,
     sourceVariant: Variant.DEFAULT,
     moduleHelpText: 'Help Text',
-    defaultPrompt: 'default prompt'
+    defaultLlmPrompt: 'default LLM prompt'
   };
 
   const action = createCourse(courseConfig);
diff --git a/src/pages/__tests__/localStorage.test.ts b/src/pages/__tests__/localStorage.test.ts
index 9c8336d953..f4948944a5 100644
--- a/src/pages/__tests__/localStorage.test.ts
+++ b/src/pages/__tests__/localStorage.test.ts
@@ -20,7 +20,7 @@ const mockShortDefaultState: SavedState = {
     enableAchievements: defaultState.session.enableAchievements,
     enableSourcecast: defaultState.session.enableSourcecast,
     moduleHelpText: defaultState.session.moduleHelpText,
-    defaultPrompt: defaultState.session.defaultPrompt,
+    defaultLlmPrompt: defaultState.session.defaultLlmPrompt,
     assetsPrefix: defaultState.session.assetsPrefix,
     assessmentConfigurations: defaultState.session.assessmentConfigurations
   },
diff --git a/src/pages/academy/adminPanel/AdminPanel.tsx b/src/pages/academy/adminPanel/AdminPanel.tsx
index a9628b5e46..23f693ad9f 100644
--- a/src/pages/academy/adminPanel/AdminPanel.tsx
+++ b/src/pages/academy/adminPanel/AdminPanel.tsx
@@ -46,7 +46,7 @@ const AdminPanel: React.FC = () => {
     enableAchievements: true,
     enableSourcecast: true,
     moduleHelpText: '',
-    defaultPrompt: ''
+    defaultLlmPrompt: ''
   });
 
   const dispatch = useDispatch();
@@ -86,7 +86,7 @@ const AdminPanel: React.FC = () => {
       enableAchievements: session.enableAchievements,
       enableSourcecast: session.enableSourcecast,
       moduleHelpText: session.moduleHelpText,
-      defaultPrompt: session.defaultPrompt
+      defaultLlmPrompt: session.defaultLlmPrompt
     });
 
     // IMPT: To prevent mutation of props
diff --git a/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx b/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx
index 3cd3852832..ff46c78692 100644
--- a/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx
+++ b/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx
@@ -27,19 +27,57 @@ export enum CourseHelpTextEditorTab {
   PREVIEW = 'PREVIEW'
 }
 
-export enum DefaultPromptTab {
+export enum DefaultLlmPromptTab {
   WRITE = 'WRITE',
   PREVIEW = 'PREVIEW'
 }
 
+type ConfigInputProps = {
+  label: string;
+  value?: string;
+  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
+  helperText: string;
+  id: string;
+};
+
+const ConfigInput: React.FC<ConfigInputProps> = ({ label, value, onChange, helperText, id }) => (
+  <FormGroup helperText={helperText} inline={true} label={label} labelFor={id}>
+    <InputGroup id={id} value={value || ''} onChange={onChange} />
+  </FormGroup>
+);
+
+type TabPanelProps = {
+  selectedTabId: CourseHelpTextEditorTab | DefaultLlmPromptTab;
+  onChange: (newTabId: CourseHelpTextEditorTab | DefaultLlmPromptTab) => void;
+  tabs: {
+    id: CourseHelpTextEditorTab | DefaultLlmPromptTab;
+    title: string;
+    panel: React.ReactNode;
+  }[];
+};
+
+const TabPanel: React.FC<TabPanelProps> = ({ selectedTabId, onChange, tabs }) => (
+  <Tabs selectedTabId={selectedTabId} onChange={(newTabId) => onChange(newTabId as CourseHelpTextEditorTab | DefaultLlmPromptTab)} className="module-help-text-tabs">
+    {tabs.map(tab => (
+      <Tab id={tab.id.toString()} title={tab.title} key={tab.id.toString()} />
+    ))}
+    {tabs.map(tab =>
+      selectedTabId === tab.id && tab.panel
+    )}
+  </Tabs>
+);
+
 const CourseConfigPanel: React.FC<CourseConfigPanelProps> = props => {
   const { isMobileBreakpoint } = useResponsive();
   const [courseHelpTextSelectedTab, setCourseHelpTextSelectedTab] =
-    React.useState<CourseHelpTextEditorTab>(CourseHelpTextEditorTab.WRITE);
+    React.useState<CourseHelpTextEditorTab | DefaultLlmPromptTab>(
+      CourseHelpTextEditorTab.WRITE
+    );
 
-  const [defaultPromptSelectedTab, setDefaultPromptSelectedTab] = React.useState<DefaultPromptTab>(
-    DefaultPromptTab.WRITE
-  );
+  const [defaultLlmPromptSelectedTab, setDefaultLlmPromptSelectedTab] =
+    React.useState<CourseHelpTextEditorTab | DefaultLlmPromptTab>(
+      DefaultLlmPromptTab.WRITE
+    );
 
   const {
     courseName,
@@ -49,77 +87,27 @@ const CourseConfigPanel: React.FC<CourseConfigPanelProps> = props => {
     enableAchievements,
     enableSourcecast,
     moduleHelpText,
-    defaultPrompt
+    defaultLlmPrompt
   } = props.courseConfiguration;
 
-  const writePanel = (
-    <TextArea
-      id="moduleHelpText"
-      className="input-textarea"
-      fill={true}
-      value={moduleHelpText || ''}
-      onChange={e =>
-        props.setCourseConfiguration({
-          ...props.courseConfiguration,
-          moduleHelpText: e.target.value
-        })
-      }
-    />
-  );
-
-  const writePanel1 = (
-    <TextArea
-      id="defaultPrompt"
-      className="input-textarea"
-      fill={true}
-      value={defaultPrompt || ''}
-      onChange={e =>
-        props.setCourseConfiguration({
-          ...props.courseConfiguration,
-          defaultPrompt: e.target.value
-        })
-      }
-    />
-  );
-
-  const previewPanel = (
-    <div className="input-markdown">
-      <Markdown content={moduleHelpText || ''} openLinksInNewWindow />
-    </div>
-  );
-
-  const previewPanel1 = (
-    <div className="input-markdown">
-      <Markdown content={defaultPrompt || ''} openLinksInNewWindow />
-    </div>
-  );
-
   const onChangeTabs = React.useCallback(
-    (
-      newTabId: CourseHelpTextEditorTab,
-      prevTabId: CourseHelpTextEditorTab,
-      event: React.MouseEvent<HTMLElement>
-    ) => {
-      if (newTabId === prevTabId) {
+    (newTabId: CourseHelpTextEditorTab | DefaultLlmPromptTab) => {
+      if (newTabId === courseHelpTextSelectedTab) {
         return;
       }
       setCourseHelpTextSelectedTab(newTabId);
     },
-    [setCourseHelpTextSelectedTab]
+    [courseHelpTextSelectedTab]
   );
 
   const onChangeTab = React.useCallback(
-    (
-      newTabId: DefaultPromptTab,
-      prevTabId: DefaultPromptTab,
-      event: React.MouseEvent<HTMLElement>
-    ) => {
-      if (newTabId === prevTabId) {
+    (newTabId: CourseHelpTextEditorTab | DefaultLlmPromptTab) => {
+      if (newTabId === defaultLlmPromptSelectedTab) {
         return;
       }
-      setDefaultPromptSelectedTab(newTabId);
+      setDefaultLlmPromptSelectedTab(newTabId);
     },
-    [setDefaultPromptSelectedTab]
+    [defaultLlmPromptSelectedTab]
   );
 
   return (
@@ -128,74 +116,115 @@ const CourseConfigPanel: React.FC<CourseConfigPanelProps> = props => {
       <H3>{courseShortName}</H3>
       <div className="inputs">
         <div className="text">
-          <FormGroup
-            helperText="Please enter the course name that will be used for course selection."
-            inline={true}
+          <ConfigInput
             label="Course Name"
-            labelFor="courseName"
-          >
-            <InputGroup
-              id="courseName"
-              defaultValue={courseName}
-              onChange={e =>
-                props.setCourseConfiguration({
-                  ...props.courseConfiguration,
-                  courseName: e.target.value
-                })
-              }
-            />
-          </FormGroup>
-          <FormGroup
-            helperText="Please enter the course short name. This will be displayed on the top left."
-            inline={true}
+            value={courseName}
+            onChange={e =>
+              props.setCourseConfiguration({
+                ...props.courseConfiguration,
+                courseName: e.target.value
+              })
+            }
+            helperText="Please enter the course name that will be used for course selection."
+            id="courseName"
+          />
+
+          <ConfigInput
             label="Course Short Name"
-            labelFor="courseShortName"
-          >
-            <InputGroup
-              id="courseShortName"
-              defaultValue={courseShortName}
-              onChange={e =>
-                props.setCourseConfiguration({
-                  ...props.courseConfiguration,
-                  courseShortName: e.target.value
-                })
-              }
-            />
-          </FormGroup>
+            value={courseShortName}
+            onChange={e =>
+              props.setCourseConfiguration({
+                ...props.courseConfiguration,
+                courseShortName: e.target.value
+              })
+            }
+            helperText="Please enter the course short name. This will be displayed on the top left."
+            id="courseShortName"
+          />
+
           <FormGroup
             helperText="Please enter the module help text that will be used in the course help dialog."
             inline={true}
             label="Module Help Text"
             labelFor="moduleHelpText"
           >
-            <Tabs
+            <TabPanel
               selectedTabId={courseHelpTextSelectedTab}
               onChange={onChangeTabs}
-              className="module-help-text-tabs"
-            >
-              <Tab id={CourseHelpTextEditorTab.WRITE} title="Write" />
-              <Tab id={CourseHelpTextEditorTab.PREVIEW} title="Preview" />
-            </Tabs>
-            {courseHelpTextSelectedTab === CourseHelpTextEditorTab.WRITE && writePanel}
-            {courseHelpTextSelectedTab === CourseHelpTextEditorTab.PREVIEW && previewPanel}
+              tabs={[
+                {
+                  id: CourseHelpTextEditorTab.WRITE,
+                  title: "Write",
+                  panel: (
+                    <TextArea
+                      id="moduleHelpText"
+                      className="input-textarea"
+                      fill={true}
+                      value={moduleHelpText || ''}
+                      onChange={e =>
+                        props.setCourseConfiguration({
+                          ...props.courseConfiguration,
+                          moduleHelpText: e.target.value
+                        })
+                      }
+                    />
+                  )
+                },
+                {
+                  id: CourseHelpTextEditorTab.PREVIEW,
+                  title: "Preview",
+                  panel: (
+                    <div className="input-markdown">
+                      <Markdown content={moduleHelpText || ''} openLinksInNewWindow />
+                    </div>
+                  )
+                }
+              ]}
+            />
           </FormGroup>
+
           <FormGroup
-            helperText="Please enter the default prompt that will be used in this course"
+            helperText="Please enter the default LLM prompt that will be used in this course"
             inline={true}
-            label="Default Prompt"
-            labelFor="defaultPrompt"
+            label="Default LLM Prompt"
+            labelFor="defaultLlmPrompt"
           >
-            <Tabs
-              selectedTabId={defaultPromptSelectedTab}
+            <TabPanel
+              selectedTabId={defaultLlmPromptSelectedTab}
               onChange={onChangeTab}
-              className="default-propmt-tabs"
-            >
-              <Tab id={DefaultPromptTab.WRITE} title="Write" />
-              <Tab id={DefaultPromptTab.PREVIEW} title="Preview" />
-            </Tabs>
-            {defaultPromptSelectedTab === DefaultPromptTab.WRITE && writePanel1}
-            {defaultPromptSelectedTab === DefaultPromptTab.PREVIEW && previewPanel1}
+              tabs={[
+                {
+                  id: DefaultLlmPromptTab.WRITE,
+                  title: "Write",
+                  panel: (
+                    <TextArea
+                      id="defaultLlmPrompt"
+                      className="input-textarea"
+                      fill={true}
+                      value={defaultLlmPrompt || ''}
+                      onChange={e =>
+                        props.setCourseConfiguration({
+                          ...props.courseConfiguration,
+                          defaultLlmPrompt: e.target.value
+                        })
+                      }
+                    />
+                  )
+                },
+                {
+                  id: DefaultLlmPromptTab.PREVIEW,
+                  title: "Preview",
+                  panel: (
+                    <div className="input-markdown">
+                      <Markdown content={defaultLlmPrompt || ''} openLinksInNewWindow />
+                    </div>
+                  )
+                }
+              ]}
+            />
           </FormGroup>
+
+          {/* ... Other inputs */}
         </div>
         {!isMobileBreakpoint && <Divider />}
         <div className="booleans">
diff --git a/src/pages/academy/grading/Grading.tsx b/src/pages/academy/grading/Grading.tsx
index d8912f3c65..0626fedd3f 100644
--- a/src/pages/academy/grading/Grading.tsx
+++ b/src/pages/academy/grading/Grading.tsx
@@ -56,33 +56,6 @@ const Grading: React.FC = () => {
       return;
     }
 
-    // const content = new Blob(
-    //   [
-    //     '"Assessment Name","Question Number","Student Name","Group","Status","Grading","Question Count","Questions Graded","Initial XP","XP Adjustment","Current XP (excl. bonus)","Max XP","Bonus XP"\n',
-    //     ...gradingOverviews.map(
-    //       e =>
-    //         [
-    //           e.assessmentName,
-    //           e.studentName,
-    //           e.groupName,
-    //           e.submissionStatus,
-    //           e.gradingStatus,
-    //           e.questionCount,
-    //           e.gradedCount,
-    //           e.initialXp,
-    //           e.xpAdjustment,
-    //           e.currentXp,
-    //           e.maxXp,
-    //           e.xpBonus
-    //         ]
-    //           .map(field => `"${field}"`) // wrap each field in double quotes in case it contains a comma
-    //           .join(',') + '\n'
-    //     )
-    //   ],
-    //   { type: 'text/csv' }
-    // );
-    // const fileName = `SA submissions (${new Date().toISOString()}).csv`;
-
     const content = new Blob(
       [
         '"Student Name","Group","Status","Question","Initial XP","XP Adjustment","Current XP (excl. bonus)","Max XP","Bonus XP"\n',
diff --git a/src/pages/localStorage.ts b/src/pages/localStorage.ts
index 3a1bfa4a81..c2dafae1a3 100644
--- a/src/pages/localStorage.ts
+++ b/src/pages/localStorage.ts
@@ -66,7 +66,7 @@ export const saveState = (state: OverallState) => {
         enableAchievements: state.session.enableAchievements,
         enableSourcecast: state.session.enableSourcecast,
         moduleHelpText: state.session.moduleHelpText,
-        defaultPrompt: state.session.defaultPrompt,
+        defaultLlmPrompt: state.session.defaultLlmPrompt,
         assetsPrefix: state.session.assetsPrefix,
         assessmentConfigurations: state.session.assessmentConfigurations,
         notificationConfigs: state.session.notificationConfigs,
diff --git a/tsconfig.json b/tsconfig.json
index 618d3d85a4..cc12a427ca 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -27,6 +27,6 @@
     "noEmit": true,
     "noFallthroughCasesInSwitch": true
   },
-  "include": ["src", "rating.ts"],
+  "include": ["src"],
   "exclude": ["src/setupTests.ts"]
 }

From 7a2a8d6aeb3282a7780f466db0a265c5e08310fd Mon Sep 17 00:00:00 2001
From: clementlemon02 <clementling02@gmail.com>
Date: Sat, 12 Aug 2023 23:23:56 +0200
Subject: [PATCH 11/14] fix format

---
 .../subcomponents/CourseConfigPanel.tsx       | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx b/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx
index ff46c78692..8a64cf9000 100644
--- a/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx
+++ b/src/pages/academy/adminPanel/subcomponents/CourseConfigPanel.tsx
@@ -57,27 +57,27 @@ type TabPanelProps = {
 };
 
 const TabPanel: React.FC<TabPanelProps> = ({ selectedTabId, onChange, tabs }) => (
-  <Tabs selectedTabId={selectedTabId} onChange={(newTabId) => onChange(newTabId as CourseHelpTextEditorTab | DefaultLlmPromptTab)} className="module-help-text-tabs">
+  <Tabs
+    selectedTabId={selectedTabId}
+    onChange={newTabId => onChange(newTabId as CourseHelpTextEditorTab | DefaultLlmPromptTab)}
+    className="module-help-text-tabs"
+  >
     {tabs.map(tab => (
       <Tab id={tab.id.toString()} title={tab.title} key={tab.id.toString()} />
     ))}
-    {tabs.map(tab =>
-      selectedTabId === tab.id && tab.panel
-    )}
+    {tabs.map(tab => selectedTabId === tab.id && tab.panel)}
   </Tabs>
 );
 
 const CourseConfigPanel: React.FC<CourseConfigPanelProps> = props => {
   const { isMobileBreakpoint } = useResponsive();
-  const [courseHelpTextSelectedTab, setCourseHelpTextSelectedTab] =
-    React.useState<CourseHelpTextEditorTab | DefaultLlmPromptTab>(
-      CourseHelpTextEditorTab.WRITE
-    );
+  const [courseHelpTextSelectedTab, setCourseHelpTextSelectedTab] = React.useState<
+    CourseHelpTextEditorTab | DefaultLlmPromptTab
+  >(CourseHelpTextEditorTab.WRITE);
 
-  const [defaultLlmPromptSelectedTab, setDefaultLlmPromptSelectedTab] =
-    React.useState<CourseHelpTextEditorTab | DefaultLlmPromptTab>(
-      DefaultLlmPromptTab.WRITE
-    );
+  const [defaultLlmPromptSelectedTab, setDefaultLlmPromptSelectedTab] = React.useState<
+    CourseHelpTextEditorTab | DefaultLlmPromptTab
+  >(DefaultLlmPromptTab.WRITE);
 
   const {
     courseName,
@@ -154,7 +154,7 @@ const CourseConfigPanel: React.FC<CourseConfigPanelProps> = props => {
               tabs={[
                 {
                   id: CourseHelpTextEditorTab.WRITE,
-                  title: "Write",
+                  title: 'Write',
                   panel: (
                     <TextArea
                       id="moduleHelpText"
@@ -172,7 +172,7 @@ const CourseConfigPanel: React.FC<CourseConfigPanelProps> = props => {
                 },
                 {
                   id: CourseHelpTextEditorTab.PREVIEW,
-                  title: "Preview",
+                  title: 'Preview',
                   panel: (
                     <div className="input-markdown">
                       <Markdown content={moduleHelpText || ''} openLinksInNewWindow />
@@ -195,7 +195,7 @@ const CourseConfigPanel: React.FC<CourseConfigPanelProps> = props => {
               tabs={[
                 {
                   id: DefaultLlmPromptTab.WRITE,
-                  title: "Write",
+                  title: 'Write',
                   panel: (
                     <TextArea
                       id="defaultLlmPrompt"
@@ -213,7 +213,7 @@ const CourseConfigPanel: React.FC<CourseConfigPanelProps> = props => {
                 },
                 {
                   id: DefaultLlmPromptTab.PREVIEW,
-                  title: "Preview",
+                  title: 'Preview',
                   panel: (
                     <div className="input-markdown">
                       <Markdown content={defaultLlmPrompt || ''} openLinksInNewWindow />

From 1f21138ef541d4ea1c5efffda74ba2145eaca2c3 Mon Sep 17 00:00:00 2001
From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com>
Date: Sun, 3 Sep 2023 19:01:33 +0800
Subject: [PATCH 12/14] Delete unused component

---
 src/commons/dropdown/DropdownPrompt.tsx | 46 -------------------------
 1 file changed, 46 deletions(-)
 delete mode 100644 src/commons/dropdown/DropdownPrompt.tsx

diff --git a/src/commons/dropdown/DropdownPrompt.tsx b/src/commons/dropdown/DropdownPrompt.tsx
deleted file mode 100644
index 1e2bacc39f..0000000000
--- a/src/commons/dropdown/DropdownPrompt.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { Classes, Dialog } from '@blueprintjs/core';
-import { IconNames } from '@blueprintjs/icons';
-import * as React from 'react';
-
-import Markdown from '../Markdown';
-import { Links } from '../utils/Constants';
-import { useTypedSelector } from '../utils/Hooks';
-
-type DialogProps = {
-  isOpen: boolean;
-  onClose: () => void;
-};
-
-const DropdownPrompt: React.FC<DialogProps> = props => {
-  const defaultLlmPrompt = useTypedSelector(store => store.session.defaultLlmPrompt);
-
-  return (
-    <Dialog
-      className="help"
-      icon={IconNames.ERROR}
-      isCloseButtonShown={true}
-      isOpen={props.isOpen}
-      onClose={props.onClose}
-      title="Help"
-    >
-      <div className={Classes.DIALOG_BODY}>
-        {defaultLlmPrompt ? (
-          <Markdown content={defaultLlmPrompt} openLinksInNewWindow />
-        ) : (
-          <>
-            <p>
-              We recommend recent updates of the browsers <b>Google Chrome</b>,{' '}
-              <b>Microsoft Edge</b>, or <b>Mozilla Firefox</b> to visit the Source Academy.
-            </p>
-            <p>
-              If you encounter issues with the Source Academy using these browsers, please use the
-              issue system of the{' '}
-              <a href={Links.githubIssues}>Source Academy frontend repository on GitHub</a>.
-            </p>
-          </>
-        )}
-      </div>
-    </Dialog>
-  );
-};
-export default DropdownPrompt;

From 77687cd0a7d1d37b50d50a1bfeae719537e89c15 Mon Sep 17 00:00:00 2001
From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com>
Date: Sun, 3 Sep 2023 19:02:07 +0800
Subject: [PATCH 13/14] Delete unused action

---
 src/commons/application/types/SessionTypes.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/commons/application/types/SessionTypes.ts b/src/commons/application/types/SessionTypes.ts
index 94668bda7f..4264252ba4 100644
--- a/src/commons/application/types/SessionTypes.ts
+++ b/src/commons/application/types/SessionTypes.ts
@@ -51,7 +51,6 @@ export const UPDATE_TOTAL_XP = 'UPDATE_TOTAL_XP';
 export const UPDATE_ALL_USER_XP = 'UPDATE_ALL_USER_XP';
 export const UPDATE_ASSESSMENT = 'UPDATE_ASSESSMENT';
 export const UPDATE_GRADING_OVERVIEWS = 'UPDATE_GRADING_OVERVIEWS';
-export const UPDATE_GRADING_OVERVIEWS_TEST = 'UPDATE_GRADING_OVERVIEWS_TEST';
 export const UPDATE_GRADING = 'UPDATE_GRADING';
 export const FETCH_NOTIFICATIONS = 'FETCH_NOTIFICATIONS';
 export const ACKNOWLEDGE_NOTIFICATIONS = 'ACKNOWLEDGE_NOTIFICATIONS';

From 768afd42a13e07c868a3b25fc132fa68fc7eaf88 Mon Sep 17 00:00:00 2001
From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com>
Date: Sun, 3 Sep 2023 19:09:14 +0800
Subject: [PATCH 14/14] Remove grading CSV items

---
 .../application/actions/__tests__/SessionActions.ts        | 1 -
 .../application/reducers/__tests__/SessionReducer.ts       | 2 --
 src/commons/mocks/GradingMocks.ts                          | 3 ---
 src/commons/sagas/RequestsSaga.ts                          | 1 -
 src/features/grading/GradingTypes.ts                       | 1 -
 src/pages/academy/grading/Grading.tsx                      | 7 +++++--
 src/pages/academy/grading/subcomponents/GradingEditor.tsx  | 1 -
 .../academy/grading/subcomponents/GradingWorkspace.tsx     | 1 -
 8 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/commons/application/actions/__tests__/SessionActions.ts b/src/commons/application/actions/__tests__/SessionActions.ts
index 90ad14f661..c58f074e3e 100644
--- a/src/commons/application/actions/__tests__/SessionActions.ts
+++ b/src/commons/application/actions/__tests__/SessionActions.ts
@@ -511,7 +511,6 @@ test('updateGradingOverviews generates correct action object', () => {
     {
       assessmentId: 1,
       assessmentName: 'test assessment',
-      questions: '',
       assessmentType: 'Contests',
       initialXp: 0,
       xpBonus: 100,
diff --git a/src/commons/application/reducers/__tests__/SessionReducer.ts b/src/commons/application/reducers/__tests__/SessionReducer.ts
index 2f137c9723..4a054a79ba 100644
--- a/src/commons/application/reducers/__tests__/SessionReducer.ts
+++ b/src/commons/application/reducers/__tests__/SessionReducer.ts
@@ -475,7 +475,6 @@ const gradingOverviewTest1: GradingOverview[] = [
   {
     assessmentId: 1,
     assessmentName: 'test assessment',
-    questions: '',
     assessmentType: 'Contests',
     initialXp: 0,
     xpBonus: 100,
@@ -497,7 +496,6 @@ const gradingOverviewTest2: GradingOverview[] = [
   {
     assessmentId: 2,
     assessmentName: 'another assessment',
-    questions: '',
     assessmentType: 'Quests',
     initialXp: 20,
     xpBonus: 250,
diff --git a/src/commons/mocks/GradingMocks.ts b/src/commons/mocks/GradingMocks.ts
index 3bda03f6a7..9f1849b858 100644
--- a/src/commons/mocks/GradingMocks.ts
+++ b/src/commons/mocks/GradingMocks.ts
@@ -11,7 +11,6 @@ export const mockGradingOverviews: GradingOverview[] = [
     assessmentType: 'Missions',
     assessmentId: 0,
     assessmentName: 'Mission 0 ',
-    questions: '',
     currentXp: 69,
     xpBonus: 10,
     initialXp: 69,
@@ -30,7 +29,6 @@ export const mockGradingOverviews: GradingOverview[] = [
     assessmentType: 'Missions',
     assessmentId: 1,
     assessmentName: 'Mission 1',
-    questions: '',
     currentXp: -2,
     xpBonus: 12,
     initialXp: 0,
@@ -49,7 +47,6 @@ export const mockGradingOverviews: GradingOverview[] = [
     assessmentType: 'Missions',
     assessmentId: 0,
     assessmentName: 'Mission 0',
-    questions: '',
     currentXp: 1000,
     xpBonus: 12,
     initialXp: 996,
diff --git a/src/commons/sagas/RequestsSaga.ts b/src/commons/sagas/RequestsSaga.ts
index 2cdca64647..630ace8aa9 100644
--- a/src/commons/sagas/RequestsSaga.ts
+++ b/src/commons/sagas/RequestsSaga.ts
@@ -623,7 +623,6 @@ export const getGradingOverviews = async (
         assessmentType: overview.assessment.type,
         studentId: overview.student.id,
         studentName: overview.student.name,
-        questions: overview.questions,
         submissionId: overview.id,
         submissionStatus: overview.status,
         groupName: overview.student.groupName,
diff --git a/src/features/grading/GradingTypes.ts b/src/features/grading/GradingTypes.ts
index 009bff21b5..7154e58b58 100644
--- a/src/features/grading/GradingTypes.ts
+++ b/src/features/grading/GradingTypes.ts
@@ -25,7 +25,6 @@ export type GradingOverview = {
   studentName: string;
   submissionId: number;
   submissionStatus: string;
-  questions: string;
   groupName: string;
   groupLeaderId?: number;
   gradingStatus: GradingStatus;
diff --git a/src/pages/academy/grading/Grading.tsx b/src/pages/academy/grading/Grading.tsx
index 0626fedd3f..dd9a9c6227 100644
--- a/src/pages/academy/grading/Grading.tsx
+++ b/src/pages/academy/grading/Grading.tsx
@@ -58,14 +58,17 @@ const Grading: React.FC = () => {
 
     const content = new Blob(
       [
-        '"Student Name","Group","Status","Question","Initial XP","XP Adjustment","Current XP (excl. bonus)","Max XP","Bonus XP"\n',
+        '"Assessment Name","Student Name","Group","Status","Grading","Question Count","Questions Graded","Initial XP","XP Adjustment","Current XP (excl. bonus)","Max XP","Bonus XP"\n',
         ...gradingOverviews.map(
           e =>
             [
+              e.assessmentName,
               e.studentName,
               e.groupName,
               e.submissionStatus,
-              e.questions,
+              e.gradingStatus,
+              e.questionCount,
+              e.gradedCount,
               e.initialXp,
               e.xpAdjustment,
               e.currentXp,
diff --git a/src/pages/academy/grading/subcomponents/GradingEditor.tsx b/src/pages/academy/grading/subcomponents/GradingEditor.tsx
index 1577256336..bd00000e57 100644
--- a/src/pages/academy/grading/subcomponents/GradingEditor.tsx
+++ b/src/pages/academy/grading/subcomponents/GradingEditor.tsx
@@ -47,7 +47,6 @@ type OwnProps = {
   xpAdjustment: number;
   maxXp: number;
   studentName: string;
-  questions: string;
   comments: string;
   graderName?: string;
   gradedAt?: string;
diff --git a/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx b/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx
index 944a470fb3..2e4d2f38f7 100644
--- a/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx
+++ b/src/pages/academy/grading/subcomponents/GradingWorkspace.tsx
@@ -285,7 +285,6 @@ const GradingWorkspace: React.FC<GradingWorkspaceProps> = props => {
             xpAdjustment={grading![questionId].grade.xpAdjustment}
             maxXp={grading![questionId].question.maxXp}
             studentName={grading![questionId].student.name}
-            questions={''}
             comments={grading![questionId].grade.comments ?? ''}
             graderName={grading![questionId].grade.grader?.name}
             gradedAt={