@onehat/data 1.18.10 → 1.18.12

package/package.json

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

package/src/Entity/Entity.js

@@ -1808,6 +1808,21 @@ class Entity extends EventEmitter {
 		return parentIds.reverse().join('/');
 	}
 
+	/**
+	 * Moves this TreeNode to another parentId.
+	 */
+	moveTreeNode = (newParentId) => {
+		this.ensureTree();
+		if (this.isDestroyed) {
+			throw Error('this.moveTreeNode is no longer valid. TreeNode has been destroyed.');
+		}
+		if (!this.repository?.moveTreeNode) {
+			throw Error('repository.moveTreeNode is not defined.');	
+		}
+
+		return this.repository.moveTreeNode(this, newParentId);
+	}
+
 	/**
 	 * Helper to make sure this Repository is a tree
 	 * @private

package/src/Repository/Ajax.js

@@ -787,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 => {

package/src/Repository/OneBuild.js

@@ -506,6 +506,81 @@ class OneBuildRepository extends AjaxRepository {
 			});
 	}
 
+	/**
+	 * Loads (or reloads) the supplied treeNode
+	 */
+	loadNode = (treeNode, depth = 1) => {
+		this.ensureTree();
+		if (this.isDestroyed) {
+			this.throwError('this.loadNode is no longer valid. Repository has been destroyed.');
+			return;
+		}
+		if (!this.isOnline) {
+			this.throwError('Offline');
+			return;
+		}
+
+		// If children already exist, remove them from the repository
+		// This way, we can reload just a portion of the tree
+		if (!_.isEmpty(treeNode.children)) {
+			const children = treeNode.children;
+			treeNode.children = [];
+
+			_.each(children, (child) => {
+				this.removeEntity(child);
+			});
+		}
+		
+		this.markLoading();
+
+		const data = _.merge({ depth, nodeId: treeNode.id, }, this._baseParams, this._params);
+		return this._send('POST', this.name + '/getNodes', data)
+			.then((result) => {
+				if (this.debugMode) {
+					console.log('Response for loadNode', result);
+				}
+
+				if (this.isDestroyed) {
+					// If this repository gets destroyed before it has a chance
+					// to process the Ajax request, just ignore the response.
+					return;
+				}
+
+				const {
+					root,
+					success,
+					total,
+					message
+				} = this._processServerResponse(result);
+
+				if (!success) {
+					this.throwError(message);
+					return;
+				}
+				
+				// Set the current entities
+				const children = _.map(root, (data) => {
+					const entity = Repository._createEntity(this.schema, data, this, true);
+					this._relayEntityEvents(entity);
+					return entity;
+				});
+
+				this.entities = this.entities.concat(children);
+
+				this.assembleTreeNodes();
+				
+				this._setPaginationVars();
+
+				// this.emit('changeData', this.entities);
+				this.emit('load', this);
+
+				return children;
+			})
+			.finally(() => {
+				this.markLoading(false);
+			});
+	}
+
 	/**
 	 * Loads (or reloads) the children of the supplied treeNode
 	 */
@@ -527,7 +602,7 @@ class OneBuildRepository extends AjaxRepository {
 			treeNode.children = [];
 
 			_.each(children, (child) => {
-				this.removeNode(child);
+				this.removeEntity(child);
 			});
 		}
 		
@@ -581,6 +656,17 @@ class OneBuildRepository extends AjaxRepository {
 			});
 	}
 
+	/**
+	 * Override the AjaxRepository to we can reload a treeNode if needed
+	 */
+	reloadEntity = (entity, callback = null) => {
+		if (!entity.isTree) {
+			return super.reloadEntity(entity, callback);
+		}
+
+		return this.loadNode(entity, 1);
+	}
+
 	/**
 	 * Searches all nodes for the supplied text.
 	 * This basically takes the search query and returns whatever the server sends
@@ -637,18 +723,67 @@ class OneBuildRepository extends AjaxRepository {
 
 	/**
 	 * Moves the supplied treeNode to a new position on the tree
+	 * @returns id of common ancestor node 
 	 */
-	moveTreeNode = async (treeNode, newParentId) => {
+	moveTreeNode = (treeNode, newParentId) => {
 		this.ensureTree();
 		if (this.isDestroyed) {
 			this.throwError('this.moveTreeNode is no longer valid. Repository has been destroyed.');
 			return;
 		}
+		if (!this.isOnline) {
+			this.throwError('Offline');
+			return;
+		}
+
+		const oldParentId = treeNode.parent?.id;
+
+		const data = _.merge({ nodeId: treeNode.id, parentId: newParentId, }, this._baseParams, this._params);
+		return this._send('POST', this.name + '/moveNode', data)
+			.then((result) => {
+				if (this.debugMode) {
+					console.log('Response for searchNodes', result);
+				}
 
-		// TODO: move node here
+				if (this.isDestroyed) {
+					// If this repository gets destroyed before it has a chance
+					// to process the Ajax request, just ignore the response.
+					return;
+				}
 
+				const {
+					root: {
+						commonAncestorId,
+						oldParent,
+						newParent,
+						node,
+					},
+					success,
+					total,
+					message
+				} = this._processServerResponse(result);
 
-		
+				if (!success) {
+					this.throwError(message);
+					return;
+				}
+
+				// move it from oldParent.children to newParent.children
+				const
+					oldParentRecord = this.getById(oldParentId),
+					newParentRecord = this.getById(newParentId);
+
+				oldParentRecord?.loadOriginalData(oldParent);
+				newParentRecord.loadOriginalData(newParent);
+				treeNode.loadOriginalData(node);
+
+				this.assembleTreeNodes();
+
+				return commonAncestorId;
+			})
+			.finally(() => {
+				this.markLoading(false);
+			});
 	}
 
 }

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
 		 */
@@ -1007,6 +1012,7 @@ export default class Repository extends EventEmitter {
 				entity,
 				...this.entities.slice(ix)
 			];
+			this.assembleTreeNodes();
 		} else {
 			this.entities.unshift(entity); // Add to *beginning* of entities array, so the phantom record will appear at the beginning of the current page
 		}
@@ -1791,9 +1797,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;
@@ -1819,6 +1826,10 @@ export default class Repository extends EventEmitter {
 			}
 		});
 
+		if (this.isTree) {
+			this.moveSubtreeUp = moveSubtreeUp;
+		}
+
 		this.emit('delete', entities);
 
 		if (this.isAutoSave) {