quasar-ui-danx 0.4.54 → 0.4.56

package/package.json

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

package/src/components/ActionTable/Form/ActionForm.vue

@@ -21,7 +21,7 @@ interface ActionFormProps {
 	form: Form;
 	noLabel?: boolean;
 	showName?: boolean;
-	disable?: boolean;
+	disabled?: boolean;
 	readonly?: boolean;
 	clearable?: boolean;
 	fieldClass?: string;
@@ -38,7 +38,7 @@ const renderedFormProps = {
 	form: props.form,
 	noLabel: props.noLabel,
 	showName: props.showName,
-	disable: props.disable,
+	disabled: props.disabled,
 	readonly: props.readonly,
 	clearable: props.clearable,
 	fieldClass: props.fieldClass,

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

@@ -2,7 +2,7 @@
   <QToggle
     :data-testid="'boolean-field-' + (name || label)"
     :model-value="modelValue || (toggleIndeterminate ? modelValue : false)"
-    :disable="disable || readonly"
+    :disable="disabled || readonly"
     :toggle-indeterminate="toggleIndeterminate"
     :indeterminate-value="undefined"
     @update:model-value="$emit('update:model-value', $event)"
@@ -40,7 +40,7 @@ defineProps({
 	},
 	showName: Boolean,
 	toggleIndeterminate: Boolean,
-	disable: Boolean,
+	disabled: Boolean,
 	readonly: Boolean
 });
 </script>

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

@@ -11,7 +11,7 @@
     />
 
     <input
-      v-if="!disable && !readonly"
+      v-if="!disabled && !readonly"
       ref="file"
       class="hidden"
       type="file"
@@ -29,11 +29,11 @@
         :file="file"
         :related-files="file.transcodes || uploadedFiles"
         downloadable
-        :removable="!readonly && !disable"
+        :removable="!readonly && !disabled"
         @remove="onRemove(file)"
       />
       <div
-        v-if="!disable && !readonly"
+        v-if="!disabled && !readonly"
         class="dx-add-remove-files m-2 flex flex-col flex-nowrap items-center overflow-hidden cursor-pointer"
         :class="filePreviewClass"
         :style="styleSize"
@@ -85,7 +85,7 @@ const props = withDefaults(defineProps<{
 	field?: FormField;
 	label?: string;
 	showName?: boolean;
-	disable?: boolean;
+	disabled?: boolean;
 	readonly?: boolean;
 	width?: number | string;
 	height?: number | string;

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

@@ -14,7 +14,7 @@
     <ShowHideButton
       v-if="showEdit"
       v-model="editing"
-      :disable="!canEdit"
+      :disabled="!canEdit"
       :label="editText"
       :class="editClass"
       :show-icon="EditIcon"

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

@@ -3,7 +3,7 @@
     <ShowHideButton
       v-if="selectable"
       v-model="isSelecting"
-      :disable="disable"
+      :disabled="disabled"
       :label="selectText"
       :saving="loading"
       :class="selectClass"
@@ -79,9 +79,11 @@
       :label="editText"
       :class="editClass"
       :size="size"
+      :disabled="editDisabled"
       class="opacity-0 group-hover:opacity-100 transition-all"
       :show-icon="EditIcon"
       :hide-icon="DoneEditingIcon"
+      :tooltip="editDisabled ? 'You are not allowed to edit' : ''"
     />
 
     <QBtn
@@ -132,7 +134,8 @@ withDefaults(defineProps<{
 	deletable?: boolean;
 	nameEditable?: boolean;
 	clearable?: boolean;
-	disable?: boolean;
+	disabled?: boolean;
+	editDisabled?: boolean;
 	size?: ActionButtonProps["size"];
 }>(), {
 	selectText: "",

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

@@ -13,7 +13,7 @@
       class="text-sm font-semibold"
     />
     <div
-      v-if="!disable && !readonly"
+      v-if="!disabled && !readonly"
       class="text-sm mt-2"
     >
       <a
@@ -39,7 +39,7 @@
       :class="{'border border-dashed border-blue-600': !uploadedFile, 'mx-auto': !readonly}"
       :file="uploadedFile || undefined"
       downloadable
-      @click="!disable && $refs.file.click()"
+      @click="!disabled && $refs.file.click()"
     />
     <div
       v-else-if="readonly"
@@ -63,7 +63,7 @@ const props = defineProps<{
 	label?: string;
 	name?: string;
 	showName?: boolean;
-	disable?: boolean;
+	disabled?: boolean;
 	readonly?: boolean;
 }>();
 const { onComplete, onDrop, onFileSelected, uploadedFile, clearUploadedFile } = useSingleFileUpload();

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

@@ -15,7 +15,7 @@
       v-else
       class="mt-2"
       :api-key="danxOptions.tinyMceApiKey"
-      :disabled="disable"
+      :disabled="disabled"
       :model-value="modelValue"
       @update:model-value="$emit('update:model-value', $event)"
     />
@@ -39,7 +39,7 @@ defineProps({
 	},
 	noLabel: Boolean,
 	showName: Boolean,
-	disable: Boolean,
+	disabled: Boolean,
 	readonly: Boolean
 });
 </script>

package/src/components/ActionTable/Form/RenderedForm.vue

@@ -27,7 +27,7 @@
               {{ name || "1" }}
             </div>
             <div
-              v-if="!disable && !readonly && canModifyVariations"
+              v-if="!disabled && !readonly && canModifyVariations"
               class="flex flex-nowrap items-center mr-2"
             >
               <a
@@ -86,7 +86,8 @@
           :no-label="noLabel"
           :show-name="showName"
           :clearable="field.clearable || clearable"
-          :disable="disable"
+          :disabled="disabled"
+          :disable="disabled"
           :readonly="readonly"
           @update:model-value="onInput(field.name, $event)"
         />
@@ -206,7 +207,8 @@ function getVnodeProps(field) {
 		label: field.label,
 		clearable: field.clearable || props.clearable,
 		readonly: props.readonly,
-		disable: props.disable,
+		disabled: props.disabled,
+		disable: props.disabled,
 		showName: props.showName,
 		noLabel: props.noLabel
 	};
@@ -225,7 +227,7 @@ const currentVariation = ref(variationNames.value[0] || "");
 const newVariationName = ref("");
 const variationToEdit = ref<boolean | string>(false);
 const variationToDelete = ref("");
-const canAddVariation = computed(() => props.canModifyVariations && !props.readonly && !props.disable && variationNames.value.length < (props.form.variations || 0));
+const canAddVariation = computed(() => props.canModifyVariations && !props.readonly && !props.disabled && variationNames.value.length < (props.form.variations || 0));
 
 function getFieldResponse(name: string, variation?: string) {
 	if (!fieldResponses.value) return undefined;

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/components/Utility/Dialogs/InfoDialog.vue

@@ -23,7 +23,7 @@
           :label="doneText"
           class="dx-dialog-button dx-dialog-button-done"
           :class="doneClass"
-          :disable="disable"
+          :disable="disabled"
           @click="onClose"
         >
           <slot name="done-text" />
@@ -40,7 +40,7 @@ import DialogLayout from "./DialogLayout";
 const emit = defineEmits(["update:model-value", "close"]);
 defineProps({
 	...DialogLayout.props,
-	disable: Boolean,
+	disabled: Boolean,
 	doneClass: {
 		type: [String, Object],
 		default: ""

package/src/components/Utility/Dialogs/RenderedFormDialog.vue

@@ -27,7 +27,7 @@ const props = defineProps<{
 	form: Form;
 	noLabel?: boolean;
 	showName?: boolean;
-	disable?: boolean;
+	disabled?: boolean;
 	readonly?: boolean;
 	clearable?: boolean;
 	fieldClass?: string;
@@ -41,7 +41,7 @@ const renderedFormProps = {
 	form: props.form,
 	noLabel: props.noLabel,
 	showName: props.showName,
-	disable: props.disable,
+	disabled: props.disabled,
 	readonly: props.readonly,
 	clearable: props.clearable,
 	fieldClass: props.fieldClass,

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";

package/src/types/forms.d.ts

@@ -44,7 +44,7 @@ export interface RenderedFormProps {
 	form: Form;
 	noLabel?: boolean;
 	showName?: boolean;
-	disable?: boolean;
+	disabled?: boolean;
 	readonly?: boolean;
 	saving?: boolean;
 	clearable?: boolean;