avatic/lcc_tool
avatic/lcc_tool
1
0
Fork 0
Code Issues 31 Pull requests 5 Projects Releases Packages Wiki Activity Actions

FRONTEND: bulk download mostly working

Browse source
This commit is contained in:
Jan 2025-09-13 22:03:51 +02:00
parent ad5a97ec74
commit 3b683018de
3 changed files with 32 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/frontend/src/backend.js
View file

@ -29,13 +29,24 @@ const performDownload = async (url, expectResponse = true, expectedException = n
method: 'GET',
};
const request = {url: url, params: params, expectResponse: expectResponse, expectedException: expectedException};
const request = {url: url, params: params, expectResponse: expectResponse, expectedException: expectedException, type: 'blob'};
logger.info("Request:", request);
const processId = await executeRequest(null, request);
const blob = await executeRequest(null, request);
logger.info("Response:", processId);
return processId;
const downloadUrl = window.URL.createObjectURL(blob);
// Create temporary link element and trigger download
const link = document.createElement('a');
link.href = downloadUrl;
link.download = `export.xlsx`; // or get filename from response headers
document.body.appendChild(link);
link.click();
// Clean up
document.body.removeChild(link);
window.URL.revokeObjectURL(downloadUrl);
}
const performUpload = async (url, file, expectResponse = true, expectedException = null) => {
@ -95,7 +106,14 @@ const executeRequest = async (requestingStore, request) => {
let data = null;
if (request.expectResponse) {
data = await response.json().catch(e => {
try {
if (request.type === 'blob' && response.ok) {
data = await response.blob();
} else {
data = await response.json();
}
} catch (e) {
const error = {
code: 'Malformed response',
message: "Malformed server response. Please contact support.",
@ -106,7 +124,7 @@ const executeRequest = async (requestingStore, request) => {
const errorStore = useErrorStore();
void errorStore.addError(error, {store: requestingStore, request: request});
throw e;
});
}
if (!response.ok) {
handleErrorResponse(data, requestingStore, request);

8
src/frontend/src/components/layout/config/BulkOperations.vue
View file

@ -8,8 +8,8 @@
<div class="bulk-operation-header">Export</div>
<div class="bulk-operation-caption">type</div>
<div class="bulk-operation-data">
<radio-option name="export-type" value="empty" v-model="exportType">empty template</radio-option>
<radio-option name="export-type" value="full" v-model="exportType">full data export</radio-option>
<radio-option name="export-type" value="templates" v-model="exportType">empty template</radio-option>
<radio-option name="export-type" value="download" v-model="exportType">full data export</radio-option>
</div>
<div class="bulk-operation-caption">dataset</div>
<div class="bulk-operation-data">
@ -83,7 +83,7 @@ export default {
components: {RadioOption, BasicButton, Box},
data() {
return {
exportType: "empty",
exportType: "templates",
exportDataset: "NODE",
importDataset: "NODE",
importType: "APPEND",
@ -95,8 +95,8 @@ export default {
},
methods: {
async downloadFile() {
const url = `${config.backendUrl}/bulk/upload/${this.exportDataset}/${this.exportType}/`
const url = `${config.backendUrl}/bulk/${this.exportType}/${this.exportDataset}/`
this.processId = await performDownload(url);
},
inputFile(event) {

8
src/main/java/de/avatic/lcc/controller/bulk/BulkOperationController.java
View file

@ -41,7 +41,7 @@ public class BulkOperationController {
* @param id The unique identifier of the operation (processing_id) to check its status.
* @return A ResponseEntity with the bulk processing status payload.
*/
@GetMapping("/status/{processing_id}")
@GetMapping({"/status/{processing_id}","/status/{processing_id}/"})
public ResponseEntity<BulkStatus> getUploadStatus(@PathVariable("processing_id") Integer id) {
return ResponseEntity.ok(bulkProcessingService.getStatus(id));
}
@ -68,7 +68,7 @@ public class BulkOperationController {
* specifying it as a downloadable file.
* @throws IllegalArgumentException if the file type is invalid.
*/
@GetMapping("/templates/{type}")
@GetMapping({"/templates/{type}","/templates/{type}/"})
public ResponseEntity<InputStreamResource> generateTemplate(@PathVariable BulkFileType type) {
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Disposition", "attachment; filename=lcc_template_" + type.name().toLowerCase() + ".xlsx");
@ -88,7 +88,7 @@ public class BulkOperationController {
* The file is served as an Excel document, with proper headers for download.
* @throws IllegalArgumentException if the provided file type is not supported.
*/
@GetMapping("/download/{type}")
@GetMapping({"/download/{type}", "/download/{type}/"})
public ResponseEntity<InputStreamResource> downloadFile(@PathVariable BulkFileType type) throws IOException {
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Disposition", "attachment; filename=lcc_export_" + type.name().toLowerCase() + ".xlsx");
@ -109,7 +109,7 @@ public class BulkOperationController {
* The file is served as an Excel document, with appropriate headers for download.
* @throws IllegalArgumentException if the file type or validity period ID is invalid.
*/
@GetMapping("/download/{type}/{validity_period_id}")
@GetMapping({"/download/{type}/{validity_period_id}","/download/{type}/{validity_period_id}/"})
public ResponseEntity<InputStreamResource> downloadFile(@PathVariable BulkFileType type, @PathVariable("validity_period_id") Integer validityPeriodId) throws IOException {
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Disposition", "attachment; filename=lcc_export_" + type.name().toLowerCase() + ".xlsx");