quasar-ui-danx 0.4.68 → 0.4.69

package/package.json

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

package/src/helpers/actions.ts

@@ -1,7 +1,7 @@
 import { useDebounceFn } from "@vueuse/core";
 import { FaSolidCopy as CopyIcon, FaSolidPencil as EditIcon, FaSolidTrash as DeleteIcon } from "danx-icon";
 import { uid } from "quasar";
-import { h, isReactive, Ref, shallowReactive, shallowRef } from "vue";
+import { h, Ref, shallowRef } from "vue";
 import { ConfirmActionDialog, CreateNewWithNameDialog } from "../components";
 import type {
 	ActionGlobalOptions,
@@ -55,39 +55,27 @@ export function useActions(actions: ActionOptions[], globalOptions: ActionGlobal
 	 */
 	function getAction(actionName: string, actionOptions?: Partial<ActionOptions>): ResourceAction {
 		/// Resolve the action options or resource action based on the provided input
-		let resourceAction: Partial<ResourceAction> = actions.find(a => a.name === actionName) || { name: actionName };
-
-		if (actionOptions) {
-			Object.assign(resourceAction, actionOptions);
-		}
+		const baseOptions: Partial<ResourceAction> = actions.find(a => a.name === actionName) || { name: actionName };
 
 		// If the action is already reactive, return it
-		if (!isReactive(resourceAction) || !("__type" in resourceAction)) {
-			resourceAction = storeObject({
-				onAction: globalOptions?.routes?.applyAction,
-				onBatchAction: globalOptions?.routes?.batchAction,
-				onBatchSuccess: globalOptions?.controls?.clearSelectedRows,
-				...globalOptions,
-				...resourceAction,
-				isApplying: false,
-				__type: "__Action:" + namespace
-			});
-
-			// Splice the resourceAction in place of the action in the actions list
-			actions.splice(actions.findIndex(a => a.name === actionName), 1, resourceAction as ResourceAction);
-		}
-
-		// Return a clone of the action so it can be modified without affecting the original
-		const clonedAction = shallowReactive({ ...resourceAction }) as ResourceAction;
+		const resourceAction = storeObject({
+			onAction: globalOptions?.routes?.applyAction,
+			onBatchAction: globalOptions?.routes?.batchAction,
+			onBatchSuccess: globalOptions?.controls?.clearSelectedRows,
+			...baseOptions,
+			...actionOptions,
+			isApplying: false,
+			__type: "__Action:" + namespace
+		}) as ResourceAction;
 
 		// Assign Trigger function if it doesn't exist
-		if (clonedAction.debounce) {
-			clonedAction.trigger = useDebounceFn((target, input) => performAction(clonedAction, target, input), clonedAction.debounce);
+		if (resourceAction.debounce) {
+			resourceAction.trigger = useDebounceFn((target, input) => performAction(resourceAction, target, input), resourceAction.debounce);
 		} else {
-			clonedAction.trigger = (target, input) => performAction(clonedAction, target, input);
+			resourceAction.trigger = (target, input) => performAction(resourceAction, target, input);
 		}
 
-		return clonedAction;
+		return resourceAction;
 	}
 
 	/**

package/src/helpers/request.ts

@@ -8,7 +8,7 @@ import { sleep } from "./utils";
  * to make GET and POST requests easier w/ JSON payloads
  */
 export const request: RequestApi = {
-	abortControllers: {},
+	activeRequests: {},
 
 	url(url) {
 		if (url.startsWith("http")) {
@@ -19,20 +19,27 @@ export const request: RequestApi = {
 
 	async call(url, options) {
 		options = options || {};
-		const abortKey = options?.abortOn !== undefined ? options.abortOn : url + JSON.stringify(options.params || "");
+		const requestKey = options?.requestKey || url + JSON.stringify(options.params || "");
+		const waitOnPrevious = !!options?.waitOnPrevious;
+		const shouldAbort = !waitOnPrevious;
 		const timestamp = Date.now();
 
-		if (abortKey) {
-			const abort = new AbortController();
-			const previousAbort = request.abortControllers[abortKey];
+		// If there was a request with the same key made that is still active, track that here
+		const previousRequest = request.activeRequests[requestKey];
+
+		// Set the current active request to this one
+		request.activeRequests[requestKey] = { timestamp };
+
+		if (shouldAbort) {
 			// If there is already an abort controller set for this key, abort it
-			if (previousAbort) {
-				previousAbort.abort.abort("Request was aborted due to a newer request being made");
+			if (previousRequest) {
+				previousRequest.abortController?.abort("Request was aborted due to a newer request being made");
 			}
 
+			const abortController = new AbortController();
 			// Set the new abort controller for this key
-			request.abortControllers[abortKey] = { abort, timestamp };
-			options.signal = abort.signal;
+			request.activeRequests[requestKey].abortController = abortController;
+			options.signal = abortController.signal;
 		}
 
 		if (options.params) {
@@ -49,7 +56,14 @@ export const request: RequestApi = {
 
 		let response = null;
 		try {
-			response = await fetch(request.url(url), options);
+			// If there is a previous request still active, wait for it to finish before proceeding (if the waitForPrevious flag is set)
+			if (waitOnPrevious && previousRequest?.requestPromise) {
+				await previousRequest.requestPromise;
+			}
+
+			const requestPromise = fetch(request.url(url), options);
+			request.activeRequests[requestKey].requestPromise = requestPromise;
+			response = await requestPromise;
 		} catch (e) {
 			if (options.ignoreAbort && (e + "").match(/Request was aborted/)) {
 				return { abort: true };
@@ -61,15 +75,18 @@ export const request: RequestApi = {
 		checkAppVersion(response);
 
 		// handle the case where the request was aborted too late, and we need to abort the response via timestamp check
-		if (abortKey) {
+		if (shouldAbort) {
 			// If the request was aborted too late, but there was still another request that was made after the current,
 			// then abort the current request with an abort flag
-			if (timestamp < request.abortControllers[abortKey].timestamp) {
+			if (timestamp < request.activeRequests[requestKey].timestamp) {
 				return { abort: true };
 			}
+		}
 
-			// Otherwise, the current is the most recent request, so we can delete the abort controller
-			delete request.abortControllers[abortKey];
+		// If this request is the active request for the requestKey, we can clear this key from active requests
+		if (request.activeRequests[requestKey].timestamp === timestamp) {
+			// Remove the request from the active requests list
+			delete request.activeRequests[requestKey];
 		}
 
 		const result = await response.json();

package/src/helpers/routes.ts

@@ -56,7 +56,7 @@ export function useActionRoutes(baseUrl: string, extend?: object): ListControlsR
 		async applyAction(action, target, data, options?) {
 			options = {
 				...options,
-				ignoreAbort: true,
+				waitOnPrevious: true,
 				headers: {
 					...options?.headers,
 					"X-Timestamp": Date.now().toString()
@@ -86,7 +86,7 @@ export function useActionRoutes(baseUrl: string, extend?: object): ListControlsR
 		batchAction(action, targets, data, options?) {
 			options = {
 				...options,
-				ignoreAbort: true
+				waitOnPrevious: true
 			};
 			return request.post(`${baseUrl}/batch-action`, { action, filter: { id: targets.map(r => r.id) }, data }, options);
 		},

package/src/types/requests.d.ts

@@ -1,7 +1,9 @@
 import { AnyObject } from "./shared";
 
 export interface RequestApi {
-	abortControllers: { [key: string]: { abort: AbortController, timestamp: number } };
+	activeRequests: {
+		[key: string]: { requestPromise?: Promise<any>, abortController?: AbortController, timestamp: number }
+	};
 
 	url(url: string): string;
 
@@ -30,7 +32,8 @@ export interface RequestOptions {
 }
 
 export interface RequestCallOptions extends RequestInit {
-	abortOn?: string;
+	requestKey?: string;
+	waitOnPrevious?: boolean;
 	ignoreAbort?: boolean;
 	params?: AnyObject;
 }