quasar-ui-danx 0.3.40 → 0.3.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quasar-ui-danx",
-  "version": "0.3.40",
+  "version": "0.3.42",
   "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 { FileUpload } from "../../../../helpers";
+import { downloadFile, fDateTime, FileUpload, sleep } from "../../../../helpers";
 
 defineExpose({ upload });
 const emit = defineEmits([
@@ -44,7 +44,12 @@ const props = defineProps({
 		default: "Waiting for location..."
 	},
 	cameraOnly: Boolean,
-	geolocation: Boolean
+	geolocation: Boolean,
+	autoDownloadCapture: Boolean,
+	downloadName: {
+		type: String,
+		default: "Upload"
+	}
 });
 
 const fileUpload = ref(null);
@@ -61,6 +66,10 @@ function upload() {
  */
 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,4 +92,22 @@ async function onAttachFiles({ target: { files } }) {
 
 	fileUpload.upload();
 }
+
+
+async function saveFilesLocally(files) {
+	// Make sure the blob URL is set before saving
+	await sleep(10);
+
+	for (let file of files) {
+		let fileName = props.downloadName + "-" + fDateTime(null, { format: " M-d-yy h:mm a" });
+		if (file.name) {
+			fileName += "__" + file.name;
+		} else {
+			fileName += "." + (file.mime || file.type).split("/").pop() || "jpg";
+		}
+		console.log("downloading ", fileName);
+		await downloadFile(file.blobUrl, fileName);
+		console.log("downloaded");
+	}
+}
 </script>

package/src/helpers/FileUpload.ts

@@ -1,5 +1,6 @@
 import { uid } from "quasar";
 import { danxOptions } from "../config";
+import { sleep } from "../helpers";
 import { resolveFileLocation } from "./files";
 import { FlashMessages } from "./FlashMessages";
 
@@ -277,7 +278,16 @@ export class FileUpload {
 				console.log("calling presigned URL", presignedUrl);
 
 				// Fetch presigned upload URL
-				const fileResource = await fetch(presignedUrl).then(r => r.json());
+				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());
+				}
 
 				console.log("loaded presignedUrl: fileResource", fileResource);