@onehat/data 1.21.19 → 1.21.21

package/src/Repository/Ajax.js

@@ -1,6 +1,6 @@
 /** @module Repository */
 
-import Repository from './Repository.js';
+import Repository from './Repository.js'; // so we can use static methods
 import ReaderTypes from '../Reader/index.js';
 import WriterTypes from '../Writer/index.js';
 import axios from 'axios';
@@ -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,
@@ -216,18 +227,23 @@ class AjaxRepository extends Repository {
 	 * @param {boolean} isBaseParam - Whether param is a base param (to be sent on every request).
 	 */
 	setParam(name, value, isBaseParam = false) {
-		const re = /^([^\[]+)\[([^\]]+)\](.*)$/,
+		const
+			re = /^([^\[]+)\[([^\]]+)\](.*)$/,
 			matches = name.match(re),
 			paramsToChange = isBaseParam ? this._baseParams : this._params;
 		
 		if (matches) { // name has array notation like 'conditions[username]'
-			const first = matches[1],
+			const
+				first = matches[1],
 				second = matches[2];
 			if (paramsToChange && !paramsToChange.hasOwnProperty(first)) {
 				paramsToChange[first] = {};
 			}
 			if (_.isNil(value) && paramsToChange[first] && paramsToChange[first].hasOwnProperty(second)) {
 				delete paramsToChange[first][second];
+				if (_.isEmpty(paramsToChange[first])) {
+					delete paramsToChange[first];
+				}
 				return;
 			}
 			paramsToChange[first][second] = value;
@@ -247,7 +263,8 @@ class AjaxRepository extends Repository {
 	 * @param {boolean} isBaseParam - Whether param is a base param (to be sent on every request).
 	 */
 	setValuelessParam(name, isBaseParam = false) {
-		const re = /^([^\[]+)\[([^\]]+)\](.*)$/,
+		const
+			re = /^([^\[]+)\[([^\]]+)\](.*)$/,
 			matches = name.match(re),
 			paramsToChange = isBaseParam ? this._baseParams : this._params;
 		
@@ -284,7 +301,22 @@ class AjaxRepository extends Repository {
 	 * @param {string} name - Param name
 	 */
 	hasBaseParam(name) {
-		return this._baseParams.hasOwnProperty(name);
+		if (this._baseParams.hasOwnProperty(name)) {
+			return true;
+		}
+
+		// Check for array notation
+		const keys = name.split(/[\[\].]+/).filter(Boolean);
+		let current = this._baseParams,
+			key;
+
+		for(key of keys) {
+			if (!current || !current.hasOwnProperty(key)) {
+				return false;
+			}
+			current = current[key];
+		}
+		return true;
 	}
 
 	/**
@@ -295,7 +327,57 @@ 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;
+	}
+
+	/**
+	 * Returns current value of base query params
+	 * @param {object} params - Params to set. Key is parameter name, value is parameter value
+	 */
+	getBaseParams() {
+		return this._baseParams;
+	}
+
+	/**
+	 * Returns current value of any baseParam query conditions
+	 */
+	getBaseParamConditions() {
+		const
+			existingConditions = this._baseParams.conditions || {},
+			convertedConditions = {};
+		_.each(existingConditions, (value, key) => {
+			convertedConditions['conditions[' + key + ']'] = value;
+		});
+		return convertedConditions;
+	}
+
+	/**
+	 * Returns current value of any param query conditions
+	 */
+	getParamConditions() {
+		const
+			existingConditions = this._params.conditions || {},
+			convertedConditions = {};
+		_.each(existingConditions, (value, key) => {
+			convertedConditions['conditions[' + key + ']'] = value;
+		});
+		return convertedConditions;
 	}
 
 	/**
@@ -303,7 +385,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;
 	}
 
 	/**
@@ -380,7 +477,23 @@ class AjaxRepository extends Repository {
 		this.setBaseParam(this.paramPageSize, this.isPaginated ? this.pageSize : null);
 
 		if (this.isLoaded && !this.eventsPaused) {
-			return this.reload();
+			const
+				currentEntityCount = this.entities.length,
+				newPageSize = this.pageSize;
+			if (this.previousPage === 1 && this.page === 1 && currentEntityCount >= newPageSize && this.isPaginated) {
+				// Optimization: if we're on page 1 and already have enough entities
+				// for the new page size, just truncate the existing data instead of reloading
+				const entitiesToRemove = this.entities.splice(newPageSize);
+				entitiesToRemove.forEach(entity => entity.destroy());
+				this._setPaginationVars();
+				this.emit('changeData', this.entities);
+				if (this.debugMode) {
+					console.log(`Truncated entities from ${currentEntityCount} to ${newPageSize}`);
+				}
+			} else {
+				// We need more data or weren't already on page 1, so reload
+				return this.reload();
+			}
 		}
 	}
 	
@@ -399,7 +512,7 @@ class AjaxRepository extends Repository {
 	 * @fires beforeLoad,changeData,load,error
 	 */
 	async load(params, callback = null) {
-		if (this.isTree && this.loadRootNodes) {
+		if (this.isTree) {
 			return this.loadRootNodes();
 		}
 		if (this.isDestroyed) {
@@ -410,6 +523,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();
 
@@ -425,14 +562,9 @@ class AjaxRepository extends Repository {
 			this.resumeEvents();
 		}
 
-		if (!_.isNil(params) && _.isObject(params)) {
-			this.setParams(params);
-		}
-
 		const repository = this;
-		const data = _.merge({}, this._baseParams, this._params);
 		
-		return this._send(this.methods.get, this.api.get, data)
+		return this._send(this.methods.get, url, data, { isLoadRequest: true, requestKey, })
 					.then(result => {
 						if (this.debugMode) {
 							console.log('Response for ' + this.name, result);
@@ -488,9 +620,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);
@@ -519,8 +711,10 @@ class AjaxRepository extends Repository {
 		if (this.debugMode) {
 			console.log('reloadEntity ' + entity.id, params);
 		}
+
+		const url = entity.getModel() + '/' + this.api.get;
 		
-		return this._send(this.methods.get, this.api.get, params)
+		return this._send(this.methods.get, url, params)
 					.then(result => {
 						if (this.debugMode) {
 							console.log('reloadEntity response ' + entity.id, result);
@@ -604,7 +798,7 @@ class AjaxRepository extends Repository {
 
 		const
 			method = this.methods.add,
-			url = this.api.add,
+			url = entity.getModel() + '/' + this.api.add,
 			data = entity.getSubmitValues();
 
 		return this._send(method, url, data)
@@ -658,7 +852,7 @@ class AjaxRepository extends Repository {
 
 		const
 			method = this.methods.add,
-			url = this.api.batchAdd,
+			url = this.getModel() + '/' + this.api.batchAdd,
 			data = {
 				entities: _.map(entities, entity => {
 					const values = entity.submitValues;
@@ -723,7 +917,7 @@ class AjaxRepository extends Repository {
 
 		const
 			method = this.methods.edit,
-			url = this.api.edit,
+			url = entity.getModel() + '/' + this.api.edit,
 			data = entity.getSubmitValues();
 
 		return this._send(method, url, data)
@@ -777,7 +971,7 @@ class AjaxRepository extends Repository {
 
 		const
 			method = this.methods.edit,
-			url = this.api.batchEdit,
+			url = this.getModel() + '/' + this.api.batchEdit,
 			data = {
 				entities: _.map(entities, entity => {
 					const values = entity.submitValues;
@@ -846,7 +1040,7 @@ class AjaxRepository extends Repository {
 
 		const
 			method = this.methods.delete,
-			url = this.api.delete,
+			url = entity.getModel() + '/' + this.api.delete,
 			data = {
 				id: entity.id,
 			};
@@ -906,7 +1100,7 @@ class AjaxRepository extends Repository {
 
 		const
 			method = this.methods.delete,
-			url = this.api.batchDelete,
+			url = this.getModel() + '/' + this.api.batchDelete,
 			ids = _.map(entities, (entity) => {
 				entity.isSaving = true;
 				return entity.id;
@@ -976,7 +1170,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');
@@ -988,12 +1182,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,
@@ -1002,22 +1203,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);
+						}
 					});
 	}