Merge pull request #3662 from openstax/fix/gb-null-work

Fix grade book blowing up when dropped student had no work

Author: nathanstitt

package.json

@@ -124,7 +124,7 @@
     "mobx-react": "^7.1.0",
     "mobx-utils": "^6.0.3",
     "mockdate": "^2.0.5",
-    "modeled-mobx": "0.6.3",
+    "modeled-mobx": "0.6.4",
     "moment": "2.29.1",
     "moment-range": "^4.0.2",
     "moment-timezone": "0.5.23",

tutor/src/helpers/course-enrollment.tsx

@@ -13,6 +13,7 @@ import Enroll from '../components/enroll';
 import urlFor from '../api';
 import { ApiErrorData, isApiError } from 'shared/api/request';
 import type { User, CoursesMap } from '../models';
+import { CourseData } from '../models/types';
 
 export class CourseEnrollment extends BaseModel {
 
@@ -188,7 +189,7 @@ export class CourseEnrollment extends BaseModel {
     @action async create() {
         if (this.needsPeriodSelection) {
             this.courseToJoin = new Course()
-            const courseData = await this.api.request(
+            const courseData = await this.api.request<CourseData>(
                 urlFor('fetchEnrollmentChoices', { enrollmentCode: this.originalEnrollmentCode }),
             )
             this.courseToJoin = hydrateModel(Course, courseData)

tutor/src/models/course.ts

@@ -325,7 +325,7 @@ export class Course extends BaseModel {
 
     @action async saveExerciseExclusion({ exercise, is_excluded }: { exercise: Exercise, is_excluded: boolean }) {
         exercise.is_excluded = is_excluded; // eagerly set exclusion
-        const data = await this.api.request(
+        const data = await this.api.request<CourseData>(
             urlFor('saveExerciseExclusion', { courseId: this.id }),
             { data: [{ id: exercise.id, is_excluded }] },
         )

tutor/src/models/course/lms.ts

@@ -5,6 +5,7 @@ import urlFor from '../../api'
 import type { Course } from '../../models'
 import Time from 'shared/model/time';
 import UiSettings from 'shared/model/ui-settings';
+import { CourseLMSData } from '../types';
 
 const LMS_VENDOR = 'lmsv';
 
@@ -36,7 +37,7 @@ export class CourseLMS extends BaseModel {
     }
 
     async fetch() {
-        const json = await this.api.request(urlFor('fetchCourseLMS', { courseId: this.course.id }))
+        const json = await this.api.request<CourseLMSData>(urlFor('fetchCourseLMS', { courseId: this.course.id }))
         hydrateInstance(this, json)
     }
 

tutor/src/models/types.ts

@@ -44,6 +44,17 @@ export interface TeacherProfileData {
     name: string
 }
 
+export interface CourseLMSData {
+    id: ID
+    key: string
+    secret: string
+    launch_url: string
+    configuration_url: string
+    xml: string
+    created_at: string
+    updated_at: string
+}
+
 export interface CoursePeriodData {
     id: ID
     enrollment_code: string

yarn.lock

@@ -9487,10 +9487,10 @@ mockdate@^2.0.5:
   resolved "https://registry.yarnpkg.com/mockdate/-/mockdate-2.0.5.tgz#70c6abf9ed4b2dae65c81dfc170dd1a5cec53620"
   integrity sha512-ST0PnThzWKcgSLyc+ugLVql45PvESt3Ul/wrdV/OPc/6Pr8dbLAIJsN1cIp41FLzbN+srVTNIRn+5Cju0nyV6A==
 
-modeled-mobx@0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/modeled-mobx/-/modeled-mobx-0.6.3.tgz#ab3f8f85080ad545753568de7c257700554f62a0"
-  integrity sha512-KzVXl5YkeSzTPihZd4tmhuGdWDdT/6NA3TAwmeGrO9dgAbn2QLRY6A0zqk0RyQ7I5CeGoT5GrdRpP9dtbRybAw==
+modeled-mobx@0.6.4:
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/modeled-mobx/-/modeled-mobx-0.6.4.tgz#6a6220e7100f8c13eff93b90e4e3ef1010e73dd3"
+  integrity sha512-bC5ZAmBXmCLjrqwEq54RURx9mvz1b9VqxUHYDVRqlAmq6i7SoTcR6U8e4LqmtOCe4RV/LoeesVT281CCeYIXQg==
   dependencies:
     mobx "^6.1"