@onehat/data 1.20.9 → 1.21.1

package/src/Repository/Offline.js

@@ -41,7 +41,7 @@ class OfflineRepository extends MemoryRepository {
 	 * Deletes all data in storage medium.
 	 * @private
 	 */
-	_deleteFromStorage = async () => {
+	async _deleteFromStorage() {
 		try {
 			const ids = await this._getIndex(),
 				total = ids.length,
@@ -80,7 +80,7 @@ class OfflineRepository extends MemoryRepository {
 	 * @return {array} data - Array of rawData objects
 	 * @private
 	 */
-	_loadFromStorage = async () => {
+	async _loadFromStorage() {
 		try {
 
 			this._index = await this._getIndex();
@@ -122,7 +122,7 @@ class OfflineRepository extends MemoryRepository {
 	 * @return {array} data - Array of rawData objects
 	 * @private
 	 */
-	_saveToStorage = async (entities) => {
+	async _saveToStorage(entities) {
 		try {
 			let i, entity,
 				total = entities.length,
@@ -197,7 +197,7 @@ class OfflineRepository extends MemoryRepository {
 	 * @param {string} id - The id to add.
 	 * @private
 	 */
-	_addToIndex = async (id) => {
+	async _addToIndex(id) {
 		let index = await this._getIndex();
 		index.push(id);
 		index = _.uniq(index);
@@ -266,7 +266,7 @@ class OfflineRepository extends MemoryRepository {
 	 * @param {string} id - The id to delete.
 	 * @private
 	 */
-	_deleteFromIndex = async (id) => {
+	async _deleteFromIndex(id) {
 		let index = await this._getIndex();
 		_.pull(index, id);
 		await this._setIndex(index);
@@ -289,7 +289,7 @@ class OfflineRepository extends MemoryRepository {
 	 * @fires save
 	 * @private
 	 */
-	_finalizeSave = async (results) => {
+	async _finalizeSave(results) {
 		return Promise.all(results)
 					.then(() => {
 						this.isSaving = false;
@@ -309,7 +309,7 @@ class OfflineRepository extends MemoryRepository {
 	 * @return {array} index - Array of ids.
 	 * @private
 	 */
-	_getIndex = async () => {
+	async _getIndex() {
 		// return await this._storageGetValue('index');
 		let result = await this._storageGetValue('index');
 		if (!result) {
@@ -325,7 +325,7 @@ class OfflineRepository extends MemoryRepository {
 	 * @return {array} index - Array of keys.
 	 * @private
 	 */
-	_getKeys = async () => {
+	async _getKeys() {
 		if (!this._getAllKeys) {
 			this.throwError('Storage medium does not support _getAllKeys');
 			return;
@@ -342,7 +342,7 @@ class OfflineRepository extends MemoryRepository {
 	 * @param {array} index - Array of ids.
 	 * @private
 	 */
-	_setIndex = async (index) => {
+	async _setIndex(index) {
 		if (!_.isEqual(this._index, index)) {
 			this._index = index;
 			return await this._storageSetValue('index', index);
@@ -358,7 +358,7 @@ class OfflineRepository extends MemoryRepository {
 	 * @private
 	 * @abstract
 	 */
-	_storageGetValue = async (name) => {
+	async _storageGetValue(name) {
 		this.throwError('this._storageGetValue must be implemented by OfflineRepository subclass.');
 		return;
 	}
@@ -370,7 +370,7 @@ class OfflineRepository extends MemoryRepository {
 	 * @private
 	 * @abstract
 	 */
-	_storageSetValue = async (name, value) => {
+	async _storageSetValue(name, value) {
 		this.throwError('this._storageSetValue must be implemented by OfflineRepository subclass.');
 		return;
 	}
@@ -381,7 +381,7 @@ class OfflineRepository extends MemoryRepository {
 	 * @private
 	 * @abstract
 	 */
-	_storageDeleteValue = async (name) => {
+	async _storageDeleteValue(name) {
 		this.throwError('this._storageDeleteValue must be implemented by OfflineRepository subclass.');
 		return;
 	}
@@ -394,7 +394,8 @@ class OfflineRepository extends MemoryRepository {
 	 */
 	_namespace(name) {
 		if (_.isArray(name)) {
-			return _.map(name, (key) => this.schema.name + '-' + key);
+			const oThis = this;
+			return _.map(name, (key) => oThis.schema.name + '-' + key);
 		}
 		return this.schema.name + '-' + name;	
 	}
@@ -404,7 +405,7 @@ class OfflineRepository extends MemoryRepository {
 	 * (when this is the "local" side of at LocalFromRemoteRepository)
 	 * @return {moment} lastSync
 	 */
-	getLastSync = async () => {
+	async getLastSync() {
 		const dateStr = await this._storageGetValue(LAST_SYNC);
 		if (!_.isNil(dateStr)) {
 			const date = moment(dateStr);
@@ -420,7 +421,7 @@ class OfflineRepository extends MemoryRepository {
 	 * Used when this is the "local" side of a LocalFromRemoteRepository
 	 * @param {date} lastSync
 	 */
-	setLastSync = async (date) => {
+	async setLastSync(date) {
 		await this._storageSetValue(LAST_SYNC, date);
 	}
 
@@ -429,7 +430,7 @@ class OfflineRepository extends MemoryRepository {
 	 * Clears the date when this Repository was last synced with remote.
 	 * Used when this is the "local" side of a LocalFromRemoteRepository
 	 */
-	clearLastSync = async () => {
+	async clearLastSync() {
 		await this._storageDeleteValue(LAST_SYNC);
 	}
 

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();
@@ -93,7 +95,7 @@ class OneBuildRepository extends AjaxRepository {
 	 * Fires off axios request to server
 	 * @private
 	 */
-	_send = (method, url, data) => {
+	_send(method, url, data) {
 
 		if (!url) {
 			this.throwError('No url submitted');
@@ -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
@@ -161,7 +170,7 @@ class OneBuildRepository extends AjaxRepository {
 	 * OneBuild uses a single, multi-dimentional param for filtering.
 	 * Refreshes entities.
 	 */
-	_onChangeFilters = () => {
+	_onChangeFilters() {
 		// Clear existing "conditions" params
 		if (!_.isEmpty(this._params)) {
 			this._params = _.omitBy(this._params, (value, key) => {
@@ -169,11 +178,12 @@ class OneBuildRepository extends AjaxRepository {
 			});
 		}
 
+		const oThis = this;
 		_.each(this.filters, (filter, ix) => {
 			if (_.includes(nonConditionFilters, filter.name)) {
-				this.setParam(filter.name, filter.value);
+				oThis.setParam(filter.name, filter.value);
 			} else {
-				this.setParam('conditions[' + filter.name + ']', filter.value);
+				oThis.setParam('conditions[' + filter.name + ']', filter.value);
 			}
 		});
 
@@ -191,7 +201,7 @@ class OneBuildRepository extends AjaxRepository {
 	 * OneBuild uses a single order param, rather than separate name & direction params.
 	 * Refreshes entities.
 	 */
-	_onChangeSorters = () => {
+	_onChangeSorters() {
 		let sorterStrings = [];
 		_.each(this.sorters, (sorter) => {
 			sorterStrings.push(sorter.name + ' ' + sorter.direction);
@@ -225,7 +235,7 @@ class OneBuildRepository extends AjaxRepository {
 	 * @fires error
 	 * @private
 	 */
-	_processServerResponse = (result) => {
+	_processServerResponse(result) {
 
 		if (result === false) { // e.g. 401 error
 			return {
@@ -267,7 +277,7 @@ class OneBuildRepository extends AjaxRepository {
 	 * @param {string} dropPosition - position in which it was dropped; could be 'before' or 'after'
 	 * @return {Promise}
 	 */
-	reorder = (dragRecordOrIds, dropRecord, dropPosition) => {
+	reorder(dragRecordOrIds, dropRecord, dropPosition) {
 
 		if (!this.isOnline) {
 			this.throwError('Offline');
@@ -284,7 +294,7 @@ class OneBuildRepository extends AjaxRepository {
 		}
 
 		const data = {
-			url: this.name + '/reorder',
+			url: this._getModel() + '/reorder',
 			data: qs.stringify({
 				ids,
 				dropPosition,
@@ -316,7 +326,7 @@ class OneBuildRepository extends AjaxRepository {
 			});
 	}
 
-	remoteDuplicate = async (entity) => {
+	async remoteDuplicate(entity) {
 		
 		this.markLoading();
 
@@ -358,7 +368,7 @@ class OneBuildRepository extends AjaxRepository {
 		return duplicateEntity;
 	}
 
-	loadOneAdditionalEntity = async (id) => {
+	async loadOneAdditionalEntity(id) {
 		const entity = await this.getSingleEntityFromServer(id);
 		if (!entity) {
 			this.throwError('entity not found');
@@ -372,7 +382,7 @@ class OneBuildRepository extends AjaxRepository {
 		this.emit('changeData', this.entities);
 	}
 
-	getSingleEntityFromServer = async (id) => {
+	async getSingleEntityFromServer(id) {
 		if (this.isDestroyed) {
 			this.throwError('this.getSingleEntityFromServer is no longer valid. Repository has been destroyed.');
 			return;
@@ -438,7 +448,7 @@ class OneBuildRepository extends AjaxRepository {
 	 * - password,
 	 * @return {Promise}
 	 */
-	login = (creds) => {
+	login(creds) {
 
 		if (!this.isOnline) {
 			this.throwError('Offline');
@@ -477,7 +487,7 @@ class OneBuildRepository extends AjaxRepository {
 	 * Logout from OneBuild API
 	 * @return {Promise}
 	 */
-	logout = () => {
+	logout() {
 
 		if (!this.isOnline) {
 			this.throwError('Offline');
@@ -513,7 +523,7 @@ class OneBuildRepository extends AjaxRepository {
 			});
 	}
 
-	forgotPassword = (email = null, username = null) => {
+	forgotPassword(email = null, username = null) {
 
 		if (!this.isOnline) {
 			this.throwError('Offline');
@@ -560,7 +570,7 @@ class OneBuildRepository extends AjaxRepository {
 	/**
 	 * Loads the root nodes of this tree.
 	 */
-	loadRootNodes = (depth) => {
+	loadRootNodes(depth) {
 		this.ensureTree();
 		if (this.isDestroyed) {
 			this.throwError('this.setRootNode is no longer valid. Repository has been destroyed.');
@@ -580,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);
@@ -607,9 +617,10 @@ class OneBuildRepository extends AjaxRepository {
 				this._destroyEntities();
 
 				// Set the current entities
+				const oThis = this;
 				this.entities = _.map(root, (data) => {
-					const entity = Repository._createEntity(this.schema, data, this, true);
-					this._relayEntityEvents(entity);
+					const entity = Repository._createEntity(oThis.schema, data, this, true);
+					oThis._relayEntityEvents(entity);
 					return entity;
 				});
 
@@ -624,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) => {
@@ -639,7 +650,7 @@ class OneBuildRepository extends AjaxRepository {
 	/**
 	 * Loads (or reloads) the supplied treeNode
 	 */
-	loadNode = (treeNode, depth = 1) => {
+	loadNode(treeNode, depth = 1) {
 		this.ensureTree();
 		if (this.isDestroyed) {
 			this.throwError('this.loadNode is no longer valid. Repository has been destroyed.');
@@ -656,8 +667,9 @@ class OneBuildRepository extends AjaxRepository {
 			const children = treeNode.children;
 			treeNode.children = [];
 
+			const oThis = this;
 			_.each(children, (child) => {
-				this.removeEntity(child);
+				oThis.removeEntity(child);
 			});
 		}
 		
@@ -669,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);
@@ -694,9 +706,10 @@ class OneBuildRepository extends AjaxRepository {
 				}
 				
 				// Set the current entities
+				const oThis = this;
 				const children = _.map(root, (data) => {
-					const entity = Repository._createEntity(this.schema, data, this, true);
-					this._relayEntityEvents(entity);
+					const entity = Repository._createEntity(oThis.schema, data, this, true);
+					oThis._relayEntityEvents(entity);
 					return entity;
 				});
 
@@ -720,7 +733,7 @@ class OneBuildRepository extends AjaxRepository {
 	/**
 	 * Loads (or reloads) the children of the supplied treeNode
 	 */
-	loadChildNodes = (treeNode, depth = 1) => {
+	loadChildNodes(treeNode, depth = 1) {
 		this.ensureTree();
 		if (this.isDestroyed) {
 			this.throwError('this.loadChildNodes is no longer valid. Repository has been destroyed.');
@@ -737,8 +750,9 @@ class OneBuildRepository extends AjaxRepository {
 			const children = treeNode.children;
 			treeNode.children = [];
 
+			const oThis = this;
 			_.each(children, (child) => {
-				this.removeEntity(child);
+				oThis.removeEntity(child);
 			});
 		}
 		
@@ -750,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);
@@ -775,9 +789,10 @@ class OneBuildRepository extends AjaxRepository {
 				}
 				
 				// Set the current entities
+				const oThis = this;
 				const children = _.map(root, (data) => {
-					const entity = Repository._createEntity(this.schema, data, this, true);
-					this._relayEntityEvents(entity);
+					const entity = Repository._createEntity(oThis.schema, data, this, true);
+					oThis._relayEntityEvents(entity);
 					return entity;
 				});
 
@@ -801,7 +816,7 @@ class OneBuildRepository extends AjaxRepository {
 	/**
 	 * Override the AjaxRepository to we can reload a treeNode if needed
 	 */
-	reloadEntity = (entity, callback = null) => {
+	reloadEntity(entity, callback = null) {
 		if (!entity.isTree) {
 			return super.reloadEntity(entity, callback);
 		}
@@ -813,7 +828,7 @@ class OneBuildRepository extends AjaxRepository {
 	 * Searches all nodes for the supplied text.
 	 * This basically takes the search query and returns whatever the server sends
 	 */
-	searchNodes = (q) => {
+	searchNodes(q) {
 		this.ensureTree();
 		if (this.isDestroyed) {
 			this.throwError('this.searchNodes is no longer valid. Repository has been destroyed.');
@@ -830,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);
@@ -864,7 +879,7 @@ class OneBuildRepository extends AjaxRepository {
 	/**
 	 * Alias for loadChildren
 	 */
-	reloadChildren = (treeNode, depth) => {
+	reloadChildren(treeNode, depth) {
 		return this.loadChildren(treeNode, depth);
 	}
 
@@ -872,7 +887,7 @@ class OneBuildRepository extends AjaxRepository {
 	 * Moves the supplied treeNode to a new position on the tree
 	 * @returns id of common ancestor node 
 	 */
-	moveTreeNode = (treeNode, newParentId) => {
+	moveTreeNode(treeNode, newParentId) {
 		this.ensureTree();
 		if (this.isDestroyed) {
 			this.throwError('this.moveTreeNode is no longer valid. Repository has been destroyed.');
@@ -891,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/OneBuild2.js

@@ -169,11 +169,12 @@ class OneBuild2Repository extends AjaxRepository {
 			});
 		}
 
+		const oThis = this;
 		_.each(this.filters, (filter, ix) => {
 			if (_.includes(nonConditionFilters, filter.name)) {
-				this.setParam(filter.name, filter.value);
+				oThis.setParam(filter.name, filter.value);
 			} else {
-				this.setParam('conditions[' + filter.name + ']', filter.value);
+				oThis.setParam('conditions[' + filter.name + ']', filter.value);
 			}
 		});
 
@@ -607,9 +608,10 @@ class OneBuild2Repository extends AjaxRepository {
 				this._destroyEntities();
 
 				// Set the current entities
+				const oThis = this;
 				this.entities = _.map(root, (data) => {
-					const entity = Repository._createEntity(this.schema, data, this, true);
-					this._relayEntityEvents(entity);
+					const entity = Repository._createEntity(oThis.schema, data, this, true);
+					oThis._relayEntityEvents(entity);
 					return entity;
 				});
 
@@ -656,8 +658,9 @@ class OneBuild2Repository extends AjaxRepository {
 			const children = treeNode.children;
 			treeNode.children = [];
 
+			const oThis = this;
 			_.each(children, (child) => {
-				this.removeEntity(child);
+				oThis.removeEntity(child);
 			});
 		}
 		
@@ -694,9 +697,10 @@ class OneBuild2Repository extends AjaxRepository {
 				}
 				
 				// Set the current entities
+				const oThis = this;
 				const children = _.map(root, (data) => {
-					const entity = Repository._createEntity(this.schema, data, this, true);
-					this._relayEntityEvents(entity);
+					const entity = Repository._createEntity(oThis.schema, data, this, true);
+					oThis._relayEntityEvents(entity);
 					return entity;
 				});
 
@@ -737,8 +741,9 @@ class OneBuild2Repository extends AjaxRepository {
 			const children = treeNode.children;
 			treeNode.children = [];
 
+			const oThis = this;
 			_.each(children, (child) => {
-				this.removeEntity(child);
+				oThis.removeEntity(child);
 			});
 		}
 		
@@ -775,9 +780,10 @@ class OneBuild2Repository extends AjaxRepository {
 				}
 				
 				// Set the current entities
+				const oThis = this;
 				const children = _.map(root, (data) => {
-					const entity = Repository._createEntity(this.schema, data, this, true);
-					this._relayEntityEvents(entity);
+					const entity = Repository._createEntity(oThis.schema, data, this, true);
+					oThis._relayEntityEvents(entity);
 					return entity;
 				});