From f627d251c34140db89d586ab2713b6d7d683397d Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Sat, 10 Jun 2023 18:06:59 +0100 Subject: [PATCH 1/3] Update releaseArtifacts.yml --- .github/workflows/releaseArtifacts.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/releaseArtifacts.yml b/.github/workflows/releaseArtifacts.yml index c044fd1a..d8291685 100644 --- a/.github/workflows/releaseArtifacts.yml +++ b/.github/workflows/releaseArtifacts.yml @@ -1,8 +1,7 @@ name: Release Artifacts -on: - push: - tags: - - '*' +on: + release: + types: [created] jobs: push: runs-on: ubuntu-latest From 7b4a889ea78f1790d719afd9656cc8b766f2f327 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Sat, 10 Jun 2023 18:14:34 +0100 Subject: [PATCH 2/3] Remove debugs --- src/main/resources/static/js/downloader.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/main/resources/static/js/downloader.js b/src/main/resources/static/js/downloader.js index d5a8c34f..e9abdf38 100644 --- a/src/main/resources/static/js/downloader.js +++ b/src/main/resources/static/js/downloader.js @@ -19,18 +19,13 @@ $(document).ready(function() { $('#submitBtn').text('Processing...'); console.log(override); try { - console.log("2"); if(remoteCall === true) { - console.log("3"); if (override === 'multi' || (!multiple && files.length > 1) && override !== 'single' ) { - console.log("3"); await submitMultiPdfForm(url, files); } else { - console.log("4"); await handleSingleDownload(url, formData); } } - console.log("5"); $('#submitBtn').text(originalButtonText); } catch (error) { handleDownloadError(error); @@ -102,15 +97,12 @@ async function handleJsonResponse(response) { async function handleResponse(blob, filename, considerViewOptions = false, isZip = false) { if (!blob) return; const downloadOption = localStorage.getItem('downloadOption'); - console.log("handleResponse 1"); if (considerViewOptions) { if (downloadOption === 'sameWindow') { - console.log("handleResponse 2"); const url = URL.createObjectURL(blob); window.location.href = url; return; } else if (downloadOption === 'newWindow') { - console.log("handleResponse 3"); const url = URL.createObjectURL(blob); window.open(url, '_blank'); return; @@ -119,7 +111,6 @@ async function handleResponse(blob, filename, considerViewOptions = false, isZip if(!isZip){ downloadFile(blob, filename); } - console.log("handleResponse 5"); return { filename, blob }; } @@ -135,8 +126,6 @@ function downloadFile(blob, filename) { console.error('Invalid blob passed to downloadFile function'); return; } - - console.log("downloadFile 1"); const url = URL.createObjectURL(blob); const a = document.createElement('a'); a.href = url; @@ -192,7 +181,6 @@ async function submitMultiPdfForm(url, files) { if (zipFiles) { jszip.file(downloadDetails.filename, downloadDetails.blob); } else { - console.log("downloadFile 198"); //downloadFile(downloadDetails.blob, downloadDetails.filename); } updateProgressBar(progressBar, Array.from(files).length); @@ -208,7 +196,6 @@ async function submitMultiPdfForm(url, files) { if (zipFiles) { try { const content = await jszip.generateAsync({ type: "blob" }); - console.log("downloadFile 213"); downloadFile(content, "files.zip"); } catch (error) { console.error('Error generating ZIP file: ' + error); From 55a820b09f07358c64886f9a849856e25ca3923e Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Sat, 10 Jun 2023 18:20:28 +0100 Subject: [PATCH 3/3] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index cdde3de5..5f75b486 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ plugins { } group = 'stirling.software' -version = '0.10.1' +version = '0.10.2' sourceCompatibility = '17' repositories {