From a2f4a20124fd8fe5118283f58d460e92a791c902 Mon Sep 17 00:00:00 2001
From: Jonas Metzener <jonasmetzener@gmail.com>
Date: Tue, 24 Oct 2017 13:30:15 +0200
Subject: [PATCH] Fix report export urls (#127)

---
 app/analysis/controller.js             | 15 ++++++++-------
 app/analysis/template.hbs              |  2 +-
 config/environment.js                  | 18 ++++++++++++++----
 tests/unit/analysis/controller-test.js |  3 ++-
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/app/analysis/controller.js b/app/analysis/controller.js
index c842c28cd..c1983a8bd 100644
--- a/app/analysis/controller.js
+++ b/app/analysis/controller.js
@@ -21,30 +21,31 @@ const AnalysisController = Controller.extend(ReportFilterControllerMixin, {
 
   exportLinks: config.APP.REPORTEXPORTS,
 
-  getTarget(url) {
+  getTarget(url, params) {
     let queryString = toQueryString(
-      cleanParams(
-        this.getProperties(
+      cleanParams({
+        ...params,
+        ...this.getProperties(
           ...this.get('queryParams').filter(
             key => !['page', 'page_size'].includes(key)
           ),
           'jwt'
         )
-      )
+      })
     )
 
-    return `${url}&${queryString}`
+    return `${url}?${queryString}`
   },
 
   actions: {
-    download(url) {
+    download(url, params) {
       /* istanbul ignore else */
       if (testing) {
         return
       }
 
       /* istanbul ignore next */
-      window.location.href = this.getTarget(url)
+      window.location.href = this.getTarget(url, params)
     }
   }
 })
diff --git a/app/analysis/template.hbs b/app/analysis/template.hbs
index f8ea71bb0..88698227d 100644
--- a/app/analysis/template.hbs
+++ b/app/analysis/template.hbs
@@ -66,7 +66,7 @@
 
   <p>
     {{#each exportLinks as |link index|}}
-      <button {{action 'download' link.url}}
+      <button {{action 'download' link.url link.params}}
         type="button"
         disabled={{gt model.length 4000}}
         class="btn btn-default"
diff --git a/config/environment.js b/config/environment.js
index 1d8dac31f..29a56f055 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -20,19 +20,29 @@ module.exports = function(environment) {
       REPORTEXPORTS: [
         {
           label: 'CSV',
-          url: '/api/v1/reports/export?file_type=csv'
+          url: '/api/v1/reports/export',
+          params: {
+            file_type: 'csv'
+          }
         },
         {
           label: 'ODS',
-          url: '/api/v1/reports/export?file_type=ods'
+          url: '/api/v1/reports/export',
+          params: {
+            file_type: 'ods'
+          }
         },
         {
           label: 'XLSX',
-          url: '/api/v1/reports/export?file_type=xlsx'
+          url: '/api/v1/reports/export',
+          params: {
+            file_type: 'xlsx'
+          }
         },
         {
           label: 'Work report',
-          url: '/api/v1/work-reports'
+          url: '/api/v1/work-reports',
+          params: {}
         }
       ]
     },
diff --git a/tests/unit/analysis/controller-test.js b/tests/unit/analysis/controller-test.js
index 13b272b0b..ad1b3b2b5 100644
--- a/tests/unit/analysis/controller-test.js
+++ b/tests/unit/analysis/controller-test.js
@@ -16,8 +16,9 @@ describe('Unit | Controller | analysis', function() {
     controller.set('page_size', 100)
     controller.set('customer', 1)
 
-    let target = controller.getTarget('test')
+    let target = controller.getTarget('test', { foo: 'bar' })
 
+    expect(target).to.contain('foo=bar')
     expect(target).to.contain('jwt=foobar')
     expect(target).to.contain('user=1')
     expect(target).to.contain('customer=1')