@byu-oit/vue-decision-processing-components 8.32.2 → 8.32.3

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [8.32.3](https://github.com/byu-oit/vue-decision-processing-components/compare/v8.32.2...v8.32.3) (2022-12-21)
+
+
+### Bug Fixes
+
+* put pagination param in header so that csv/svg can be returned and not a JSON object ([1159dc1](https://github.com/byu-oit/vue-decision-processing-components/commit/1159dc14c0a31fa2ad24c77f11a2907517a01855))
+* put pagination param in header so that csv/svg can be returned and not a JSON object ([dbed445](https://github.com/byu-oit/vue-decision-processing-components/commit/dbed445e5fdf3639cf1ad0b0a1b1838d8c0cf774))
+
 ### [8.32.2](https://github.com/byu-oit/vue-decision-processing-components/compare/v8.32.1...v8.32.2) (2022-12-15)
 
 ### [8.32.1](https://github.com/byu-oit/vue-decision-processing-components/compare/v8.32.0...v8.32.1) (2022-12-06)

package/Report.vue

@@ -159,7 +159,36 @@ export default {
       this.loading = true
       this.$emit('loading')
       window.scrollTo(0, 0)
-      const q = this.getQuery()
+
+      const q = new URLSearchParams()
+      q.append('name', this.reportName)
+      if (this.selectedAdmitPeriod) {
+        q.append('admit_period', this.selectedAdmitPeriod)
+      } else if(this.metadata.parameters.includes('admitPeriod')) {
+        // Don't attempt to load report if we're missing the admit period
+        return
+      }
+      if (this.paginateReport && this.paginateReport !== 'null') {
+        q.append('pagination_parameter', this.paginateReport)
+        q.append('limit', this.limit)
+        q.append('cursor', this.newCursor)
+      }
+      if (this.dateRange) {
+        const toYYYYMMDD = dt => dt.toISOString().substr(0, 10)
+        const startDate = toYYYYMMDD(this.dateRange[0])
+        const endDate = toYYYYMMDD(this.dateRange[1])
+        q.append('date_start', startDate)
+        q.append('date_end', endDate)
+      }
+      if (this.metadata.parameters.includes('setById') && this.setById) {
+        q.append('set_by_id', this.setById)
+      }
+      // appends institution if available to url search params
+      if(this.metadata.parameters.includes('institutions')) {
+        if(this.metadata.parameters.institutions.includes(state.institution))
+          q.append('institution', state.institution)
+      }
+
       const url = this.baseUrl + '?' + q.toString()
       const loadRequested = () => {
         let promises = []
@@ -190,11 +219,10 @@ export default {
       let csv = ''
       do {
         const reportResponse = await this.loadReport(url, 'text/csv')
-        csv = csv + reportResponse.body
-        this.newCursor = reportResponse.cursor
+        csv = csv + reportResponse
         const q = this.getQuery()
         url = this.baseUrl + '?' + q.toString()
-      } while (this.newCursor !== 'null')
+      } while (this.newCursor && this.newCursor !== 'null')
 
       if (csv && csv.length > 0 && /\n/.test(csv)) {
         this.csvContent = csv
@@ -226,7 +254,8 @@ export default {
           console.error(err.stack)
           return null
         }
-        return JSON.parse(await response.text())
+        this.newCursor = response.headers.get('Cursor')
+        return await response.text()
       } catch (err) {
         this.error = true
         console.error(err)
@@ -250,7 +279,7 @@ export default {
         // Don't attempt to load report if we're missing the admit period
         return
       }
-      if (this.paginateReport !== 'null') {
+      if (this.paginateReport && this.paginateReport !== 'null') {
         q.append('pagination_parameter', this.paginateReport)
         q.append('limit', this.limit)
         q.append('cursor', this.newCursor)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byu-oit/vue-decision-processing-components",
-  "version": "8.32.2",
+  "version": "8.32.3",
   "description": "Vue components shared between decision processing systems for the CES schools.",
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.4",