quasar-ui-danx 0.4.33 → 0.4.36

package/package.json

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

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

@@ -154,7 +154,7 @@ const selectedValue = computed(() => {
 	} else {
 		if (props.modelValue === null) return "__null__";
 
-		if (props.selectByObject) return props.modelValue.value || props.modelValue.id;
+		if (props.selectByObject) return props.modelValue?.value || props.modelValue?.id;
 
 		return props.modelValue;
 	}

package/src/components/ActionTable/controls.ts

@@ -73,7 +73,7 @@ export function useControls(name: string, options: ListControlsOptions): ListCon
 
 	async function loadList() {
 		if (!isInitialized || options.isListEnabled === false) return;
-		// isLoadingList.value = true;
+		isLoadingList.value = true;
 		try {
 			setPagedItems(await options.routes.list(pager.value));
 		} catch (e) {

package/src/helpers/formats.ts

@@ -29,40 +29,6 @@ export function remoteDateTime(dateTimeString: string) {
 	return DateTime.fromSQL(dateTimeString, { zone: "local" }).setZone(SERVER_TZ);
 }
 
-/**
- * Parses a date string into a Luxon DateTime object
- */
-export function parseDateTime(dateTime: string | DateTime | null): DateTime<boolean> | null {
-	if (typeof dateTime === "string") {
-		return parseSqlDateTime(dateTime) || parseQDate(dateTime) || parseQDateTime(dateTime);
-	}
-	return dateTime || DateTime.fromSQL("0000-00-00 00:00:00");
-}
-
-/**
- *  Parses a SQL formatted date string into a Luxon DateTime object
- */
-export function parseSqlDateTime(dateTime: string) {
-	const parsed = DateTime.fromSQL(dateTime.replace("T", " ").replace(/\//g, "-"));
-	return parsed.isValid ? parsed : null;
-}
-
-/**
- * Parses a Quasar formatted date string into a Luxon DateTime object
- */
-export function parseQDate(date: string, format = "yyyy/MM/dd"): DateTime<boolean> | null {
-	const parsed = DateTime.fromFormat(date, format);
-	return parsed.isValid ? parsed : null;
-}
-
-/**
- * Parses a Quasar formatted date/time string into a Luxon DateTime object
- */
-export function parseQDateTime(date: string, format = "yyyy/MM/dd HH:mm:ss"): DateTime<boolean> | null {
-	const parsed = DateTime.fromFormat(date, format);
-	return parsed.isValid ? parsed : null;
-}
-
 /**
  * Formats a Luxon DateTime object into a Quasar formatted date string
  * @param date
@@ -119,6 +85,89 @@ export function fDate(dateTime: string | DateTime | null, { empty = "--", format
 	return formatted || empty;
 }
 
+
+/**
+ * Parses a date string into a Luxon DateTime object
+ */
+export function parseDateTime(dateTime: string | DateTime | null): DateTime<boolean> | null {
+	if (typeof dateTime === "string") {
+		return parseGenericDateTime(dateTime);
+	}
+	return dateTime || DateTime.fromSQL("0000-00-00 00:00:00");
+}
+
+/**
+ *  Parses a SQL formatted date string into a Luxon DateTime object
+ */
+export function parseSqlDateTime(dateTime: string) {
+	const parsed = DateTime.fromSQL(dateTime.replace("T", " ").replace(/\//g, "-"));
+	return parsed.isValid ? parsed : null;
+}
+
+/**
+ * Parses a Quasar formatted date string into a Luxon DateTime object
+ */
+export function parseQDate(date: string, format = "yyyy/MM/dd"): DateTime<boolean> | null {
+	const parsed = DateTime.fromFormat(date, format);
+	return parsed.isValid ? parsed : null;
+}
+
+/**
+ * Parses a Quasar formatted date/time string into a Luxon DateTime object
+ */
+export function parseQDateTime(date: string, format = "yyyy/MM/dd HH:mm:ss"): DateTime<boolean> | null {
+	const parsed = DateTime.fromFormat(date, format);
+	return parsed.isValid ? parsed : null;
+}
+
+/**
+ * Parses a date string in various formats into a Luxon DateTime object.
+ * Tries a list of common formats until one works.
+ *
+ * @param {string} dateTimeString - The date string to parse.
+ * @param {string} [defaultZone="local"] - The default time zone to use if not specified.
+ * @returns {DateTime | null} - A Luxon DateTime object if parsing succeeds, otherwise null.
+ */
+export function parseGenericDateTime(dateTimeString: string, defaultZone = "local"): DateTime | null {
+	if (!dateTimeString) return null;
+
+	const formats = [
+		"yyyy-MM-dd",            // ISO date
+		"yyyy-MM-dd HH:mm:ss",   // ISO date with time
+		"MM/dd/yyyy",            // US-style date
+		"dd/MM/yyyy",            // European-style date
+		"MM/dd/yy",              // US short date
+		"dd/MM/yy",              // European short date
+		"yyyy/MM/dd",            // Alternative ISO
+		"MM-dd-yyyy",            // US with dashes
+		"dd-MM-yyyy",            // European with dashes
+		"M/d/yyyy",              // US date without leading zeros
+		"d/M/yyyy",              // European date without leading zeros
+		"yyyyMMdd"              // Compact ISO
+	];
+
+	for (const format of formats) {
+		const parsed = DateTime.fromFormat(dateTimeString, format, { zone: defaultZone });
+		if (parsed.isValid) {
+			return parsed;
+		}
+	}
+
+	// Fallback to ISO parsing for strings like "2022-11-18T10:10:10Z"
+	const isoParsed = DateTime.fromISO(dateTimeString, { zone: defaultZone });
+	if (isoParsed.isValid) {
+		return isoParsed;
+	}
+
+	// Fallback to SQL parsing for strings like "2022-11-18 10:10:10"
+	const sqlParsed = DateTime.fromSQL(dateTimeString, { zone: defaultZone });
+	if (sqlParsed.isValid) {
+		return sqlParsed;
+	}
+
+	return null;
+}
+
 /**
  * Formats a number of seconds into Hours / Minutes / Seconds or just Minutes and Seconds
  *

package/src/helpers/routes.ts

@@ -11,15 +11,11 @@ export function useActionRoutes(baseUrl: string, extend?: object): ListControlsR
 		summary(filter) {
 			return request.post(`${baseUrl}/summary`, { filter });
 		},
-		details(target) {
-			return request.get(`${baseUrl}/${target.id}/details`);
+		details(target, fields) {
+			return request.get(`${baseUrl}/${target.id}/details`, { params: { fields } });
 		},
-		async detailsAndStore(target) {
-			const item = await request.get(`${baseUrl}/${target.id}/details`);
-			return storeObject(item);
-		},
-		async relation(target, relation) {
-			const item = await request.get(`${baseUrl}/${target.id}/relation/${relation}`);
+		async detailsAndStore(target, fields) {
+			const item = await request.get(`${baseUrl}/${target.id}/details`, { params: { fields } });
 			return storeObject(item);
 		},
 		fieldOptions() {

package/src/types/controls.d.ts

@@ -24,11 +24,9 @@ export interface ListControlsRoutes<T = ActionTargetItem> {
 
 	summary?(filter?: ListControlsFilter): Promise<AnyObject>;
 
-	details?(target: T): Promise<T>;
+	details?(target: T, fields: ControlsFieldsList): Promise<T>;
 
-	detailsAndStore?(target: T): Promise<T>;
-
-	relation?(target: T, relation: string): Promise<T>;
+	detailsAndStore?(target: T, fields: ControlsFieldsList): Promise<T>;
 
 	more?(pager: ListControlsPagination): Promise<T[]>;
 
@@ -62,6 +60,11 @@ export interface ListControlsPagination {
 	rowsPerPage?: number;
 	perPage?: number;
 	filter?: ListControlsFilter;
+	fields?: ControlsFieldsList;
+}
+
+export interface ControlsFieldsList {
+	[key: string]: boolean | ControlsFieldsList;
 }
 
 export interface PagedItems<T = ActionTargetItem> {