diff --git a/frontend/dashboard/src/pages/Report/Log/List.tsx b/frontend/dashboard/src/pages/Report/Log/List.tsx index ba13868b..78a17666 100644 --- a/frontend/dashboard/src/pages/Report/Log/List.tsx +++ b/frontend/dashboard/src/pages/Report/Log/List.tsx @@ -175,6 +175,7 @@ export default function List() { const createMenu = Boolean(anchorEl); const importForm = useRef(null); const [currentImportFileName, setCurrentImportFileName] = useState(null); + const [importLoading, setImportLoading] = useState(false); const handleClick = (event: React.MouseEvent) => { setAnchorEl(event.currentTarget); @@ -201,15 +202,31 @@ export default function List() { }; const handleGetData = (type :string) => { - axios.get(`report/logs/export`) - .then((response) => { - const link = document.createElement('a'); - link.href = response.data.data.file_url; - link.setAttribute('download', response.data.data.file_name); - document.body.appendChild(link); - link.click(); - handleClose(); - }) + const parameters = + Object.keys(appliedParams).length !== 0 + ? appliedParams + : Object.fromEntries([...searchParams.entries(), ['order', order], ['orderBy', orderBy]]); + setImportLoading(true); + axios.get('/report/logs/export', { + params: { ...parameters }, + }).then((response) => { + const link = document.createElement('a'); + link.href = response.data.data.file_url; + link.setAttribute('download', response.data.data.file_name); + document.body.appendChild(link); + link.click(); + handleClose(); + setImportLoading(false); + }); + // axios.get(`report/logs/export`) + // .then((response) => { + // const link = document.createElement('a'); + // link.href = response.data.data.file_url; + // link.setAttribute('download', response.data.data.file_name); + // document.body.appendChild(link); + // link.click(); + // handleClose(); + // }) } return (