Merge pull request #2026 from bcgov/feature/egc-24

Small fixes
bcgov · Nov 22, 2024 · aa33881 · aa33881
2 parents ea991ea + 251752a
commit aa33881
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/backend/src/components/grad.js b/backend/src/components/grad.js
@@ -32,7 +32,7 @@ async function uploadFile(req, res) {
 async function downloadErrorReport(req, res) {
   try {
     const token = getAccessToken(req);
-    const url = `${config.get('grad:rootURL')}/reportGeneration/errorReport/${req.params.schoolID}`;
+    const url = `${config.get('grad:rootURL')}/reportGeneration/errorReport/${req.params.activeIncomingFilesetID}`;
 
     const resData = await getData(token, url);
 
@@ -76,10 +76,10 @@ async function getFilesetsPaginated(req, res) {
 async function getErrorFilesetStudentPaginated(req, res) {
   try {
     const search = [];
-    if(req.params.schoolID) {
+    if(req.params.activeIncomingFilesetID) {
       search.push({
         condition: null,
-        searchCriteriaList: [{ key: 'incomingFileset.schoolID', value: req.params.schoolID, operation: FILTER_OPERATION.EQUAL, valueType: VALUE_TYPE.UUID }]
+        searchCriteriaList: [{ key: 'incomingFileset.incomingFilesetID', value: req.params.activeIncomingFilesetID, operation: FILTER_OPERATION.EQUAL, valueType: VALUE_TYPE.UUID }]
       });
     } 
 

diff --git a/backend/src/routes/grad.js b/backend/src/routes/grad.js
@@ -18,15 +18,15 @@ router.get('/validation-issue-type-codes', passport.authenticate('jwt', {session
 router.post('/school/:schoolID/upload-file', passport.authenticate('jwt', {session: false}, undefined), isValidBackendToken, validateAccessToken, 
   checkEdxUserPermission(PERMISSION.GRAD_SCH_EDIT), validate(gradFileUploadSchema), scanFilePayload, uploadFile);
 
-router.get('/filesetErrors/:schoolID/paginated', passport.authenticate('jwt', {session: false}, undefined), isValidBackendToken, validateAccessToken,
+router.get('/filesetErrors/:activeIncomingFilesetID/paginated', passport.authenticate('jwt', {session: false}, undefined), isValidBackendToken, validateAccessToken,
   checkEdxUserPermission(PERMISSION.GRAD_SCH_EDIT), validate(gradErrorFilesetStudentPaginatedSchema),
   getErrorFilesetStudentPaginated);
 
 router.get('/fileset/:schoolID/paginated', passport.authenticate('jwt', {session: false}, undefined), isValidBackendToken, validateAccessToken,
   checkEdxUserPermission(PERMISSION.GRAD_SCH_EDIT), validate(gradErrorFilesetStudentPaginatedSchema),
   getFilesetsPaginated);
 
-router.get('/filesetErrors/:schoolID/errorReportDownload', auth.refreshJWT, isValidBackendToken, validateAccessToken,
+router.get('/filesetErrors/:activeIncomingFilesetID/errorReportDownload', auth.refreshJWT, isValidBackendToken, validateAccessToken,
   checkEdxUserPermission(PERMISSION.GRAD_SCH_EDIT), validate(gradErrorFilesetStudentPaginatedSchema),
   downloadErrorReport);
 

diff --git a/backend/src/validations/grad.js b/backend/src/validations/grad.js
@@ -24,7 +24,7 @@ const gradFileBySchoolIDSchema =  object({
 const gradErrorFilesetStudentPaginatedSchema = object({
   body: object().noUnknown(),
   params: object({
-    schoolID: string()
+    activeIncomingFilesetID: string()
   }),
   query: object({
     pageNumber: number().moreThan(-1).integer().optional(),

diff --git a/frontend/src/components/graduation/grad-data-collection/GradErrorsView.vue b/frontend/src/components/graduation/grad-data-collection/GradErrorsView.vue
@@ -121,6 +121,11 @@ export default {
       required: false,
       default: null
     },
+    activeIncomingFilesetID: {
+      type: String,
+      required: false,
+      default: null
+    },
   },
   emits: [],
   data() {
@@ -167,7 +172,7 @@ export default {
   },
   methods: {
     downloadReportURL() {
-      return `${ApiRoutes.gdc.BASE_URL}/filesetErrors/${this.$route.params.schoolID}/errorReportDownload`;
+      return `${ApiRoutes.gdc.BASE_URL}/filesetErrors/${this.$route.params.activeIncomingFilesetID}/errorReportDownload`;
     },
     toggleFilters() {
       this.showFilters= !this.showFilters;
@@ -177,7 +182,7 @@ export default {
     },
     getErrorFilesetStudentPaginated() {
       this.isLoading= true;
-      ApiService.apiAxios.get(`${ApiRoutes.gdc.BASE_URL}/filesetErrors/${this.$route.params.schoolID}/paginated`, {
+      ApiService.apiAxios.get(`${ApiRoutes.gdc.BASE_URL}/filesetErrors/${this.$route.params.activeIncomingFilesetID}/paginated`, {
         params: {
           pageNumber: this.pageNumber - 1,
           pageSize: this.pageSize,

diff --git a/frontend/src/components/graduation/grad-data-collection/GradUploadDataComponent.vue b/frontend/src/components/graduation/grad-data-collection/GradUploadDataComponent.vue
@@ -71,7 +71,7 @@
               <span v-if="column.key === 'errorLink'">
                 <a
                   class="ml-1"
-                  @click="navigateToErrors"
+                  @click="navigateToErrors(props.item)"
                 >View Errors/Warnings</a>
               </span>
               <span v-else-if="column.key === 'demFileUploadDate' || column.key === 'xamFileUploadDate' || column.key === 'crsFileUploadDate'">
@@ -439,8 +439,8 @@ export default {
     backButtonClick() {
       this.$router.push({name: 'graduation', params: {schoolID: this.schoolID}});
     },
-    navigateToErrors() {
-      this.$router.push({name: 'error', params: {schoolID: this.schoolID}});
+    navigateToErrors(row) {
+      this.$router.push({name: 'error', params: {schoolID: this.schoolID, activeIncomingFilesetID: row.incomingFilesetID}});
     }
 
   }

diff --git a/frontend/src/router.js b/frontend/src/router.js
@@ -347,7 +347,7 @@ const router = createRouter({
           },
         },
         {
-          path: 'graduation/:schoolID/errorReport',
+          path: 'graduation/:schoolID/errorReport/:activeIncomingFilesetID',
           name: 'error',
           component: GradErrorsView,
           props: true,