Merge pull request #907 from bcgov/fix/nullEnrolledCodes

Fix: Null enrolled codes on Step 4
bcgov · Jul 20, 2023 · 051efbc · 051efbc
2 parents 98050dd + da0cd1e
commit 051efbc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/backend/src/components/sdc.js b/backend/src/components/sdc.js
@@ -171,8 +171,10 @@ async function getSDCSchoolCollectionStudentDetail (req, res) {
 
     await validateEdxUserAccess(token, req, res, sdcSchoolCollectionStudentData.sdcSchoolCollectionID);
 
-    sdcSchoolCollectionStudentData.enrolledProgramCodes = sdcSchoolCollectionStudentData?.enrolledProgramCodes.match(/.{1,2}/g);
-
+    if(sdcSchoolCollectionStudentData?.enrolledProgramCodes) {
+      sdcSchoolCollectionStudentData.enrolledProgramCodes = sdcSchoolCollectionStudentData?.enrolledProgramCodes.match(/.{1,2}/g);
+    }
+
     return res.status(HttpStatus.OK).json(sdcSchoolCollectionStudentData);
   }catch (e) {
     if(e?.status === 404){

diff --git a/frontend/src/components/sdcCollection/StepFourValidateData.vue b/frontend/src/components/sdcCollection/StepFourValidateData.vue
@@ -843,7 +843,6 @@ const getSdcSchoolCollectionStudentDetail = (sdcSchoolCollectionStudentID) => {
   ApiService.apiAxios.get(`${ApiRoutes.sdc.SDC_SCHOOL_COLLECTION_STUDENT}/${sdcSchoolCollectionStudentID}`)
     .then(response => {
       let filteredResponse = {...response.data, filteredEnrolledProgramCodes: filterEnrolledProgramCodes(response.data.enrolledProgramCodes), dob: formatDate(response.data.dob, from, pickerFormat)};
-
       sdcSchoolCollectionStudentDetail.value = filteredResponse;
       sdcSchoolCollectionStudentDetailCopy.value = cloneDeep(filteredResponse);
     }).catch(error => {
@@ -855,7 +854,9 @@ const getSdcSchoolCollectionStudentDetail = (sdcSchoolCollectionStudentID) => {
 };
 
 const filterEnrolledProgramCodes = (enrolledProgramCodes = []) => {
-  return enrolledProgramCodes.filter(enrolledProgramCode => sdcCollectionStore.enrolledProgramCodesMap.has(enrolledProgramCode));
+  if(enrolledProgramCodes) {
+    return enrolledProgramCodes.filter(enrolledProgramCode => sdcCollectionStore.enrolledProgramCodesMap.has(enrolledProgramCode));
+  } 
 };
 
 const syncWithEnrolledProgramCodeOnUserInput = (value) => {