@onehat/data 1.18.9 → 1.18.11

package/package.json

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

package/src/Entity/Entity.js

@@ -377,7 +377,7 @@ class Entity extends EventEmitter {
 	 * Assumes (and sets) isTempId === false.
 	 * @param {array} originalData - Raw data to load into entity.
 	 */
-	loadOriginalData = (originalData, assembleTreeNodes = true) => {
+	loadOriginalData = (originalData) => {
 		if (this.isDestroyed) {
 			throw Error('this.loadOriginalData is no longer valid. Entity has been destroyed.');
 		}
@@ -386,10 +386,6 @@ class Entity extends EventEmitter {
 		this._originalData = originalData || {};
 		this.reset();
 		this.getIdProperty().isTempId = false;
-
-		if (this.isTree && this.repository && assembleTreeNodes) {
-			this.repository.assembleTreeNodes(); // rebuilds them all
-		}
 	}
 
 	/**
@@ -1606,6 +1602,10 @@ class Entity extends EventEmitter {
 			throw Error('this.getHasChildren is no longer valid. TreeNode has been destroyed.');
 		}
 
+		if (!_.isEmpty(this.children)) {
+			return true; // In case the hasChildrenProperty is stale. i.e. That property came from server, and we now have children here
+		}
+
 		return this.getHasChildrenProperty().getSubmitValue();
 	}
 
@@ -1670,11 +1670,11 @@ class Entity extends EventEmitter {
 		if (this.isDestroyed) {
 			throw Error('this.loadChildren is no longer valid. TreeNode has been destroyed.');
 		}
-		if (!this.repository?.getChildNodes) {
-			throw Error('repository.getChildNodes is not defined.');	
+		if (!this.repository?.loadChildNodes) {
+			throw Error('repository.loadChildNodes is not defined.');	
 		}
 
-		const children = await this.repository.getChildNodes(this, depth);
+		const children = await this.repository.loadChildNodes(this, depth);
 		this.areChildrenLoaded = true;
 		return children;
 	}

package/src/Repository/Ajax.js

@@ -385,6 +385,9 @@ class AjaxRepository extends Repository {
 	 * @fires beforeLoad,changeData,load,error
 	 */
 	load = async (params, callback = null) => {
+		if (this.isTree && this.getRootNodes) {
+			return this.getRootNodes();
+		}
 		if (this.isDestroyed) {
 			this.throwError('this.load is no longer valid. Repository has been destroyed.');
 			return;
@@ -431,10 +434,6 @@ class AjaxRepository extends Repository {
 							this._relayEntityEvents(entity);
 							return entity;
 						});
-
-						if (this.isTree) {
-							this.assembleTreeNodes();
-						}
 				
 						// Set the total records that pass filter
 						this.total = total;
@@ -442,6 +441,9 @@ class AjaxRepository extends Repository {
 
 						this.markLoaded();
 
+						if (this.isTree) {
+							this.assembleTreeNodes();
+						}
 						this.emit('changeData', this.entities);
 						this.emit('load', this);
 
@@ -584,6 +586,10 @@ class AjaxRepository extends Repository {
 						if (entity.isRemotePhantomMode) {
 							entity.isRemotePhantom = true;
 						}
+
+						if (this.isTree) {
+							this.assembleTreeNodes();
+						}
 					});
 	}
 	
@@ -637,11 +643,12 @@ class AjaxRepository extends Repository {
 						// Reload each entity with new data
 						// TODO: Check this
 						_.each(entities, (entity, ix) => {
-							entity.loadOriginalData(root[ix], false); // false to not assembleTreeNodes
+							entity.loadOriginalData(root[ix]);
 							if (entity.isRemotePhantomMode) {
 								entity.isRemotePhantom = true;
 							}
 						});
+
 						if (this.isTree) {
 							this.assembleTreeNodes();
 						}
@@ -690,6 +697,10 @@ class AjaxRepository extends Repository {
 						if (entity.isRemotePhantomMode && entity.isRemotePhantom) {
 							entity.isRemotePhantom = false;
 						}
+
+						if (this.isTree) {
+							this.assembleTreeNodes();
+						}
 					});
 	}
 
@@ -743,11 +754,12 @@ class AjaxRepository extends Repository {
 						// Reload each entity with new data
 						// TODO: Check this
 						_.each(entities, (entity, ix) => {
-							entity.loadOriginalData(root[ix], false); // false to not assembleTreeNodes
+							entity.loadOriginalData(root[ix]);
 							if (entity.isRemotePhantomMode && entity.isRemotePhantom) {
 								entity.isRemotePhantom = false;
 							}
 						});
+
 						if (this.isTree) {
 							this.assembleTreeNodes();
 						}
@@ -775,7 +787,13 @@ class AjaxRepository extends Repository {
 		const
 			method = this.methods.delete,
 			url = this.api.delete,
-			data = { id: entity.id, };
+			data = {
+				id: entity.id,
+			};
+
+		if (this.isTree && this.moveSubtreeUp) {
+			data.moveSubtreeUp = this.moveSubtreeUp;
+		}
 
 		return this._send(method, url, data)
 					.then(result => {
@@ -800,6 +818,10 @@ class AjaxRepository extends Repository {
 						const id = entity.id;
 						this.entities = _.filter(this.entities, (entity) => entity.id !== id);
 						entity.destroy();
+
+						if (this.isTree) {
+							this.assembleTreeNodes();
+						}
 					});
 	}
 
@@ -856,6 +878,10 @@ class AjaxRepository extends Repository {
 							}
 							return !deleteIt;
 						});
+
+						if (this.isTree) {
+							this.assembleTreeNodes();
+						}
 					});
 	}
 
@@ -874,6 +900,10 @@ class AjaxRepository extends Repository {
 			return !match;
 		});
 
+		if (this.isTree) {
+			this.assembleTreeNodes();
+		}
+
 		return true;
 	}
 
@@ -977,7 +1007,10 @@ class AjaxRepository extends Repository {
 
 							// Do we need to reload?
 							if (!this.eventsPaused) {
-								if (this.isRemotePhantomMode && (this._operations.add || this._operations.deletePhantom)) {
+								if (this.isTree) {
+									this.assembleTreeNodes();
+									this.emit('changeData', this.entities);
+								} else if (this.isRemotePhantomMode && (this._operations.add || this._operations.deletePhantom)) {
 									// Do nothing, as we don't want to immediately reload on add for a remote phantom mode record. It won't appear, and it will cause all kinds of trouble!
 									if (this._operations.deletePhantom) {
 										// sweep existing deleted records and remove them

package/src/Repository/OneBuild.js

@@ -434,9 +434,9 @@ class OneBuildRepository extends AjaxRepository {
 	// /_/ /_/   \___/\___/____/
 
 	/**
-	 * Gets the root nodes of this tree.
+	 * Loads the root nodes of this tree.
 	 */
-	getRootNodes = (depth) => {
+	loadRootNodes = (depth) => {
 		this.ensureTree();
 		if (this.isDestroyed) {
 			this.throwError('this.setRootNode is no longer valid. Repository has been destroyed.');
@@ -507,12 +507,12 @@ class OneBuildRepository extends AjaxRepository {
 	}
 
 	/**
-	 * Loads the children of the supplied treeNode
+	 * Loads (or reloads) the children of the supplied treeNode
 	 */
-	getChildNodes = (treeNode, depth = 1) => {
+	loadChildNodes = (treeNode, depth = 1) => {
 		this.ensureTree();
 		if (this.isDestroyed) {
-			this.throwError('this.getChildNodes is no longer valid. Repository has been destroyed.');
+			this.throwError('this.loadChildNodes is no longer valid. Repository has been destroyed.');
 			return;
 		}
 		if (!this.isOnline) {
@@ -537,7 +537,7 @@ class OneBuildRepository extends AjaxRepository {
 		return this._send('POST', this.name + '/getNodes', data)
 			.then((result) => {
 				if (this.debugMode) {
-					console.log('Response for getChildNodes', result);
+					console.log('Response for loadChildNodes', result);
 				}
 
 				if (this.isDestroyed) {

package/src/Repository/Repository.js

@@ -204,6 +204,11 @@ export default class Repository extends EventEmitter {
 		 */
 		this.isTree = schema.model.isTree || false;
 
+		/**
+		 * @member {boolean} moveSubtreeUp - Whether to move the subtree up on the next delete operation (trees only)
+		 */
+		this.moveSubtreeUp = false;
+
 		/**
 		 * @member {boolean} isLoaded - State: whether or not entities have been loaded at least once
 		 */
@@ -282,7 +287,7 @@ export default class Repository extends EventEmitter {
 		
 		// Assign event handlers
 		this.on('entity_change', async (entity) => { // Entity changed its value
-			if (this.isAutoSave) {
+			if (this.isAutoSave && !this.isRemotePhantomMode) {
 				return await this.save(entity);
 			}
 		});
@@ -999,7 +1004,17 @@ export default class Repository extends EventEmitter {
 			entity = Repository._createEntity(this.schema, data, this, isPersisted, isDelayedSave, this.isRemotePhantomMode);
 		}
 		this._relayEntityEvents(entity);
-		this.entities.unshift(entity); // Add to *beginning* of entities array, so the phantom record will appear at the beginning of the current page
+		if (this.isTree && data.parentId) {
+			// Trees need new node to be added as first child of parent
+			const ix = this.getIxById(data.parentId) +1;
+			this.entities = [
+				...this.entities.slice(0, ix),
+				entity,
+				...this.entities.slice(ix)
+			];
+		} else {
+			this.entities.unshift(entity); // Add to *beginning* of entities array, so the phantom record will appear at the beginning of the current page
+		}
 
 		// Create id if needed
 		if (!this.isRemotePhantomMode && entity.isPhantom) {
@@ -1781,9 +1796,10 @@ export default class Repository extends EventEmitter {
 	 * Marks entities for deletion from storage medium.
 	 * Actual deletion takes place in save(), unless isPhantom
 	 * @param {object|array} entities - one or more entities to delete
+	 * @param {bool} moveSubtreeUp - whether or not to move the subtree up (if this is a tree)
 	 * @fires delete
 	 */
-	delete = async (entities) => {
+	delete = async (entities, moveSubtreeUp = false) => {
 		if (this.isDestroyed) {
 			this.throwError('this.delete is no longer valid. Repository has been destroyed.');
 			return;
@@ -1809,6 +1825,10 @@ export default class Repository extends EventEmitter {
 			}
 		});
 
+		if (this.isTree) {
+			this.moveSubtreeUp = moveSubtreeUp;
+		}
+
 		this.emit('delete', entities);
 
 		if (this.isAutoSave) {
@@ -1958,6 +1978,7 @@ export default class Repository extends EventEmitter {
 		return entities;
 	}
 
+
 	/**
 	 * Populates the TreeNodes with .parent and .children references
 	 */

package/src/Util/Parsers.js

@@ -1,7 +1,7 @@
 import moment from 'moment';
 import momentAlt from 'relative-time-parser'; // Notice this version of moment is imported from 'relative-time-parser', and may be out of sync with our general 'moment' package
 import accounting from 'accounting-js';
-import * as chrono from 'chrono-node'; // Doesn't yet work in React Native ("SyntaxError: Invalid RegExp: Quantifier has nothing to repeat, js engine: hermes")  Github ticket: https://github.com/facebook/hermes/blob/main/doc/RegExp.md
+// import * as chrono from 'chrono-node'; // Doesn't yet work in React Native ("SyntaxError: Invalid RegExp: Quantifier has nothing to repeat, js engine: hermes")  Github ticket: https://github.com/facebook/hermes/blob/main/doc/RegExp.md
 import _ from 'lodash';
 
 class Parsers {