quasar-ui-danx 0.4.61 → 0.4.68

package/package.json

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

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

@@ -175,6 +175,7 @@ const selectedOptions = computed(() => {
 		if (typeof v === "object") return v.value || v.id;
 		return v;
 	});
+
 	return computedOptions.value.filter((o) => {
 		return comparableValues.includes(o.value);
 	});
@@ -249,7 +250,7 @@ function resolveValue(option) {
 	if (!option || typeof option === "string") {
 		return option;
 	}
-	let value = option.value || option.id;
+	let value = option.value !== undefined ? option.value : option.id;
 	if (typeof props.optionValue === "string") {
 		value = option[props.optionValue];
 	} else if (typeof props.optionValue === "function") {

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="group flex items-center flex-nowrap gap-x-1 relative">
+  <div class="group flex items-center flex-nowrap gap-x-2 relative">
     <ShowHideButton
       v-if="selectable"
       v-model="isSelecting"
@@ -8,7 +8,6 @@
       :saving="loading"
       :class="selectClass"
       :show-icon="selectIcon || DefaultSelectIcon"
-      class="mr-2"
       :size="size"
     >
       <QMenu
@@ -19,14 +18,14 @@
         <div>
           <div
             v-for="option in optionsPlusSelected"
-            :key="option.id"
+            :key="getId(option)"
             v-ripple
             class="cursor-pointer flex items-center relative"
-            :class="{'bg-sky-900 hover:bg-sky-800': selected?.id === option.id, 'hover:bg-slate-600': selected?.id !== option.id}"
-            @click="selected = option"
+            :class="{'bg-sky-900 hover:bg-sky-800': getId(selected) === getId(option), 'hover:bg-slate-600': getId(selected) !== getId(option)}"
+            @click="selected = selectionType === 'object' ? option : getId(option)"
           >
             <div class="flex-grow px-4 py-2">
-              {{ option.name }}
+              {{ getName(option) }}
             </div>
             <ActionButton
               v-if="deletable"
@@ -58,12 +57,12 @@
       <template v-if="selected">
         <EditableDiv
           v-if="nameEditable"
-          :model-value="selected.name"
+          :model-value="getName(selected)"
           color="slate-600"
           @update:model-value="name => $emit('update', {name})"
         />
         <template v-else>
-          {{ selected.name }}
+          {{ getName(selected) }}
         </template>
       </template>
       <template v-else>
@@ -104,16 +103,17 @@ import {
 	FaSolidPencil as EditIcon
 } from "danx-icon";
 import { computed, ref } from "vue";
-import { ActionTargetItem } from "../../../../types";
+import { ActionTargetItem, LabelValueItem } from "../../../../types";
 import { ShowHideButton } from "../../../Utility/Buttons";
 import { ActionButtonProps, default as ActionButton } from "../../../Utility/Buttons/ActionButton";
 import EditableDiv from "./EditableDiv";
 
 defineEmits(["create", "update", "delete"]);
-const selected = defineModel<ActionTargetItem | null>("selected");
+const selected = defineModel<ActionTargetItem | string | null>("selected");
 const editing = defineModel<boolean>("editing");
 const props = withDefaults(defineProps<{
-	options: ActionTargetItem[];
+	options: ActionTargetItem[] | LabelValueItem[];
+	selectionType?: "object" | "string";
 	showEdit?: boolean;
 	loading?: boolean;
 	selectText?: string;
@@ -137,6 +137,7 @@ const props = withDefaults(defineProps<{
 	editDisabled?: boolean;
 	size?: ActionButtonProps["size"];
 }>(), {
+	selectionType: "object",
 	selectText: "",
 	createText: "",
 	editText: "",
@@ -154,8 +155,32 @@ const props = withDefaults(defineProps<{
 const isSelecting = ref(false);
 
 // If the selected option is not in the options list, it should be added in
-const optionsPlusSelected = computed(() => {
-	if (!selected.value || props.options.find((o) => o.id === selected.value?.id)) return props.options;
+const optionsPlusSelected = computed<ActionTargetItem[]>(() => {
+	if (!selected.value || props.options.find((o) => getId(o) === getId(selected.value))) return props.options;
 	return [selected.value, ...props.options];
 });
+
+function resolveOption(option) {
+	if (typeof option === "object") {
+		return option;
+	}
+
+	return props.options.find((o) => {
+		if (typeof o === "object") {
+			return getId(o) === option;
+		}
+		return o === option;
+	});
+}
+
+function getId(option) {
+	option = resolveOption(option);
+
+	return option?.id || option?.value || option?.name || option;
+}
+
+function getName(option) {
+	option = resolveOption(option);
+	return option?.name || option?.label || option?.value || option;
+}
 </script>

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

@@ -62,6 +62,7 @@ import {
 	FaSolidCopy as CopyIcon,
 	FaSolidFileExport as ExportIcon,
 	FaSolidFileImport as ImportIcon,
+	FaSolidFolder as FolderIcon,
 	FaSolidMinus as MinusIcon,
 	FaSolidPause as PauseIcon,
 	FaSolidPencil as EditIcon,
@@ -74,7 +75,7 @@ import { computed, ref } from "vue";
 import { ActionTarget, ResourceAction } from "../../../types";
 
 export interface ActionButtonProps {
-	type?: "trash" | "create" | "edit" | "copy" | "play" | "stop" | "pause" | "refresh" | "confirm" | "cancel" | "export" | "import" | "minus";
+	type?: "trash" | "create" | "edit" | "copy" | "folder" | "play" | "stop" | "pause" | "refresh" | "confirm" | "cancel" | "export" | "import" | "minus";
 	color?: "red" | "blue" | "sky" | "sky-invert" | "green" | "green-invert" | "lime" | "white" | "gray" | "yellow" | "orange";
 	size?: "xxs" | "xs" | "sm" | "md" | "lg";
 	icon?: object | string;
@@ -190,6 +191,8 @@ const typeOptions = computed(() => {
 			return { icon: EditIcon };
 		case "copy":
 			return { icon: CopyIcon };
+		case "folder":
+			return { icon: FolderIcon };
 		case "play":
 			return { icon: PlayIcon };
 		case "stop":

package/src/helpers/request.ts

@@ -94,9 +94,12 @@ export const request: RequestApi = {
 
 	async poll(url: string, options, interval, fnUntil) {
 		let response;
+		if (!fnUntil) {
+			fnUntil = (response: HttpResponse) => !!response;
+		}
 		do {
 			response = await request.call(url, options);
-			await sleep(interval);
+			await sleep(interval || 1000);
 		} while (!fnUntil(response));
 
 		return response;

package/src/helpers/routes.ts

@@ -59,8 +59,7 @@ export function useActionRoutes(baseUrl: string, extend?: object): ListControlsR
 				ignoreAbort: true,
 				headers: {
 					...options?.headers,
-					// @ts-expect-error This header is fine
-					"X-Timestamp": Date.now()
+					"X-Timestamp": Date.now().toString()
 				}
 			};
 			data = data || {};

package/src/types/actions.d.ts

@@ -1,8 +1,8 @@
-import { FilterGroup, ListController, ListControlsRoutes } from "src/types/controls";
-import { FormField } from "src/types/forms";
-import { TableColumn } from "src/types/tables";
 import { ComputedRef, Ref, ShallowRef, VNode } from "vue";
+import { FilterGroup, ListController, ListControlsRoutes } from "./controls";
+import { FormField } from "./forms";
 import { AnyObject, TypedObject } from "./shared";
+import { TableColumn } from "./tables";
 
 export interface ActionTargetItem extends TypedObject {
 	isSaving?: boolean;

package/src/types/controls.d.ts

@@ -1,5 +1,5 @@
-import { RequestCallOptions } from "src/types/requests";
 import { ComputedRef, Ref, ShallowRef } from "vue";
+import { RequestCallOptions } from "../types";
 import { ActionOptions, ActionTargetItem, ResourceAction } from "./actions";
 import { AnyObject, LabelValueItem } from "./shared";
 

package/src/types/requests.d.ts

@@ -11,7 +11,7 @@ export interface RequestApi {
 
 	post(url: string, data?: object, options?: RequestCallOptions): Promise<any>;
 
-	poll(url: string, options?: RequestCallOptions, interval: number, fnUntil: (response) => boolean): Promise<any>;
+	poll(url: string, options?: RequestCallOptions, interval?: number, fnUntil?: (response) => boolean): Promise<any>;
 }
 
 export interface HttpResponse {

package/tsconfig.json

@@ -1,11 +0,0 @@
-{
-  "extends": "./tsconfig.build.json",
-  "compilerOptions": {
-    "paths": {
-      "vue": [
-        "../../gpt-manager/spa/node_modules/vue"
-      ]
-    }
-  }
-}
-