@onehat/data 1.22.17 → 1.22.19

package/cypress/e2e/Repository/Ajax.cy.js

@@ -38,6 +38,21 @@ describe('OneBuildRepository', function() {
 			expect(r._params.test).to.be.eq(1);
 		});
 
+		it('getBaseParamConditions', function() {
+			const
+				r = this.repository,
+				newConditions = {
+					'conditions[Model.model]': 'test1',
+					'conditions[Model.modelid]': 'test2',
+				};
+
+			r.setBaseParams(newConditions);
+
+			const conditions = r.getBaseParamConditions();
+
+			expect(conditions).to.eql(newConditions);
+		});
+
 		it('hasParam', function() {
 			const r = this.repository;
 			r.setParam('test', 1);

package/package.json

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

package/src/Entity/Entity.js

@@ -115,16 +115,6 @@ class Entity extends EventEmitter {
 		 */
 		this.isTree = schema.repository.type === 'tree' || false;
 
-		if (this.isTree && !schema.model.parentIdProperty) {
-			throw new Error('parentIdProperty cannot be empty for a TreeNode');
-		}
-		if (this.isTree && this.repository?.isClosureTable && !schema.model.depthProperty) {
-			throw new Error('depthProperty cannot be empty for a Closure Table TreeNode');
-		}
-		if (this.isTree && !schema.model.hasChildrenProperty) {
-			throw new Error('hasChildrenProperty cannot be empty for a TreeNode');
-		}
-
 		/**
 		 * @member {TreeNode} parent - The parent TreeNode for this TreeNode
 		 * @public
@@ -346,7 +336,16 @@ class Entity extends EventEmitter {
 		if (this.isDestroyed) {
 			throw Error('this._createProperties is no longer valid. Entity has been destroyed.');
 		}
-		const propertyDefinitions = this.schema.model.properties;
+		let propertyDefinitions = this.schema.model.properties;
+		if (this.isTree) {
+			const treePropertyDefinitions = [
+				// defaults
+				{ name: 'parentId', mapping: 'parentId', type: 'int', isEditingDisabled: true, isFilteringDisabled: true, },
+				{ name: 'hasChildren', mapping: 'hasChildren', type: 'bool', isEditingDisabled: true, isFilteringDisabled: true, },
+				{ name: 'depth', mapping: 'depth', type: 'int', isEditingDisabled: true, isFilteringDisabled: true, },
+			];
+			propertyDefinitions = _.unionBy(propertyDefinitions, treePropertyDefinitions, 'name'); // propertyDefinitions will override treePropertyDefinitions
+		}
 		let properties = {};
 		_.each(propertyDefinitions, (definition) => {
 			if (!definition.name) {

package/src/Repository/Ajax.js

@@ -354,6 +354,19 @@ class AjaxRepository extends Repository {
 		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;
+	}
+
 	/**
 	 * Determines if query param exists
 	 * @param {string} name - Param name