quasar-ui-danx 0.4.54 → 0.4.55

package/package.json

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

package/src/components/Utility/Buttons/ActionButton.vue

@@ -10,7 +10,7 @@
       <component
         :is="icon || typeOptions.icon"
         class="transition-all"
-        :class="iconClass + ' ' + typeOptions.iconClass"
+        :class="resolvedIconClass"
       />
       <slot>
         <div
@@ -60,6 +60,8 @@ import {
 	FaSolidCircleCheck as ConfirmIcon,
 	FaSolidCircleXmark as CancelIcon,
 	FaSolidCopy as CopyIcon,
+	FaSolidFileExport as ExportIcon,
+	FaSolidFileImport as ImportIcon,
 	FaSolidPause as PauseIcon,
 	FaSolidPencil as EditIcon,
 	FaSolidPlay as PlayIcon,
@@ -71,7 +73,7 @@ import { computed, ref } from "vue";
 import { ActionTarget, ResourceAction } from "../../../types";
 
 export interface ActionButtonProps {
-	type?: "trash" | "trash-red" | "create" | "edit" | "copy" | "play" | "stop" | "pause" | "refresh" | "confirm" | "cancel";
+	type?: "trash" | "trash-red" | "create" | "edit" | "copy" | "play" | "stop" | "pause" | "refresh" | "confirm" | "cancel" | "export" | "import";
 	color?: "red" | "blue" | "sky" | "sky-invert" | "green" | "green-invert" | "lime" | "white" | "gray";
 	size?: "xxs" | "xs" | "sm" | "md" | "lg";
 	icon?: object | string;
@@ -160,64 +162,37 @@ const colorClass = computed(() => {
 			return "";
 	}
 });
+
+const resolvedIconClass = computed(() => props.iconClass + " " + mappedSizeClass[props.size].icon);
+
 const typeOptions = computed(() => {
-	const iconClass = mappedSizeClass[props.size].icon;
 	switch (props.type) {
 		case "trash":
-			return {
-				icon: TrashIcon,
-				iconClass
-			};
+			return { icon: TrashIcon };
+		case "export":
+			return { icon: ExportIcon };
+		case "import":
+			return { icon: ImportIcon };
 		case "create":
-			return {
-				icon: CreateIcon,
-				iconClass
-			};
+			return { icon: CreateIcon };
 		case "confirm":
-			return {
-				icon: ConfirmIcon,
-				iconClass
-			};
+			return { icon: ConfirmIcon };
 		case "cancel":
-			return {
-				icon: CancelIcon,
-				iconClass
-			};
+			return { icon: CancelIcon };
 		case "edit":
-			return {
-				icon: EditIcon,
-				iconClass
-			};
+			return { icon: EditIcon };
 		case "copy":
-			return {
-				icon: CopyIcon,
-				iconClass
-			};
+			return { icon: CopyIcon };
 		case "play":
-			return {
-				icon: PlayIcon,
-				iconClass
-			};
+			return { icon: PlayIcon };
 		case "stop":
-			return {
-				icon: StopIcon,
-				iconClass
-			};
+			return { icon: StopIcon };
 		case "pause":
-			return {
-				icon: PauseIcon,
-				iconClass
-			};
+			return { icon: PauseIcon };
 		case "refresh":
-			return {
-				icon: RefreshIcon,
-				iconClass
-			};
+			return { icon: RefreshIcon };
 		default:
-			return {
-				icon: EditIcon,
-				iconClass
-			};
+			return { icon: EditIcon };
 	}
 });
 

package/src/helpers/FileUpload.ts

@@ -1,5 +1,6 @@
 import { uid } from "quasar";
 import { danxOptions } from "../config";
+import { DateTime, parseDateTime } from "../helpers/formats";
 import {
 	FileUploadAllCompleteCallback,
 	FileUploadCompleteCallback,
@@ -278,11 +279,15 @@ export class FileUpload {
 	 */
 	isTranscoding(file: UploadedFile) {
 		const metaTranscodes = file?.meta?.transcodes || [];
-
 		for (const transcodeName of Object.keys(metaTranscodes)) {
 			const transcode = metaTranscodes[transcodeName];
+
 			if (transcode.status === "Pending" || transcode.status === "In Progress") {
-				return true;
+				const startedAt = parseDateTime(transcode.started_at);
+				const duration = startedAt && DateTime.now().diff(startedAt, "minutes");
+				if (!duration?.minutes || duration.minutes < 30) {
+					return true;
+				}
 			}
 		}
 		return false;

package/src/helpers/importFile.ts

@@ -0,0 +1,20 @@
+import { AnyObject } from "../types";
+
+export function importJson(file: File): Promise<AnyObject> {
+	return new Promise((resolve, reject) => {
+		const reader = new FileReader();
+		let jsonData = null;
+
+		reader.onload = async (e) => {
+			try {
+				jsonData = JSON.parse(e.target?.result as string);
+				resolve(jsonData);
+			} catch (error) {
+				console.error("Invalid JSON file:", error);
+				reject(error);
+			}
+		};
+
+		reader.readAsText(file);
+	});
+}

package/src/helpers/index.ts

@@ -10,6 +10,7 @@ export * from "./FileUpload";
 export * from "./FlashMessages";
 export * from "./formats";
 export * from "./hotkeys";
+export * from "./importFile";
 export * from "./multiFileUpload";
 export * from "./objectStore";
 export * from "./request";