quasar-ui-danx 0.3.38 → 0.3.40

package/package.json

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

package/src/helpers/FileUpload.ts

@@ -270,36 +270,47 @@ 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());
+
+				console.log("loaded presignedUrl: fileResource", fileResource);
+
+				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) {
+					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 {
+					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