quasar-ui-danx 0.4.31 → 0.4.32

package/package.json

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

package/src/components/ActionTable/controls.ts

@@ -72,7 +72,7 @@ export function useControls(name: string, options: ListControlsOptions): ListCon
 	}
 
 	async function loadList() {
-		if (!isInitialized) return;
+		if (!isInitialized || options.isListEnabled === false) return;
 		// isLoadingList.value = true;
 		try {
 			setPagedItems(await options.routes.list(pager.value));
@@ -84,7 +84,7 @@ export function useControls(name: string, options: ListControlsOptions): ListCon
 	}
 
 	async function loadSummary() {
-		if (!options.routes.summary || !isInitialized) return;
+		if (!options.routes.summary || !isInitialized || options.isSummaryEnabled === false) return;
 
 		isLoadingSummary.value = true;
 		const summaryFilter: ListControlsFilter = { id: null, ...activeFilter.value, ...globalFilter.value };
@@ -115,7 +115,8 @@ export function useControls(name: string, options: ListControlsOptions): ListCon
 	 * Loads the filter field options for the current filter.
 	 */
 	async function loadFieldOptions() {
-		if (!options.routes.fieldOptions) return;
+		if (!options.routes.fieldOptions || options.isFieldOptionsEnabled === false) return;
+
 		isLoadingFilters.value = true;
 		try {
 			fieldOptions.value = await options.routes.fieldOptions(activeFilter.value) || {};
@@ -207,7 +208,7 @@ export function useControls(name: string, options: ListControlsOptions): ListCon
 	 * Loads more items into the list.
 	 */
 	async function loadMore(index: number, perPage: number | undefined = undefined) {
-		if (!options.routes.more) return false;
+		if (!options.routes.more || options.isListEnabled === false) return false;
 
 		try {
 			const newItems = await options.routes.more({
@@ -296,7 +297,7 @@ export function useControls(name: string, options: ListControlsOptions): ListCon
 	async function getActiveItemDetails() {
 		try {
 			const latestResult = latestCallOnly("active-item", async () => {
-				if (!activeItem.value || !options.routes.details) return undefined;
+				if (!activeItem.value || !options.routes.details || options.isDetailsEnabled === false) return undefined;
 				return await options.routes.details(activeItem.value);
 			});
 
@@ -414,12 +415,22 @@ export function useControls(name: string, options: ListControlsOptions): ListCon
 		options.routes.export && await options.routes.export(filter);
 	}
 
+	function setOptions(newOptions: Partial<ListControlsOptions>) {
+		options = { ...options, ...newOptions };
+	}
+
 	// Initialize the list actions and load settings, lists, summaries, filter fields, etc.
-	function initialize() {
+	function initialize(updateOptions?: Partial<ListControlsOptions>) {
 		const vueRouter = getVueRouter();
 		isInitialized = true;
+
+		if (updateOptions) {
+			options = { ...options, ...updateOptions };
+		}
+
 		loadSettings();
 
+
 		/**
 		 * Watch the id params in the route and set the active item to the item with the given id.
 		 */
@@ -496,6 +507,7 @@ export function useControls(name: string, options: ListControlsOptions): ListCon
 
 		// List controls
 		initialize,
+		setOptions,
 		resetPaging,
 		setPagination,
 		setSelectedRows,

package/src/helpers/actions.ts

@@ -133,7 +133,19 @@ export function useActions(actions: ActionOptions[], globalOptions: ActionGlobal
 				activeActionVnode.value = {
 					vnode,
 					confirm: async (confirmInput: any) => {
-						const result = await onConfirmAction(action, target, { ...input, ...confirmInput });
+
+						// Resolve the input based on the useInputFromConfirm option
+						// Not setting useInputFromConfirm will merge the input from the confirm dialog with the input from the action
+						let resolvedInput;
+						if (action.useInputFromConfirm === false) {
+							resolvedInput = input;
+						} else if (action.useInputFromConfirm === true) {
+							resolvedInput = confirmInput;
+						} else {
+							resolvedInput = { ...input, ...confirmInput };
+						}
+
+						const result = await onConfirmAction(action, target, resolvedInput);
 
 						// Only resolve when we have a non-error response, so we can show the error message w/o
 						// hiding the dialog / vnode

package/src/helpers/objectStore.ts

@@ -19,6 +19,10 @@ export function storeObjects<T extends TypedObject>(newObjects: T[]) {
  * Returns the stored object that should be used instead of the passed object as the returned object is shared across the system
  */
 export function storeObject<T extends TypedObject>(newObject: T, recentlyStoredObjects: AnyObject = {}): ShallowReactive<T> {
+	if (typeof newObject !== "object") {
+		return newObject;
+	}
+	
 	const id = newObject?.id || newObject?.name;
 	const type = newObject?.__type;
 	if (!id || !type) return shallowReactive(newObject);
@@ -76,9 +80,31 @@ export function storeObject<T extends TypedObject>(newObject: T, recentlyStoredO
 		store.set(objectKey, reactiveObject);
 	}
 
+	if (reactiveObject.__deleted_at) {
+		removeObjectFromLists(reactiveObject);
+	}
+
 	return reactiveObject;
 }
 
+/**
+ * Remove an object from all lists in the store
+ */
+function removeObjectFromLists<T extends TypedObject>(object: T) {
+	for (const storedObject of store.values()) {
+		for (const key of Object.keys(storedObject)) {
+			const value = storedObject[key];
+			if (Array.isArray(value) && value.length > 0) {
+				const index = value.findIndex(v => v.__id === object.__id && v.__type === object.__type);
+				if (index !== -1) {
+					value.splice(index, 1);
+					storedObject[key] = [...value];
+				}
+			}
+		}
+	}
+}
+
 /**
  * Auto refresh an object based on a condition and a callback. Returns the timeout ID for the auto-refresh.
  * NOTE: Use the timeout ID to clear the auto-refresh when the object is no longer needed (eg: when the component is unmounted)
@@ -101,9 +127,8 @@ export async function autoRefreshObject<T extends TypedObject>(object: T, condit
 		storeObject(refreshedObject);
 	}
 
-
+	// Save the timeoutId to the object so it can be cleared when the object refresh is no longer needed
 	const timeoutId = setTimeout(() => autoRefreshObject(object, condition, callback, interval), interval);
-
 	registeredAutoRefreshes[object.__type + ":" + object.id] = timeoutId;
 }
 

package/src/helpers/request.ts

@@ -35,6 +35,18 @@ export const request: RequestApi = {
 			options.signal = abort.signal;
 		}
 
+		if (options.params) {
+			// Transform object values in params to JSON strings
+			for (const [key, value] of Object.entries(options.params)) {
+				if (typeof value === "object" && value !== null) {
+					options.params[key] = JSON.stringify(value);
+				}
+			}
+			
+			url += (url.match(/\?/) ? "&" : "?") + new URLSearchParams(options.params).toString();
+			delete options.params;
+		}
+
 		const response = await fetch(request.url(url), options);
 
 		// Verify the app version of the client and server are matching

package/src/types/actions.d.ts

@@ -32,6 +32,7 @@ export interface ActionOptions<T = ActionTargetItem> {
 	category?: string;
 	class?: string;
 	debounce?: number;
+	useInputFromConfirm?: boolean;
 	optimistic?: boolean | ((action: ActionOptions<T>, target: T | null, input: any) => void);
 	vnode?: (target: ActionTarget<T>, data: any) => VNode | any;
 	enabled?: (target: ActionTarget<T>) => boolean;

package/src/types/controls.d.ts

@@ -47,6 +47,10 @@ export interface ListControlsOptions {
 	urlPattern?: RegExp | null;
 	filterDefaults?: Record<string, object>;
 	refreshFilters?: boolean;
+	isListEnabled?: boolean;
+	isSummaryEnabled?: boolean;
+	isDetailsEnabled?: boolean;
+	isFieldOptionsEnabled?: boolean;
 }
 
 export interface ListControlsPagination {
@@ -92,7 +96,8 @@ export interface ListController<T = ActionTargetItem> {
 	activePanel: Ref<string | null>;
 
 	// List Controls
-	initialize: () => void;
+	initialize: (updateOptions?: Partial<ListControlsOptions>) => void;
+	setOptions: (updateOptions: Partial<ListControlsOptions>) => void;
 	resetPaging: () => void;
 	setPagination: (updated: Partial<ListControlsPagination>) => void;
 	setSelectedRows: (selection: T[]) => void;

package/src/types/requests.d.ts

@@ -31,5 +31,6 @@ export interface RequestOptions {
 
 export interface RequestCallOptions extends RequestInit {
 	abortOn?: string;
+	params?: AnyObject;
 }