From 1944a35f7fb977cb408bc9a2dcbf4047e8308e2c Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Tue, 2 Jan 2024 11:52:31 +0800
Subject: [PATCH] excel export

---
 src/pages/Organization/SearchPage/OrganizationSearchForm.js | 2 +-
 src/utils/HttpUtils.js                                      | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pages/Organization/SearchPage/OrganizationSearchForm.js b/src/pages/Organization/SearchPage/OrganizationSearchForm.js
index a406efe..9b60efa 100644
--- a/src/pages/Organization/SearchPage/OrganizationSearchForm.js
+++ b/src/pages/Organization/SearchPage/OrganizationSearchForm.js
@@ -45,7 +45,7 @@ const OrganizationSearchForm = ({ applySearch }) => {
     }
 
     const doExport=()=>{
-        HttpUtils.get({
+        HttpUtils.reportDownload({
             url: UrlUtils.GET_ORG_EXPORT
         });
     }
diff --git a/src/utils/HttpUtils.js b/src/utils/HttpUtils.js
index eaeafd8..d6bd1f6 100644
--- a/src/utils/HttpUtils.js
+++ b/src/utils/HttpUtils.js
@@ -82,13 +82,17 @@ export const fileDownload = ({fileId, skey, filename, onResponse, onError}) =>{
     });
 };
 
-export const reportDownload = ({url, filename, onError}) =>{
+export const reportDownload = ({url, onError}) =>{
     axios.get( url,
         {
             responseType: 'blob',
         }
     ).then(
         (response)=>{
+            const filename = response.headers
+            .get("content-disposition")
+            .split("filename=")[1]
+            .split('"')[1].trim();
             const url = URL.createObjectURL(response.data);
             const a = document.createElement('a');
             a.href = url;