Fix bug where no bonus XP assignments would display additional XP message (#2821)

* Fix bug where 0xp assignments would display additional xp message

* Rename hasBonusXp to earlySubmissionXp

* Remove unnecessary console.log message

Author: jayjay19630

src/commons/XMLParser/XMLParserHelper.ts

@@ -76,6 +76,7 @@ const makeAssessmentOverview = (result: any, maxXpVal: number): AssessmentOvervi
     coverImage: rawOverview.coverimage,
     id: EDITING_ID,
     maxXp: maxXpVal,
+    earlySubmissionXp: 0,
     number: rawOverview.number || '',
     openAt: rawOverview.startdate,
     title: rawOverview.title,

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

@@ -537,6 +537,7 @@ test('updateAssessmentOverviews generates correct action object', () => {
       coverImage: 'test_string',
       id: 0,
       maxXp: 0,
+      earlySubmissionXp: 0,
       openAt: 'test_string',
       title: 'test_string',
       shortSummary: 'test_string',

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

@@ -335,6 +335,7 @@ const assessmentOverviewsTest1: AssessmentOverview[] = [
     coverImage: 'test_string',
     id: 0,
     maxXp: 0,
+    earlySubmissionXp: 0,
     openAt: 'test_string',
     title: 'test_string',
     shortSummary: 'test_string',
@@ -356,6 +357,7 @@ const assessmentOverviewsTest2: AssessmentOverview[] = [
     fileName: 'test_sting_0',
     id: 1,
     maxXp: 1,
+    earlySubmissionXp: 0,
     openAt: 'test_string_0',
     title: 'test_string_0',
     shortSummary: 'test_string_0',

src/commons/assessment/Assessment.tsx

@@ -349,6 +349,20 @@ const Assessment: React.FC<AssessmentProps> = props => {
     );
   }
 
+  // Define the warning text when finalising submissions
+  const hasBonusXp = (betchaAssessment?.earlySubmissionXp as number) > 0;
+  const warningText = hasBonusXp ? (
+    <p>
+      Finalising your submission early grants you additional XP, but{' '}
+      <span className="warning">this action is irreversible.</span>
+    </p>
+  ) : (
+    <p>
+      Finalising your submission early does not grant you additional XP, and{' '}
+      <span className="warning">this action is irreversible.</span>
+    </p>
+  );
+
   // Define the betcha dialog (in each card's menu)
   const submissionText = betchaAssessment ? (
     <p>
@@ -361,10 +375,7 @@ const Assessment: React.FC<AssessmentProps> = props => {
   const betchaText = (
     <>
       {submissionText}
-      <p>
-        Finalising your submission early grants you additional XP, but{' '}
-        <span className="warning">this action is irreversible.</span>
-      </p>
+      {warningText}
     </>
   );
   const betchaDialog = (

src/commons/assessment/AssessmentTypes.ts

@@ -65,6 +65,7 @@ export type AssessmentOverview = {
   hasVotingFeatures: boolean;
   hasTokenCounter?: boolean;
   maxXp: number;
+  earlySubmissionXp: number;
   number?: string; // For mission control
   openAt: string;
   private?: boolean;
@@ -241,6 +242,7 @@ export const overviewTemplate = (): AssessmentOverview => {
     coverImage: 'https://fakeimg.pl/300/',
     id: -1,
     maxXp: 0,
+    earlySubmissionXp: 0,
     openAt: '2000-01-01T00:00+08',
     title: 'Insert title here',
     reading: '',

src/commons/mocks/AssessmentMocks.ts

@@ -109,6 +109,7 @@ const mockUnopenedAssessmentsOverviews: AssessmentOverview[] = [
     coverImage: 'https://fakeimg.pl/300/',
     id: 1,
     maxXp: 1000,
+    earlySubmissionXp: 0,
     openAt: '2038-06-18T05:24:26.026Z',
     title: 'An Odessey to Runes (Duplicate)',
     shortSummary:
@@ -130,6 +131,7 @@ const mockOpenedAssessmentsOverviews: AssessmentOverview[] = [
     coverImage: 'https://fakeimg.pl/300/',
     id: 2,
     maxXp: 1000,
+    earlySubmissionXp: 0,
     openAt: '2018-06-18T05:24:26.026Z',
     title: 'An Odessey to Runes',
     shortSummary: `
@@ -160,6 +162,7 @@ const mockOpenedAssessmentsOverviews: AssessmentOverview[] = [
     coverImage: 'https://fakeimg.pl/350x200/?text=World&font=lobster',
     id: 3,
     maxXp: 1000,
+    earlySubmissionXp: 0,
     openAt: '2018-07-18T05:24:26.026Z',
     title: 'The Secret to Streams',
     shortSummary:
@@ -178,6 +181,7 @@ const mockOpenedAssessmentsOverviews: AssessmentOverview[] = [
     coverImage: 'https://fakeimg.pl/350x200/?text=Hello',
     id: 4,
     maxXp: 1000,
+    earlySubmissionXp: 0,
     openAt: '2018-07-18T05:24:26.026Z',
     title: 'A sample Sidequest',
     shortSummary:
@@ -196,6 +200,7 @@ const mockOpenedAssessmentsOverviews: AssessmentOverview[] = [
     coverImage: 'https://fakeimg.pl/700x400/417678,64/?text=%E3%83%91%E3%82%B9&font=noto',
     id: 5,
     maxXp: 200,
+    earlySubmissionXp: 0,
     openAt: '2018-01-01T00:00:00.000Z',
     title: 'Basic logic gates',
     shortSummary:
@@ -214,6 +219,7 @@ const mockOpenedAssessmentsOverviews: AssessmentOverview[] = [
     coverImage: 'https://fakeimg.pl/350x200/?text=Hello',
     id: 6,
     maxXp: 1000,
+    earlySubmissionXp: 0,
     openAt: '2018-07-18T05:24:26.026Z',
     title: 'A sample Practical',
     shortSummary:
@@ -236,6 +242,7 @@ const mockClosedAssessmentOverviews: AssessmentOverview[] = [
     coverImage: 'https://fakeimg.pl/350x200/ff0000/000',
     id: 7,
     maxXp: 1000,
+    earlySubmissionXp: 0,
     openAt: '2007-07-18T05:24:26.026Z',
     title: 'A closed Mission',
     shortSummary:
@@ -254,6 +261,7 @@ const mockClosedAssessmentOverviews: AssessmentOverview[] = [
     coverImage: 'https://fakeimg.pl/350x200/ff0000,128/000,255',
     id: 8,
     maxXp: 1000,
+    earlySubmissionXp: 0,
     openAt: '2007-07-18T05:24:26.026Z',
     title: 'Closed (not graded) Sidequest',
     shortSummary:
@@ -272,6 +280,7 @@ const mockClosedAssessmentOverviews: AssessmentOverview[] = [
     coverImage: 'https://fakeimg.pl/350x200/ff0000,128/000,255',
     id: 9,
     maxXp: 500,
+    earlySubmissionXp: 0,
     openAt: '2007-07-18T05:24:26.026Z',
     title: 'Closed (fully graded) Sidequest',
     shortSummary:
@@ -290,6 +299,7 @@ const mockClosedAssessmentOverviews: AssessmentOverview[] = [
     coverImage: 'https://fakeimg.pl/350x200/ff0000/000',
     id: 10,
     maxXp: 0,
+    earlySubmissionXp: 0,
     openAt: '2007-07-18T05:24:26.026Z',
     title: 'Ungraded assessment',
     shortSummary: