quasar-ui-danx 0.3.42 → 0.3.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quasar-ui-danx",
-  "version": "0.3.42",
+  "version": "0.3.44",
   "author": "Dan <dan@flytedesk.com>",
   "description": "DanX Vue / Quasar component library",
   "license": "MIT",

package/src/components/ActionTable/Form/Fields/FileUploadButton.vue

@@ -24,7 +24,7 @@
 import { PlusIcon } from "@heroicons/vue/outline";
 import { QBtn } from "quasar";
 import { ref } from "vue";
-import { downloadFile, fDateTime, FileUpload, sleep } from "../../../../helpers";
+import { downloadBlobOrUrl, fDateTime, FileUpload, sleep } from "../../../../helpers";
 
 defineExpose({ upload });
 const emit = defineEmits([
@@ -65,11 +65,9 @@ function upload() {
  * @returns {Promise<void>}
  */
 async function onAttachFiles({ target: { files } }) {
-	console.log("files attached", files);
 	if (props.autoDownloadCapture) {
 		await saveFilesLocally(files);
 	}
-	console.log("uploading files");
 	emit("uploading", files);
 	let fileUpload = new FileUpload(files)
 		.onProgress(({ file, progress }) => {
@@ -83,9 +81,6 @@ async function onAttachFiles({ target: { files } }) {
 			emit("complete", fileUpload.files);
 		});
 
-	console.log("created fileUpload", fileUpload);
-
-	debugger;
 	if (props.geolocation) {
 		await fileUpload.resolveLocation(props.locationWaitMessage);
 	}
@@ -105,9 +100,12 @@ async function saveFilesLocally(files) {
 		} else {
 			fileName += "." + (file.mime || file.type).split("/").pop() || "jpg";
 		}
-		console.log("downloading ", fileName);
-		await downloadFile(file.blobUrl, fileName);
-		console.log("downloaded");
+
+		try {
+			await downloadBlobOrUrl(file, fileName);
+		} catch (e) {
+			console.error("Failed to download file", e);
+		}
 	}
 }
 </script>

package/src/helpers/FileUpload.ts

@@ -269,29 +269,25 @@ export class FileUpload {
 	 * Start uploading all files
 	 */
 	async upload() {
-		console.log && console.log("FileUploader@upload():", this.fileUploads, this.options);
 		for (const fileUpload of this.fileUploads) {
 			try {
 				const mimeType = fileUpload.file.mimeType || fileUpload.file.type;
 				const presignedUrl = this.options.presignedUploadUrl(this.options.directory, fileUpload.file.name, mimeType);
 
-				console.log("calling presigned URL", presignedUrl);
-
 				// Fetch presigned upload URL
-				let fileResource;
-
-				try {
-					fileResource = await fetch(presignedUrl).then(r => r.json());
-				} catch (error) {
-					console.log("First upload attempt failed. waiting and trying again:", error);
-					await sleep(3000);
-					console.log("upload attempt 2...");
-					fileResource = await fetch(presignedUrl).then(r => r.json());
+				let fileResource = null;
+				let count = 60;
+
+				while (!fileResource && count-- > 0) {
+					try {
+						fileResource = await fetch(presignedUrl).then(r => r.json());
+					} catch (error) {
+						console.warn(`Upload failed, trying ${count} more times....`, error);
+						await sleep(1000);
+					}
 				}
 
-				console.log("loaded presignedUrl: fileResource", fileResource);
-
-				if (!fileResource.url) {
+				if (!fileResource?.url) {
 					FlashMessages.error("Could not fetch presigned upload URL for file " + fileUpload.file.name);
 					continue;
 				}
@@ -306,9 +302,7 @@ export class FileUpload {
 
 				// The XHR request is different based on weather we're sending to S3 or the platform server
 				if (isS3Upload) {
-					console.log("uploading S3", xhr);
 					xhr.open("PUT", fileResource.url);
-					console.log("setting content type to", mimeType);
 					xhr.setRequestHeader("Content-Type", mimeType);
 					fileUpload.body = fileUpload.file;
 				} else {
@@ -326,8 +320,6 @@ export class FileUpload {
 		// Set all the callbacks on the XHR requests
 		this.setXhrCallbacks();
 
-		console.log && console.log("FileUploader@upload():", "sending uploads");
-
 		// Send all the XHR file uploads
 		for (const fileUpload of this.fileUploads) {
 			fileUpload.xhr.send(fileUpload.body);

package/src/helpers/download.ts

@@ -7,6 +7,57 @@
 // semantic variable names, long (over 2MB) dataURL support, and hidden by default temp anchors
 // https://github.com/rndme/download
 
+export async function downloadBlobOrUrl(blobOrUrl, filename = "download") {
+	// Create a Promise that resolves to a Blob URL
+	const blobUrlPromise = new Promise((resolve, reject) => {
+		if (blobOrUrl instanceof File) {
+			// Create an object URL from the File
+			const url = URL.createObjectURL(blobOrUrl);
+			resolve(url);
+		} else if (typeof blobOrUrl === "string") {
+			// It's a Blob URL
+			resolve(blobOrUrl);
+		} else if (blobOrUrl instanceof Blob) {
+			// Create an object URL from the Blob
+			const url = URL.createObjectURL(blobOrUrl);
+			resolve(url);
+		} else {
+			console.error("blobOrUrl was not a Blob or URL", blobOrUrl);
+			reject(new Error("The provided value must be a Blob or a Blob URL string."));
+		}
+	});
+
+	return await blobUrlPromise.then((blobUrl) => {
+		// Create a temporary anchor element
+		const anchor = document.createElement("a");
+		anchor.style.display = "none";
+		anchor.href = blobUrl as string;
+		anchor.download = filename;
+		anchor.target = "_blank";
+
+		// Append the anchor to the body
+		document.body.appendChild(anchor);
+
+		// Programmatically trigger a click event on the anchor
+		const clickEvent = new MouseEvent("click", {
+			view: window,
+			bubbles: true,
+			cancelable: true
+		});
+		anchor.dispatchEvent(clickEvent);
+
+		// Remove the anchor from the document
+		document.body.removeChild(anchor);
+
+		// Revoke the object URL if we created one
+		if (blobOrUrl instanceof Blob) {
+			setTimeout(() => URL.revokeObjectURL(blobUrl), 100);
+		}
+	}).catch((error) => {
+		console.error("An error occurred while downloading the file:", error);
+	});
+}
+
 /* eslint-disable */
 export function download(data, strFileName, strMimeType) {
 	var self = window;