@onehat/data 1.22.0 → 1.22.2

package/package.json

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

package/src/Entity/Entity.js

@@ -113,7 +113,7 @@ class Entity extends EventEmitter {
 		/**
 		 * @member {boolean} isTree - Whether this Entity is a TreeNode
 		 */
-		this.isTree = schema.model.isTree || false;
+		this.isTree = schema.repository.type === 'tree' || false;
 
 		if (this.isTree && !schema.model.parentIdProperty) {
 			throw new Error('parentIdProperty cannot be empty for a TreeNode');
@@ -1768,6 +1768,18 @@ class Entity extends EventEmitter {
 		return parentIds.reverse().join('/');
 	}
 
+	/**
+	 * Gets the model that this entity uses
+	 * @return {string} model
+	 */
+	getModel = () => {
+		if (this.isTree && this.nodeType) {
+			// Trees can have entities of different models
+			return this.nodeType;
+		}
+		return this.repository.getModel();
+	}
+
 	/**
 	 * Moves this TreeNode to another parentId.
 	 */
@@ -1777,7 +1789,7 @@ class Entity extends EventEmitter {
 			throw Error('this.moveTreeNode is no longer valid. TreeNode has been destroyed.');
 		}
 		if (!this.repository?.moveTreeNode) {
-			throw Error('repository.moveTreeNode is not defined.');	
+			throw Error('repository.moveTreeNode is not defined.');
 		}
 
 		return this.repository.moveTreeNode(this, newParentId);
@@ -1789,7 +1801,7 @@ class Entity extends EventEmitter {
 	 */
 	ensureTree = () => {
 		if (!this.isTree) {
-			this.throwError('This Entity is not a tree!');
+			throw Error('This Entity is not a tree!');
 			return false;
 		}
 		return true;

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';
@@ -201,13 +201,6 @@ class AjaxRepository extends Repository {
 			this._onChangeSorters();
 		}
 	}
-
-	_getModel(entity) {
-		if (!this.isUnique) {
-			return this.name;
-		}
-		return this.name.match(/^([^-]*)-(.*)/)[1]; // converts 'ModelName-22f9915c-79f5-4e86-a25b-9446c7b85b63' to 'ModelName'
-	}
 	
 
 	//     ____
@@ -223,18 +216,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;
@@ -254,7 +252,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;
 		
@@ -291,7 +290,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;
 	}
 
 	/**
@@ -438,7 +452,7 @@ class AjaxRepository extends Repository {
 
 		const
 			repository = this,
-			url = this._getModel() + '/' + this.api.get,
+			url = this.getModel() + '/' + this.api.get,
 			data = _.merge({}, this._baseParams, this._params);
 		
 		return this._send(this.methods.get, url, data)
@@ -529,7 +543,7 @@ class AjaxRepository extends Repository {
 			console.log('reloadEntity ' + entity.id, params);
 		}
 
-		const url = this._getModel() + '/' + this.api.get;
+		const url = entity.getModel() + '/' + this.api.get;
 		
 		return this._send(this.methods.get, url, params)
 					.then(result => {
@@ -615,7 +629,7 @@ class AjaxRepository extends Repository {
 
 		const
 			method = this.methods.add,
-			url = this._getModel() + '/' + this.api.add,
+			url = entity.getModel() + '/' + this.api.add,
 			data = entity.getSubmitValues();
 
 		return this._send(method, url, data)
@@ -669,7 +683,7 @@ class AjaxRepository extends Repository {
 
 		const
 			method = this.methods.add,
-			url = this._getModel() + '/' + this.api.batchAdd,
+			url = this.getModel() + '/' + this.api.batchAdd,
 			data = {
 				entities: _.map(entities, entity => {
 					const values = entity.submitValues;
@@ -734,7 +748,7 @@ class AjaxRepository extends Repository {
 
 		const
 			method = this.methods.edit,
-			url = this._getModel() + '/' + this.api.edit,
+			url = entity.getModel() + '/' + this.api.edit,
 			data = entity.getSubmitValues();
 
 		return this._send(method, url, data)
@@ -788,7 +802,7 @@ class AjaxRepository extends Repository {
 
 		const
 			method = this.methods.edit,
-			url = this._getModel() + '/' + this.api.batchEdit,
+			url = this.getModel() + '/' + this.api.batchEdit,
 			data = {
 				entities: _.map(entities, entity => {
 					const values = entity.submitValues;
@@ -857,7 +871,7 @@ class AjaxRepository extends Repository {
 
 		const
 			method = this.methods.delete,
-			url = this._getModel() + '/' + this.api.delete,
+			url = entity.getModel() + '/' + this.api.delete,
 			data = {
 				id: entity.id,
 			};
@@ -917,7 +931,7 @@ class AjaxRepository extends Repository {
 
 		const
 			method = this.methods.delete,
-			url = this._getModel() + '/' + this.api.batchDelete,
+			url = this.getModel() + '/' + this.api.batchDelete,
 			ids = _.map(entities, (entity) => {
 				entity.isSaving = true;
 				return entity.id;

package/src/Repository/OneBuild.js

@@ -298,7 +298,7 @@ class OneBuildRepository extends AjaxRepository {
 		}
 
 		const data = {
-			url: this._getModel() + '/' + this.api.reorder,
+			url: this.getModel() + '/' + this.api.reorder,
 			data: qs.stringify({
 				ids,
 				dropPosition,
@@ -335,7 +335,7 @@ class OneBuildRepository extends AjaxRepository {
 		this.markLoading();
 
 		const
-			url = this._getModel() + '/' + this.api.duplicate,
+			url = entity.getModel() + '/' + this.api.duplicate,
 			id = entity.id,
 			result = await this._send('POST', url, { id });
 		
@@ -407,7 +407,7 @@ class OneBuildRepository extends AjaxRepository {
 		params['conditions[' + idPropertyName + ']'] = id;
 
 		const
-			url = this._getModel() + '/' + this.api.get,
+			url = this.getModel() + '/' + this.api.get,
 			data = _.merge(params, this._baseParams);
 
 		if (this.debugMode) {
@@ -464,7 +464,7 @@ class OneBuildRepository extends AjaxRepository {
 			console.log('getLastModifiedDate');
 		}
 
-		const url = this._getModel() + '/' + this.api.getLastModifiedDate;
+		const url = this.getModel() + '/' + this.api.getLastModifiedDate;
 
 		return this._send(this.methods.get, url, this._baseParams)
 					.then(result => {

package/src/Repository/Repository.js

@@ -396,6 +396,12 @@ export default class Repository extends EventEmitter {
 		}
 	}
 
+	getModel() {
+		if (!this.isUnique) {
+			return this.name;
+		}
+		return this.name.match(/^([^-]*)-(.*)/)[1]; // converts 'ModelName-22f9915c-79f5-4e86-a25b-9446c7b85b63' to 'ModelName'
+	}
 
 	//     __                    __
 	//    / /   ____  ____ _____/ /

package/src/Repository/Tree.js

@@ -1,5 +1,6 @@
 /** @module Repository */
 
+import Repository from './Repository.js'; // so we can use static methods
 import OneBuildRepository from './OneBuild.js';
 import _ from 'lodash';
 
@@ -17,7 +18,7 @@ class TreeRepository extends OneBuildRepository {
 		const defaults = {
 
 			isTree: true,
-			rootNodeType: this._getModel(), // e.g. 'Fleets'
+			rootNodeType: this.getModel(), // e.g. 'Fleets'
 
 			api: {
 				getNodes: 'getNodes',
@@ -25,9 +26,9 @@ class TreeRepository extends OneBuildRepository {
 				searchNodes: 'searchNodes',
 			},
 
-			// TODO: modify all tree methods to handle multiple node types
-			// SOME are updated, but many are not.
-			// I'll need to modify all generated models to use TreeRepository instead of OneBuild with isTree: true.
+			editableNodeTypes: [
+				this.getModel(),
+			],
 
 		};
 		_.merge(this, defaults, config);
@@ -156,7 +157,7 @@ class TreeRepository extends OneBuildRepository {
 
 		const
 			data = _.merge({ depth, nodeId: treeNode.id, }, this._baseParams, this._params),
-			url = this.getModelFromTreeNode(treeNode) + '/' + this.api.getNodes;
+			url = treeNode.getModel() + '/' + this.api.getNodes;
 
 		if (this.debugMode) {
 			console.log('loadNode', data);

package/src/Repository/index.js

@@ -7,6 +7,7 @@ import MemoryRepository from './Memory.js';
 import NullRepository from './Null.js';
 import OneBuildRepository from './OneBuild.js';
 import RestRepository from './Rest.js';
+import TreeRepository from './Tree.js';
 
 const CoreRepositoryTypes = {
 	[AjaxRepository.type]: AjaxRepository,
@@ -16,6 +17,7 @@ const CoreRepositoryTypes = {
 	[NullRepository.type]: NullRepository,
 	[OneBuildRepository.type]: OneBuildRepository,
 	[RestRepository.type]: RestRepository,
+	[TreeRepository.type]: TreeRepository,
 };
 
 export default CoreRepositoryTypes;

package/src/Schema/Schema.js

@@ -89,11 +89,6 @@ export default class Schema extends EventEmitter {
 				 */
 				hasChildrenProperty: null,
 
-				/**
-				 * @member {boolean} isTree - Whether this model has hierarchical tree data
-				 */
-				isTree: false,
-
 				/**
 				 * @member {boolean} isAdjacencyList - Whether this tree is an Adjacency List
 				 */