quasar-ui-danx 0.3.37 → 0.3.39

package/package.json

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

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

@@ -60,6 +60,7 @@ function upload() {
  * @returns {Promise<void>}
  */
 async function onAttachFiles({ target: { files } }) {
+	console.log("files attached", files);
 	emit("uploading", files);
 	let fileUpload = new FileUpload(files)
 		.onProgress(({ file, progress }) => {
@@ -73,6 +74,9 @@ async function onAttachFiles({ target: { files } }) {
 			emit("complete", fileUpload.files);
 		});
 
+	console.log("created fileUpload", fileUpload);
+
+	debugger;
 	if (props.geolocation) {
 		await fileUpload.resolveLocation(props.locationWaitMessage);
 	}

package/src/helpers/FileUpload.ts

@@ -270,36 +270,43 @@ export class FileUpload {
 	async upload() {
 		console.log && console.log("FileUploader@upload():", this.fileUploads, this.options);
 		for (const fileUpload of this.fileUploads) {
-			const mimeType = fileUpload.file.mimeType || fileUpload.file.type;
-			const presignedUrl = this.options.presignedUploadUrl(this.options.directory, fileUpload.file.name, mimeType);
-
-			// Fetch presigned upload URL
-			const fileResource = await fetch(presignedUrl).then(r => r.json());
-
-			if (!fileResource.url) {
-				FlashMessages.error("Could not fetch presigned upload URL for file " + fileUpload.file.name);
-				continue;
-			}
-
-			const isS3Upload = !fileResource.url.match("upload-presigned-url-contents");
-
-			// We need the file resource ID to complete the presigned upload
-			fileUpload.file.resource_id = fileResource.id;
-
-			// Prepare XHR request
-			const xhr = new XMLHttpRequest();
-
-			// The XHR request is different based on weather we're sending to S3 or the platform server
-			if (isS3Upload) {
-				xhr.open("PUT", fileResource.url);
-				xhr.setRequestHeader("Content-Type", mimeType);
-				fileUpload.body = fileUpload.file;
-			} else {
-				xhr.open("POST", fileResource.url);
-				fileUpload.body = fileUpload.formData;
+			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
+				const fileResource = await fetch(presignedUrl).then(r => r.json());
+
+				if (!fileResource.url) {
+					FlashMessages.error("Could not fetch presigned upload URL for file " + fileUpload.file.name);
+					continue;
+				}
+
+				const isS3Upload = !fileResource.url.match("upload-presigned-url-contents");
+
+				// We need the file resource ID to complete the presigned upload
+				fileUpload.file.resource_id = fileResource.id;
+
+				// Prepare XHR request
+				const xhr = new XMLHttpRequest();
+
+				// The XHR request is different based on weather we're sending to S3 or the platform server
+				if (isS3Upload) {
+					xhr.open("PUT", fileResource.url);
+					xhr.setRequestHeader("Content-Type", mimeType);
+					fileUpload.body = fileUpload.file;
+				} else {
+					xhr.open("POST", fileResource.url);
+					fileUpload.body = fileUpload.formData;
+				}
+
+				fileUpload.xhr = xhr;
+			} catch (error) {
+				console.error && console.error("FileUploader@upload():", "Failed to fetch presigned upload URL", error);
+				this.errorHandler(null, fileUpload.file, error);
 			}
-
-			fileUpload.xhr = xhr;
 		}
 
 		// Set all the callbacks on the XHR requests

package/src/helpers/download.ts

@@ -114,58 +114,49 @@ export function download(data, strFileName, strMimeType) {
 	}
 
 	function saver(url, winMode) {
+		// Detect Chrome on iPhone (or any iOS device using WebKit)
+		const isIOSChrome =
+				/CriOS/.test(navigator.userAgent) && /iP(hone|od|ad)/.test(navigator.platform);
+
+		if (isIOSChrome) {
+			window.open(url, "_blank");
+
+			return true;
+		}
+
 		if ("download" in anchor) {
-			// html5 A[download]
+			// HTML5 A[download]
 			anchor.href = url;
 			anchor.setAttribute("download", fileName);
-			anchor.className = "download-js-link";
-			anchor.innerHTML = "downloading...";
 			anchor.style.display = "none";
-			anchor.target = "_blank";
 			document.body.appendChild(anchor);
-			setTimeout(function () {
+
+			setTimeout(() => {
 				anchor.click();
 				document.body.removeChild(anchor);
+
 				if (winMode === true) {
-					setTimeout(function () {
-						self.URL.revokeObjectURL(anchor.href);
+					setTimeout(() => {
+						URL.revokeObjectURL(anchor.href); // Release the Object URL
 					}, 250);
 				}
-			}, 66);
-			return true;
-		}
+			}, 0);
 
-		// handle non-a[download] safari as best we can:
-		if (
-				/(Version)\/(\d+)\.(\d+)(?:\.(\d+))?.*Safari\//.test(navigator.userAgent)
-		) {
-			url = url.replace(/^data:([\w/\-+]+)/, defaultMime);
-			if (!window.open(url)) {
-				// popup blocked, offer direct download:
-				if (
-						confirm(
-								"Displaying New Document\n\nUse Save As... to download, then click back to return to this page."
-						)
-				) {
-					location.href = url;
-				}
-			}
 			return true;
 		}
 
-		// do iframe dataURL download (old ch+FF):
-		var f = document.createElement("iframe");
-		document.body.appendChild(f);
+		// General fallback for unsupported browsers
+		const fallbackIframe = document.createElement("iframe");
+		fallbackIframe.style.display = "none";
+		fallbackIframe.src = url;
+		document.body.appendChild(fallbackIframe);
 
-		if (!winMode) {
-			// force a mime that will download:
-			url = "data:" + url.replace(/^data:([\w/\-+]+)/, defaultMime);
-		}
-		f.src = url;
-		setTimeout(function () {
-			document.body.removeChild(f);
-		}, 333);
-	} // end saver
+		setTimeout(() => {
+			document.body.removeChild(fallbackIframe);
+		}, 5000); // Clean up iframe after 5 seconds
+
+		return true;
+	}
 
 	// @ts-ignore
 	if (navigator.msSaveBlob) {