@onehat/data 1.22.13 → 1.22.16

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/data",
-	"version": "1.22.13",
+	"version": "1.22.16",
 	"description": "JS data modeling package with adapters for many storage mediums.",
 	"main": "src/index.js",
 	"type": "module",

package/src/Property/Currency.js

@@ -1,7 +1,7 @@
 /** @module Property */
 
 import Property from './Property.js';
-import accounting from 'accounting-js';
+import * as accounting from 'accounting-js';
 import _ from 'lodash';
 
 /**

package/src/Repository/Ajax.js

@@ -100,6 +100,11 @@ class AjaxRepository extends Repository {
 			 * @private
 			 */
 			isOnline: true,
+
+			/**
+			 * @member {boolean} disableLimitToOnlyOneLoadRequest - If true, disables automatic cancellation of duplicate load requests
+			 */
+			disableLimitToOnlyOneLoadRequest: false,
 			
 		};
 		_.merge(this, defaults, config);
@@ -119,6 +124,12 @@ class AjaxRepository extends Repository {
 		 * @private
 		 */
 		this._params = {};
+
+		/**
+		 * @member {Map} _activeLoadRequests - Map of active requests keyed by URL
+		 * @private
+		 */
+		this._activeLoadRequests = new Map();
 		
 		this._operations = {
 			add: false,
@@ -316,7 +327,23 @@ class AjaxRepository extends Repository {
 		if (!this.hasBaseParam(name)) {
 			return null;
 		}
-		return this._baseParams[name];
+
+		// Handle simple property access
+		if (this._baseParams.hasOwnProperty(name)) {
+			return this._baseParams[name];
+		}
+
+		// Handle array notation like "conditions[fleets__enterprise_id]"
+		const keys = name.split(/[\[\].]+/).filter(Boolean);
+		let current = this._baseParams;
+
+		for(const key of keys) {
+			if (!current || !current.hasOwnProperty(key)) {
+				return null;
+			}
+			current = current[key];
+		}
+		return current;
 	}
 
 	/**
@@ -332,7 +359,22 @@ class AjaxRepository extends Repository {
 	 * @param {string} name - Param name
 	 */
 	hasParam(name) {
-		return this._params.hasOwnProperty(name);
+		if (this._params.hasOwnProperty(name)) {
+			return true;
+		}
+
+		// Check for array notation
+		const keys = name.split(/[\[\].]+/).filter(Boolean);
+		let current = this._params,
+			key;
+
+		for(key of keys) {
+			if (!current || !current.hasOwnProperty(key)) {
+				return false;
+			}
+			current = current[key];
+		}
+		return true;
 	}
 
 	/**
@@ -439,6 +481,30 @@ class AjaxRepository extends Repository {
 			this.throwError('No "get" api endpoint defined.');
 			return;
 		}
+
+
+
+		if (!_.isNil(params) && _.isObject(params)) {
+			this.setParams(params);
+		}
+		const
+			url = this.getModel() + '/' + this.api.get,
+			data = _.merge({}, this._baseParams, this._params),
+			requestKey = this._generateRequestKey(url, data);
+
+		if (!this.disableLimitToOnlyOneLoadRequest && !this.isUnique) {
+			if (this._activeLoadRequests.has(requestKey)) {
+				// Identical request already in progress, ignore this one
+				if (this.debugMode) {
+					console.log('Ignoring duplicate load request for', url, data);
+				}
+				return;
+			}
+
+			// Cancel any existing request for the same URL but different params
+			this._cancelExistingRequestsForUrl(url, requestKey);
+		}
+
 		this.emit('beforeLoad'); // TODO: canceling beforeLoad will cancel the load operation
 		this.markLoading();
 
@@ -454,16 +520,9 @@ class AjaxRepository extends Repository {
 			this.resumeEvents();
 		}
 
-		if (!_.isNil(params) && _.isObject(params)) {
-			this.setParams(params);
-		}
-
-		const
-			repository = this,
-			url = this.getModel() + '/' + this.api.get,
-			data = _.merge({}, this._baseParams, this._params);
+		const repository = this;
 		
-		return this._send(this.methods.get, url, data)
+    return this._send(this.methods.get, url, data, { isLoadRequest: true, requestKey, })
 					.then(result => {
 						if (this.debugMode) {
 							console.log('Response for ' + this.name, result);
@@ -519,9 +578,69 @@ class AjaxRepository extends Repository {
 					})
 					.finally(() => {
 						this.markLoading(false);
+						if (!this.disableLimitToOnlyOneLoadRequest && !this.isUnique && requestKey) {
+							this._activeLoadRequests.delete(requestKey);
+						}
 					});
 	}
 
+	/**
+	 * Generates a unique key for a request based on URL and parameters
+	 * @param {string} url - The request URL
+	 * @param {object} data - The request parameters
+	 * @return {string} requestKey - Unique key for this URL+params combination
+	 * @private
+	 */
+	_generateRequestKey(url, data) {
+		const sortedData = this._sortObjectDeep(data);
+		return url + '::' + JSON.stringify(sortedData);
+	}
+
+	/**
+	 * Deep sorts an object by keys to ensure consistent hashing
+	 * @param {object} obj - Object to sort
+	 * @return {object} sortedObj - Object with keys sorted recursively
+	 * @private
+	 */
+	_sortObjectDeep(obj) {
+		if (_.isArray(obj)) {
+			return obj.map(item => this._sortObjectDeep(item));
+		} else if (_.isPlainObject(obj)) {
+			const sortedObj = {};
+			const sortedKeys = Object.keys(obj).sort();
+			for (const key of sortedKeys) {
+				sortedObj[key] = this._sortObjectDeep(obj[key]);
+			}
+			return sortedObj;
+		}
+		return obj;
+	}
+
+	/**
+	 * Cancels any existing requests for the same URL but different params
+	 * @param {string} url - The request URL
+	 * @param {string} currentRequestKey - The current request key to exclude from cancellation
+	 * @private
+	 */
+	_cancelExistingRequestsForUrl(url, currentRequestKey) {
+		const keysToCancel = [];
+		
+		// Find all requests for the same URL but different params
+		for (const [requestKey, requestInfo] of this._activeLoadRequests.entries()) {
+			if (requestKey !== currentRequestKey && requestKey.startsWith(url + '::')) {
+				keysToCancel.push(requestKey);
+				if (requestInfo.controller) {
+					requestInfo.controller.abort();
+				}
+			}
+		}
+		
+		// Remove cancelled requests from tracking
+		keysToCancel.forEach(key => {
+			this._activeLoadRequests.delete(key);
+		});
+	}
+
 	showMore(params = {}, callback) {
 		params.showMore = true;
 		return this.load(params, callback);
@@ -1009,7 +1128,7 @@ class AjaxRepository extends Repository {
 	 * Fires off axios request to server
 	 * @private
 	 */
-	_send(method, url, data) {
+	_send(method, url, data, options = {}) {
 
 		if (!url) {
 			this.throwError('No url submitted');
@@ -1021,12 +1140,19 @@ class AjaxRepository extends Repository {
 			return;
 		}
 
+		const controller = new AbortController();
+		const { signal } = controller;
+
+		if (options.isLoadRequest && !this.disableLimitToOnlyOneLoadRequest && !this.isUnique && options.requestKey) {
+			this._activeLoadRequests.set(options.requestKey, { controller });
+		}
+
 		const headers = _.merge({
 							'Content-Type': 'application/json',
 							'Accept': 'application/json',
-						}, this.headers);
+						}, this.headers, options.headers);
 
-		const options = {
+		const axiosOptions = {
 				url,
 				method,
 				baseURL: this.api.baseURL,
@@ -1035,22 +1161,34 @@ class AjaxRepository extends Repository {
 				params: method === 'GET' ? data : null,
 				data: method !== 'GET' ? qs.stringify(data) : null,
 				timeout: this.timeout,
+				signal,
 			};
 		
 		if (this.debugMode) {
-			console.log(url, options);
+			console.log(url, axiosOptions);
 		}
 		
-		this.lastSendOptions = options;
+		this.lastSendOptions = axiosOptions;
 		
-		return this.axios(options)
+		return this.axios(axiosOptions)
 					.catch(error => {
+						// Don't log or throw error if request was aborted
+						if (error.name === 'AbortError' || error.code === 'ERR_CANCELED') {
+							return Promise.reject(new Error('Request cancelled'));
+						}
+
 						if (this.debugMode) {
 							console.log(url + ' error', error);
 							console.log('response:', error.response);
 						}
 						this.throwError(error);
 						return;
+					})
+					.finally(() => {
+						// Clean up tracking for GET requests
+						if (options.isLoadRequest && !this.disableLimitToOnlyOneLoadRequest && !this.isUnique && options.requestKey) {
+							this._activeLoadRequests.delete(options.requestKey);
+						}
 					});
 	}
 

package/src/Repository/OneBuild.js

@@ -97,7 +97,7 @@ class OneBuildRepository extends AjaxRepository {
 	 * Fires off axios request to server
 	 * @private
 	 */
-	_send(method, url, data, headers) {
+	_send(method, url, data, options = {}) {
 
 		if (!url) {
 			this.throwError('No url submitted');
@@ -109,12 +109,20 @@ class OneBuildRepository extends AjaxRepository {
 			return;
 		}
 
+		// Create AbortController for this request
+		const controller = new AbortController();
+		const { signal } = controller;
+
+		if (options.isLoadRequest && !this.disableLimitToOnlyOneLoadRequest && !this.isUnique && options.requestKey) {
+			this._activeLoadRequests.set(options.requestKey, { controller });
+		}
+
 		const mergedHeaders = _.merge({
 							// 'Content-Type': 'application/json', // Stops axios from using 'application/x-www-form-urlencoded'
 							Accept: 'application/json',
-						}, this.headers, headers);
+						}, this.headers, options.headers);
 
-		const options = {
+		const axiosOptions = {
 				url,
 				method,
 				baseURL: this.api.baseURL,
@@ -123,16 +131,22 @@ class OneBuildRepository extends AjaxRepository {
 				params: method === 'GET' ? data : null,
 				data: method !== 'GET' ? qs.stringify(data) : null,
 				timeout: this.timeout,
+				signal,
 			};
 		
 		if (this.debugMode) {
-			console.log('Sending ' + url, options);
+			console.log('Sending ' + url, axiosOptions);
 		}
 		
-		this.lastSendOptions = options;
+		this.lastSendOptions = axiosOptions;
 		
-		return this.axios(options)
+		return this.axios(axiosOptions)
 					.catch(error => {
+						// Don't log or throw error if request was aborted
+						if (error.name === 'AbortError' || error.code === 'ERR_CANCELED') {
+							return Promise.reject(new Error('Request cancelled'));
+						}
+						
 						if (this.debugMode) {
 							console.log(url + ' error', error);
 							console.log('response:', error.response);
@@ -147,6 +161,11 @@ class OneBuildRepository extends AjaxRepository {
 						
 						this.throwError(error);
 						return;
+					})
+					.finally(() => {
+						if (options.isLoadRequest && !this.disableLimitToOnlyOneLoadRequest && !this.isUnique && options.requestKey) {
+							this._activeLoadRequests.delete(options.requestKey);
+						}
 					});
 	}
 

package/src/Repository/Repository.js

@@ -216,6 +216,7 @@ export default class Repository extends EventEmitter {
 
 		/**
 		 * @member {number} total - Total number of entities in remote storage that pass filters
+		 * Example: "Showing 21-30 of 45" This would be 45
 		 */
 		this.total = 0;