@onehat/data 1.21.0 → 1.21.2

package/package.json

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

package/src/Entity/Entity.js

@@ -1787,7 +1787,7 @@ class Entity extends EventEmitter {
 	 * Helper to make sure this Repository is a tree
 	 * @private
 	 */
-	ensureTree = async () => {
+	ensureTree = () => {
 		if (!this.isTree) {
 			this.throwError('This Entity is not a tree!');
 			return false;

package/src/Repository/OneBuild.js

@@ -30,19 +30,20 @@ class OneBuildRepository extends AjaxRepository {
 	constructor(config = {}) {
 		super(...arguments);
 
+		const model = this._getModel();
 		const defaults = {
 
 			isAutoLoad: false,
 			isAutoSave: false,
 
 			api: {
-				get: this.name + '/get',
-				add: this.name + '/add',
-				edit: this.name + '/edit',
-				delete: this.name + '/delete',
-				batchAdd: this.name + '/batchAdd',
-				batchEdit: this.name + '/batchEdit',
-				batchDelete: this.name + '/batchDelete',
+				get: model + '/get',
+				add: model + '/add',
+				edit: model + '/edit',
+				delete: model + '/delete',
+				batchAdd: model + '/batchAdd',
+				batchEdit: model + '/batchEdit',
+				batchDelete: model + '/batchDelete',
 			},
 
 			methods: {
@@ -81,6 +82,7 @@ class OneBuildRepository extends AjaxRepository {
 
 		this.registerEvents([
 			'logout',
+			'loadRootNodes',
 		]);
 
 		await super.initialize();
@@ -146,6 +148,13 @@ class OneBuildRepository extends AjaxRepository {
 					});
 	}
 
+	_getModel() {
+		if (!this.isUnique) {
+			return this.name;
+		}
+		return this.name.match(/^([^-]*)-(.*)/)[1]; // converts 'ModelName-22f9915c-79f5-4e86-a25b-9446c7b85b63' to 'ModelName'
+	}
+
 	/**
 	 * Helper for reloadEntity.
 	 * @private
@@ -285,7 +294,7 @@ class OneBuildRepository extends AjaxRepository {
 		}
 
 		const data = {
-			url: this.name + '/reorder',
+			url: this._getModel() + '/reorder',
 			data: qs.stringify({
 				ids,
 				dropPosition,
@@ -581,7 +590,7 @@ class OneBuildRepository extends AjaxRepository {
 			console.log('loadRootNodes', data);
 		}
 
-		return this._send('POST', this.name + '/getNodes', data)
+		return this._send('POST', this._getModel() + '/getNodes', data)
 			.then((result) => {
 				if (this.debugMode) {
 					console.log('Response for loadRootNodes', result);
@@ -626,7 +635,7 @@ class OneBuildRepository extends AjaxRepository {
 				
 				// Don't emit events for root nodes...
 				this.rehash();
-				this.emit('load', this);
+				this.emit('loadRootNodes', this);
 				// this.emit('changeData', this.entities);
 
 				return this.getBy((entity) => {
@@ -672,7 +681,7 @@ class OneBuildRepository extends AjaxRepository {
 			console.log('loadNode', data);
 		}
 
-		return this._send('POST', this.name + '/getNodes', data)
+		return this._send('POST', this._getModel() + '/getNodes', data)
 			.then((result) => {
 				if (this.debugMode) {
 					console.log('Response for loadNode', result);
@@ -755,7 +764,7 @@ class OneBuildRepository extends AjaxRepository {
 			console.log('loadChildNodes', data);
 		}
 
-		return this._send('POST', this.name + '/getNodes', data)
+		return this._send('POST', this._getModel() + '/getNodes', data)
 			.then((result) => {
 				if (this.debugMode) {
 					console.log('Response for loadChildNodes', result);
@@ -836,7 +845,7 @@ class OneBuildRepository extends AjaxRepository {
 			console.log('searchNodes', data);
 		}
 
-		return this._send('POST', this.name + '/searchNodes', data)
+		return this._send('POST', this._getModel() + '/searchNodes', data)
 			.then((result) => {
 				if (this.debugMode) {
 					console.log('Response for searchNodes', result);
@@ -897,7 +906,7 @@ class OneBuildRepository extends AjaxRepository {
 			console.log('moveTreeNode', data);
 		}
 
-		return this._send('POST', this.name + '/moveNode', data)
+		return this._send('POST', this._getModel() + '/moveNode', data)
 			.then((result) => {
 				if (this.debugMode) {
 					console.log('Response for searchNodes', result);

package/src/Repository/Repository.js

@@ -1353,6 +1353,9 @@ export default class Repository extends EventEmitter {
 			this.throwError('this.getById is no longer valid. Repository has been destroyed.');
 			return;
 		}
+		if (_.isNil(id)) {
+			return null;
+		}
 		return this.getFirstBy(entity => entity.id === id);
 	}
 
@@ -1366,12 +1369,15 @@ export default class Repository extends EventEmitter {
 			this.throwError('this.getIxById is no longer valid. Repository has been destroyed.');
 			return;
 		}
+		if (_.isNil(id)) {
+			return null;
+		}
 
 		const ix = this.entities.findIndex((entity) => entity.id === id);
 		if (ix >= 0) {
 			return ix;
 		}
-		return undefined;
+		return null;
 	}
 
 	/**