@onehat/data 1.13.5 → 1.14.0

package/cypress/integration/OneHatData.spec.js

@@ -358,6 +358,22 @@ describe('OneHatData', function() {
 		})();
 	});
 
+	it('setIsOnline', function() {
+		(async function() {
+			await beforeEach();
+
+			const oneHatData = this.oneHatData;
+
+			oneHatData.setIsOnline(true);
+			expect(oneHatData.isOnline).to.be.true;
+
+			oneHatData.setIsOnline(false);
+			expect(oneHatData.isOnline).to.be.false;
+
+			afterEach();
+		})();
+	});
+
 	it('isEntity', async function() {
 		(async function() {
 			await beforeEach();

package/cypress/integration/Repository/Ajax.spec.js

@@ -112,7 +112,7 @@ describe('OneBuildRepository', function() {
 			expect(_.size(this.repository.entities)).to.be.eq(1);
 		});
 
-		it.only('sortInMemory', function() {
+		it('sortInMemory', function() {
 
 			const repository = this.repository;
 
@@ -138,6 +138,17 @@ describe('OneBuildRepository', function() {
 			expect(entities[3].key).to.be.eq(4);
 			expect(entities[4].key).to.be.eq(5);
 		});
+
+		it('setIsOnline', function() {
+
+			const repository = this.repository;
+
+			repository.setIsOnline(true);
+			expect(repository.isOnline).to.be.true;
+
+			repository.setIsOnline(false);
+			expect(repository.isOnline).to.be.false;
+		});
 		
 	});
 

package/package.json

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

package/src/OneHatData.js

@@ -67,6 +67,14 @@ export class OneHatData extends EventEmitter {
 		 */
 		this.isDestroyed = false;
 
+		/**
+		 * @member {boolean} isOnline - Whether the remote Internet connection is active.
+		 * This must be managed by outside software, calling setIsOnline at appropriate times.
+		 * @private
+		 */
+		this.isOnline = true;
+
+
 		this.registerEvents([
 			'createRepository',
 			'deleteRepository',
@@ -114,6 +122,23 @@ export class OneHatData extends EventEmitter {
 		return this;
 	}
 
+	/**
+	 * Sets global error handler on all Repositories.
+	 * Chainable.
+	 * @param {function} handler - The global error handler
+	 * @return this
+	 */
+	setGlobalErrorHandler = (handler) => {
+		if (this.isDestroyed) {
+			throw new Error('this.setGlobalErrorHandler is no longer valid. OneHatData has been destroyed.');
+		}
+		const repositories = this.getAllRepositories();
+		_.each(repositories, (repository) => {
+			repository.setErrorHandler(handler);
+		});
+		return this;
+	}
+
 	
 	//    ______                __
 	//   / ____/_______  ____ _/ /____
@@ -588,6 +613,18 @@ export class OneHatData extends EventEmitter {
 		return this.repositories && this.repositories.hasOwnProperty(id);
 	}
 
+	/**
+	 * Sets isOnline for all remote repositories.
+	 * Remote repositories won't submit queries if !isOnline
+	 */
+	setIsOnline = (isOnline) => {
+		this.isOnline = !!isOnline;
+		const remoteRepositories = oneHatData.getRepositoriesBy((repository) => !!repository.setIsOnline);
+		_.each(remoteRepositories, (repository) => {
+			repository.setIsOnline(isOnline);
+		});
+	}
+
 
 
 	//     ____       __     __

package/src/Repository/Ajax.js

@@ -93,6 +93,13 @@ class AjaxRepository extends Repository {
 			 * @member {object} _baseParams - Params that will be applied to every request
 			 */
 			_baseParams: {},
+
+			/**
+			 * @member {boolean} isOnline - Whether the remote storage medium is available.
+			 * This must be managed by outside software, calling setIsOnline at appropriate times.
+			 * @private
+			 */
+			isOnline: true,
 			
 		};
 		_.merge(this, defaults, config);
@@ -362,10 +369,12 @@ class AjaxRepository extends Repository {
 	 */
 	load = async (params, callback = null) => {
 		if (this.isDestroyed) {
-			throw Error('this.load is no longer valid. Repository has been destroyed.');
+			this.throwError('this.load is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		if (!this.api.get) {
-			throw new Error('No "get" api endpoint defined.');
+			this.throwError('No "get" api endpoint defined.');
+			return;
 		}
 		this.emit('beforeLoad'); // TODO: canceling beforeLoad will cancel the load operation
 		this.markLoading();
@@ -433,10 +442,12 @@ class AjaxRepository extends Repository {
 	 */
 	reloadEntity = async (entity, callback = null) => {
 		if (this.isDestroyed) {
-			throw Error('this.reloadEntity is no longer valid. Repository has been destroyed.');
+			this.throwError('this.reloadEntity is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		if (!this.api.get) {
-			throw new Error('No "get" api endpoint defined.');
+			this.throwError('No "get" api endpoint defined.');
+			return;
 		}
 		this.emit('beforeLoad'); // TODO: canceling beforeLoad will cancel the load operation
 		this.markLoading();
@@ -460,7 +471,8 @@ class AjaxRepository extends Repository {
 						} = this._processServerResponse(result);
 
 						if (!success) {
-							throw Error(message);
+							this.throwError(message);
+							return;
 						}
 
 						const updatedData = root[0];
@@ -515,7 +527,8 @@ class AjaxRepository extends Repository {
 	 */
 	_doAdd(entity) { // standard function notation
 		if (!this.api.add) {
-			throw new Error('No "add" api endpoint defined.');
+			this.throwError('No "add" api endpoint defined.');
+			return;
 		}
 
 		this._operations.add = true;
@@ -537,7 +550,8 @@ class AjaxRepository extends Repository {
 						} = this._processServerResponse(result);
 
 						if (!success) {
-							throw new Error(message);
+							this.throwError(message);
+							return;
 						}
 
 						entity.loadOriginalData(root[0]);
@@ -553,7 +567,8 @@ class AjaxRepository extends Repository {
 	 */
 	_doBatchAdd(entities) { // standard function notation
 		if (!this.api.batchAdd) {
-			throw new Error('No "batchAdd" api endpoint defined.');
+			this.throwError('No "batchAdd" api endpoint defined.');
+			return;
 		}
 
 		this._operations.add = true;
@@ -577,7 +592,8 @@ class AjaxRepository extends Repository {
 						} = this._processServerResponse(result);
 
 						if (!success) {
-							throw new Error(message);
+							this.throwError(message);
+							return;
 						}
 
 						// Reload each entity with new data
@@ -595,7 +611,8 @@ class AjaxRepository extends Repository {
 	 */
 	_doEdit(entity) { // standard function notation
 		if (!this.api.edit) {
-			throw new Error('No "edit" api endpoint defined.');
+			this.throwError('No "edit" api endpoint defined.');
+			return;
 		}
 
 		this._operations.edit = true;
@@ -617,7 +634,8 @@ class AjaxRepository extends Repository {
 						} = this._processServerResponse(result);
 
 						if (!success) {
-							throw new Error(message);
+							this.throwError(message);
+							return;
 						}
 
 						entity.loadOriginalData(root[0]);
@@ -633,7 +651,8 @@ class AjaxRepository extends Repository {
 	 */
 	_doBatchEdit(entities) { // standard function notation
 		if (!this.api.batchEdit) {
-			throw new Error('No "batchEdit" api endpoint defined.');
+			this.throwError('No "batchEdit" api endpoint defined.');
+			return;
 		}
 
 		this._operations.edit = true;
@@ -657,7 +676,8 @@ class AjaxRepository extends Repository {
 						} = this._processServerResponse(result);
 
 						if (!success) {
-							throw new Error(message);
+							this.throwError(message);
+							return;
 						}
 
 						// Reload each entity with new data
@@ -675,7 +695,8 @@ class AjaxRepository extends Repository {
 	 */
 	_doDelete(entity) { // standard function notation
 		if (!this.api.delete) {
-			throw new Error('No "delete" api endpoint defined.');
+			this.throwError('No "delete" api endpoint defined.');
+			return;
 		}
 
 		this._operations.delete = true;
@@ -697,7 +718,8 @@ class AjaxRepository extends Repository {
 						} = this._processServerResponse(result);
 						
 						if (!success) {
-							throw new Error(message);
+							this.throwError(message);
+							return;
 						}
 
 						// Delete it from this.entities
@@ -716,7 +738,8 @@ class AjaxRepository extends Repository {
 	 */
 	_doBatchDelete(entities) { // standard function notation
 		if (!this.api.batchDelete) {
-			throw new Error('No "batchDelete" api endpoint defined.');
+			this.throwError('No "batchDelete" api endpoint defined.');
+			return;
 		}
 
 		this._operations.delete = true;
@@ -739,7 +762,8 @@ class AjaxRepository extends Repository {
 						} = this._processServerResponse(result);
 						
 						if (!success) {
-							throw new Error(message);
+							this.throwError(message);
+							return;
 						}
 
 						// Delete it from this.entities
@@ -779,7 +803,13 @@ class AjaxRepository extends Repository {
 	_send = (method, url, data) => {
 
 		if (!url) {
-			throw new Error('No url submitted');
+			this.throwError('No url submitted');
+			return;
+		}
+
+		if (!this.isOnline) {
+			this.throwError('Offline');
+			return;
 		}
 
 		const options = {
@@ -866,6 +896,10 @@ class AjaxRepository extends Repository {
 						}));
 	}
 
+	setIsOnline = (isOnline) => {
+		this.isOnline = !!isOnline; // force convert type to boolean
+	}
+
 }
 
 AjaxRepository.className = 'Ajax';

package/src/Repository/LocalFromRemote/LocalFromRemote.js

@@ -68,16 +68,20 @@ class LocalFromRemoteRepository extends EventEmitter {
 		super(...arguments);
 
 		if (!config.local || !(config.local instanceof Repository)) {
-			throw new Error('No local repository defined.');
+			this.throwError('No local repository defined.');
+			return;
 		}
 		if (!config.local.isLocal) {
-			throw new Error('Local repository is not configured to be a local type.');
+			this.throwError('Local repository is not configured to be a local type.');
+			return;
 		}
 		if (!config.remote || !(config.remote instanceof Repository)) {
-			throw new Error('No remote repository defined.');
+			this.throwError('No remote repository defined.');
+			return;
 		}
 		if (!config.remote.isRemote) {
-			throw new Error('Remote repository is not configured to be a remote type.');
+			this.throwError('Remote repository is not configured to be a remote type.');
+			return;
 		}
 		
 		const defaults = {
@@ -139,7 +143,8 @@ class LocalFromRemoteRepository extends EventEmitter {
 		if (this.mode !== MODE_LOCAL_MIRROR && 
 			this.mode !== MODE_REMOTE_WITH_OFFLINE && 
 			this.mode !== MODE_COMMAND_QUEUE) {
-			throw new Error('Mode not recognized.');
+			this.throwError('Mode not recognized.');
+			return;
 		}
 
 		this.registerEvents([
@@ -326,10 +331,12 @@ class LocalFromRemoteRepository extends EventEmitter {
 						let command = this.commands[localItem.command];
 
 						if (!command) {
-							throw new Error('Command ' + localItem.command + ' not registered');
+							this.throwError('Command ' + localItem.command + ' not registered');
+							return;
 						}
 						if (!command.hasHandlers()) {
-							throw new Error('No command handler registered for ' + localItem.command);
+							this.throwError('No command handler registered for ' + localItem.command);
+							return;
 						}
 
 						// local --> remote
@@ -365,7 +372,8 @@ class LocalFromRemoteRepository extends EventEmitter {
 
 				case MODE_REMOTE_WITH_OFFLINE:
 
-					throw new Error('Not implemented');
+					this.throwError('Not implemented');
+					return;
 
 					// Load remote data into local
 					// Local <-- Remote

package/src/Repository/Memory.js

@@ -92,7 +92,8 @@ class MemoryRepository extends Repository {
 	load = async (data = null) => {
 		
 		if (this.isDestroyed) {
-			throw Error('this.load is no longer valid. Repository has been destroyed.');
+			this.throwError('this.load is no longer valid. Repository has been destroyed.');
+			return;
 		}
 
 		this.emit('beforeLoad');
@@ -200,7 +201,8 @@ class MemoryRepository extends Repository {
 	 */
 	_applySorters = () => {
 		if (this.isDestroyed) {
-			throw Error('this._applySorters is no longer valid. Repository has been destroyed.');
+			this.throwError('this._applySorters is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		if (!this.hasSorters) {
 			this.isSorted = false;
@@ -309,7 +311,8 @@ class MemoryRepository extends Repository {
 	 */
 	_applyFilters = () => {
 		if (this.isDestroyed) {
-			throw Error('this._applyFilters is no longer valid. Repository has been destroyed.');
+			this.throwError('this._applyFilters is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		if (!this.hasFilters) {
 			this._filteredEntities = [];
@@ -358,7 +361,8 @@ class MemoryRepository extends Repository {
 	 */
 	_doAdd(entity) { // standard function notation
 		if (this.isDestroyed) {
-			throw Error('this._doAdd is no longer valid. Repository has been destroyed.');
+			this.throwError('this._doAdd is no longer valid. Repository has been destroyed.');
+			return;
 		}
 
 		// Give it a non-temporary ID, if needed
@@ -407,7 +411,8 @@ class MemoryRepository extends Repository {
 	 */
 	_doEdit(entity) { // standard function notation
 		if (this.isDestroyed) {
-			throw Error('this._doEdit is no longer valid. Repository has been destroyed.');
+			this.throwError('this._doEdit is no longer valid. Repository has been destroyed.');
+			return;
 		}
 
 		entity.markSaved();
@@ -422,7 +427,8 @@ class MemoryRepository extends Repository {
 	 */
 	_doDelete(entity) { // standard function notation
 		if (this.isDestroyed) {
-			throw Error('this._doDelete is no longer valid. Repository has been destroyed.');
+			this.throwError('this._doDelete is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		delete this._keyedEntities[entity.id];
 		this.entities = _.filter(this.entities, (x) => x.id !== entity.id);
@@ -445,7 +451,8 @@ class MemoryRepository extends Repository {
 	 */
 	getById = (id) => {
 		if (this.isDestroyed) {
-			throw Error('this.getById is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getById is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		return this._keyedEntities[id] ? this._keyedEntities[id] : null;
 	}
@@ -458,7 +465,8 @@ class MemoryRepository extends Repository {
 	 */
 	getIxById = (id) => {
 		if (this.isDestroyed) {
-			throw Error('this.getIxById is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getIxById is no longer valid. Repository has been destroyed.');
+			return;
 		}
 
 		const ix = this.getEntitiesOnPage().findIndex((entity) => entity.id === id);
@@ -475,7 +483,8 @@ class MemoryRepository extends Repository {
 	 */
 	getEntities = () => {
 		if (this.isDestroyed) {
-			throw Error('this.getEntities is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getEntities is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		return this._getActiveEntities();
 	}
@@ -487,7 +496,8 @@ class MemoryRepository extends Repository {
 	 * /
 	getAllData = () => {
 		if (this.isDestroyed) {
-			throw Error('this.getAllData is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getAllData is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		const entities = this._getActiveEntities();
 		return _.map(entities, (entity) => {
@@ -528,7 +538,8 @@ class MemoryRepository extends Repository {
 	 */
 	_paginate = (entities) => {
 		if (this.isDestroyed) {
-			throw Error('this._paginate is no longer valid. Repository has been destroyed.');
+			this.throwError('this._paginate is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		if (!this.isPaginated) {
 			return entities;
@@ -552,7 +563,8 @@ class MemoryRepository extends Repository {
 	 */
 	_recalculate = () => {
 		if (this.isDestroyed) {
-			throw Error('this._recalculate is no longer valid. Repository has been destroyed.');
+			this.throwError('this._recalculate is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		this._unsortedEntities = _.map(this._keyedEntities, item => item);
 		this._sortedEntities = null;
@@ -589,7 +601,8 @@ class MemoryRepository extends Repository {
 	 */
 	getGrandTotal = () => {
 		if (this.isDestroyed) {
-			throw Error('this.getGrandTotal is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getGrandTotal is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		return _.size(this._unsortedEntities);
 	}
@@ -603,7 +616,8 @@ class MemoryRepository extends Repository {
 	 */
 	_getActiveEntities = () => {
 		if (this.isDestroyed) {
-			throw Error('this._getActiveEntities is no longer valid. Repository has been destroyed.');
+			this.throwError('this._getActiveEntities is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		if (this.hasFilters) {
 			return this._filteredEntities;

package/src/Repository/Null.js

@@ -43,7 +43,8 @@ class NullRepository extends Repository {
 	 */
 	load = (data = this.data) => {
 		if (this.isDestroyed) {
-			throw Error('this.load is no longer valid. Repository has been destroyed.');
+			this.throwError('this.load is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		this.emit('beforeLoad');
 		this.markLoading();
@@ -96,7 +97,8 @@ class NullRepository extends Repository {
 	 */
 	_doEdit(entity) { // standard function notation
 		if (this.isDestroyed) {
-			throw Error('this._doEdit is no longer valid. Repository has been destroyed.');
+			this.throwError('this._doEdit is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		entity.markSaved();
 		return {

package/src/Repository/Offline.js

@@ -303,7 +303,8 @@ class OfflineRepository extends MemoryRepository {
 	 */
 	_getKeys = async () => {
 		if (!this._getAllKeys) {
-			throw new Error('Storage medium does not support _getAllKeys');
+			this.throwError('Storage medium does not support _getAllKeys');
+			return;
 		}
 		const re = new RegExp('^' + this.name + '-');
 		let keys = await this._getAllKeys();
@@ -334,7 +335,8 @@ class OfflineRepository extends MemoryRepository {
 	 * @abstract
 	 */
 	_storageGetValue = async (name) => {
-		throw new Error('this._storageGetValue must be implemented by OfflineRepository subclass.');
+		this.throwError('this._storageGetValue must be implemented by OfflineRepository subclass.');
+		return;
 	}
 
 	/**
@@ -345,7 +347,8 @@ class OfflineRepository extends MemoryRepository {
 	 * @abstract
 	 */
 	_storageSetValue = async (name, value) => {
-		throw new Error('this._storageSetValue must be implemented by OfflineRepository subclass.');
+		this.throwError('this._storageSetValue must be implemented by OfflineRepository subclass.');
+		return;
 	}
 
 	/**
@@ -355,7 +358,8 @@ class OfflineRepository extends MemoryRepository {
 	 * @abstract
 	 */
 	_storageDeleteValue = async (name) => {
-		throw new Error('this._storageDeleteValue must be implemented by OfflineRepository subclass.');
+		this.throwError('this._storageDeleteValue must be implemented by OfflineRepository subclass.');
+		return;
 	}
 
 	/**

package/src/Repository/OneBuild.js

@@ -95,7 +95,13 @@ class OneBuildRepository extends AjaxRepository {
 	_send = (method, url, data) => {
 
 		if (!url) {
-			throw new Error('No url submitted');
+			this.throwError('No url submitted');
+			return;
+		}
+
+		if (!this.isOnline) {
+			this.throwError('Offline');
+			return;
 		}
 
 		const options = {
@@ -241,6 +247,12 @@ class OneBuildRepository extends AjaxRepository {
 	 * @return {Promise}
 	 */
 	reorder = (dragRecord, dropRecord, dropPosition) => {
+
+		if (!this.isOnline) {
+			this.throwError('Offline');
+			return;
+		}
+		
 		const data = {
 			url: 'reorder',
 			data: qs.stringify({
@@ -264,7 +276,8 @@ class OneBuildRepository extends AjaxRepository {
 
 				const response = result.data;
 				if (!response.success) {
-					throw new Error(response.data);
+					this.throwError(response.data);
+					return;
 				}
 
 				// Reload the repository, so updated sort_order values can be retrieved
@@ -282,6 +295,11 @@ class OneBuildRepository extends AjaxRepository {
 	 */
 	login = (creds) => {
 
+		if (!this.isOnline) {
+			this.throwError('Offline');
+			return;
+		}
+
 		const data = {
 			url: 'apiLogin',
 			data: qs.stringify(creds),
@@ -301,7 +319,8 @@ class OneBuildRepository extends AjaxRepository {
 
 				const response = result.data;
 				if (!response.success) {
-					throw new Error(response.data); // TODO: Fix back-end, so OneBuild submits the error message on response.message, not response.data
+					this.throwError(response.data); // TODO: Fix back-end, so OneBuild submits the error message on response.message, not response.data
+					return;
 				}
 
 				const userData = response.data;
@@ -314,9 +333,16 @@ class OneBuildRepository extends AjaxRepository {
 	 * @return {Promise}
 	 */
 	logout = () => {
+
+		if (!this.isOnline) {
+			this.throwError('Offline');
+			return;
+		}
+
 		if (this.debugMode) {
 			console.log('logout');
 		}
+
 		return this.axios({
 				url: 'Users/apiLogout',
 				method: 'POST',
@@ -330,13 +356,20 @@ class OneBuildRepository extends AjaxRepository {
 				}
 				const response = result.data;
 				if (!response.success) {
-					throw new Error(response.data);
+					this.throwError(response.data);
+					return;
 				}
 				return true;
 			});
 	}
 
 	forgotPassword = (email = null, username = null) => {
+
+		if (!this.isOnline) {
+			this.throwError('Offline');
+			return;
+		}
+
 		const data = {
 			url: 'forgotPassword',
 			data: qs.stringify({
@@ -359,7 +392,8 @@ class OneBuildRepository extends AjaxRepository {
 
 				const response = result.data;
 				if (!response.success) {
-					throw new Error(response.data);
+					this.throwError(response.data);
+					return;
 				}
 
 				return response;

package/src/Repository/Repository.js

@@ -31,7 +31,8 @@ export default class Repository extends EventEmitter {
 		const { schema } = config;
 
 		if (!schema || !schema.model) {
-			throw new Error('Schema cannot be empty');
+			this.throwError('Schema cannot be empty');
+			return;
 		}
 
 		const defaults = {
@@ -290,7 +291,8 @@ export default class Repository extends EventEmitter {
 	 */
 	_createMethods = () => {
 		if (this.isDestroyed) {
-			throw Error('this._createMethods is no longer valid. Repository has been destroyed.');
+			this.throwError('this._createMethods is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		const methodDefinitions = this.schema.repository.methods || this.originalConfig.methods; // The latter is mainly for lfr repositories
 		if (!_.isEmpty(methodDefinitions)) {
@@ -306,7 +308,8 @@ export default class Repository extends EventEmitter {
 	 */
 	 _createStatics = () => {
 		if (this.isDestroyed) {
-			throw Error('this._createStatics is no longer valid. Repository has been destroyed.');
+			this.throwError('this._createStatics is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		const staticsDefinitions = this.schema.repository.statics || this.originalConfig.statics; // The latter is mainly for lfr repositories
 		if (!_.isEmpty(staticsDefinitions)) {
@@ -328,7 +331,8 @@ export default class Repository extends EventEmitter {
 	 * @abstract
 	 */
 	load = async () => {
-		throw new Error('load must be implemented by Repository subclass');
+		this.throwError('load must be implemented by Repository subclass');
+		return;
 	}
 
 	/**
@@ -361,7 +365,8 @@ export default class Repository extends EventEmitter {
 	 * @abstract
 	 */
 	reloadEntity = async (entity) => {
-		throw new Error('reloadEntity must be implemented by Repository subclass');
+		this.throwError('reloadEntity must be implemented by Repository subclass');
+		return;
 	}
 
 	/**
@@ -370,7 +375,8 @@ export default class Repository extends EventEmitter {
 	 */
 	setAutoSave = (isAutoSave) => {
 		if (this.isDestroyed) {
-			throw Error('this.setAutoSave is no longer valid. Repository has been destroyed.');
+			this.throwError('this.setAutoSave is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		this.isAutoSave = isAutoSave
 	}
@@ -381,7 +387,8 @@ export default class Repository extends EventEmitter {
 	 */
 	setAutoLoad = (isAutoLoad) => {
 		if (this.isDestroyed) {
-			throw Error('this.setAutoLoad is no longer valid. Repository has been destroyed.');
+			this.throwError('this.setAutoLoad is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		this.isAutoLoad = isAutoLoad
 	}
@@ -398,7 +405,8 @@ export default class Repository extends EventEmitter {
 	 */
 	get hasSorters() {
 		if (this.isDestroyed) {
-			throw Error('this.hasSorters is no longer valid. Repository has been destroyed.');
+			this.throwError('this.hasSorters is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		return this.sorters.length > 0;
 	}
@@ -408,7 +416,8 @@ export default class Repository extends EventEmitter {
 	 */
 	clearSort = () => {
 		if (this.isDestroyed) {
-			throw Error('this.clearSort is no longer valid. Repository has been destroyed.');
+			this.throwError('this.clearSort is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		this.setSorters([])
 	}
@@ -445,7 +454,8 @@ export default class Repository extends EventEmitter {
 	 */
 	sort = (arg1 = null, arg2 = 'ASC', arg3 = null) => {
 		if (this.isDestroyed) {
-			throw Error('this.sort is no longer valid. Repository has been destroyed.');
+			this.throwError('this.sort is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		// Assemble sorting definition objects
 		let sorters = [];
@@ -476,7 +486,8 @@ export default class Repository extends EventEmitter {
 	 */
 	getDefaultSorters = () => {
 		if (this.isDestroyed) {
-			throw Error('this.getDefaultSorters is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getDefaultSorters is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		let sorters = [];
 		if (this.schema?.model) {
@@ -505,10 +516,12 @@ export default class Repository extends EventEmitter {
 	 */
 	setSorters = (sorters) => {
 		if (this.isDestroyed) {
-			throw Error('this.setSorters is no longer valid. Repository has been destroyed.');
+			this.throwError('this.setSorters is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		if (!this.allowsMultiSort && sorters.length > 1) {
-			throw Error('Cannot have more than one sorter at a time.');
+			this.throwError('Cannot have more than one sorter at a time.');
+			return;
 		}
 
 		let isChanged = false;
@@ -522,13 +535,15 @@ export default class Repository extends EventEmitter {
 				}
 				const propertyDefinition = _.find(this.schema.model.properties, (property) => property.name === sorter.name);
 				if (!propertyDefinition) {
-					throw new Error('Sorting property does not exist.');
+					this.throwError('Sorting property does not exist.');
+					return;
 				}
 				const propertyType = propertyDefinition.type;
 				if (propertyType && PropertyTypes[propertyType]) {
 					const propertyInstance = new PropertyTypes[propertyType]();
 					if (!propertyInstance.isSortable) {
-						throw new Error('Sorting property type is not sortable.');
+						this.throwError('Sorting property type is not sortable.');
+						return;
 					}
 				}
 			});
@@ -554,7 +569,8 @@ export default class Repository extends EventEmitter {
 	 */
 	get hasFilters() {
 		if (this.isDestroyed) {
-			throw Error('this.hasFilters is no longer valid. Repository has been destroyed.');
+			this.throwError('this.hasFilters is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		return this.filters.length > 0;
 	}
@@ -614,7 +630,8 @@ export default class Repository extends EventEmitter {
 	 */
 	filter = (arg1 = null, arg2 = null, clearFirst = true) => {
 		if (this.isDestroyed) {
-			throw Error('this.filter is no longer valid. Repository has been destroyed.');
+			this.throwError('this.filter is no longer valid. Repository has been destroyed.');
+			return;
 		}
 
 		if (_.isNil(arg1)) {
@@ -719,7 +736,8 @@ export default class Repository extends EventEmitter {
 	 */
 	_setFilters = (filters) => {
 		if (this.isDestroyed) {
-			throw Error('this._setFilters is no longer valid. Repository has been destroyed.');
+			this.throwError('this._setFilters is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		let isChanged = false;
 		if (!_.isEqual(this.filters, filters)) {
@@ -752,7 +770,8 @@ export default class Repository extends EventEmitter {
 	 */
 	resetPagination = () => {
 		if (this.isDestroyed) {
-			throw Error('this.resetPagination is no longer valid. Repository has been destroyed.');
+			this.throwError('this.resetPagination is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		this.setPage(1);
 	}
@@ -763,7 +782,8 @@ export default class Repository extends EventEmitter {
 	 */
 	setPageSize = (pageSize) => {
 		if (this.isDestroyed) {
-			throw Error('this.setPageSize is no longer valid. Repository has been destroyed.');
+			this.throwError('this.setPageSize is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		if (!this.isPaginated) {
 			return false;
@@ -792,7 +812,8 @@ export default class Repository extends EventEmitter {
 	 */
 	setPage = (page) => {
 		if (this.isDestroyed) {
-			throw Error('this.setPage is no longer valid. Repository has been destroyed.');
+			this.throwError('this.setPage is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		if (!this.isPaginated) {
 			return false;
@@ -839,7 +860,8 @@ export default class Repository extends EventEmitter {
 	 */
 	_setPaginationVars = () => {
 		if (this.isDestroyed) {
-			throw Error('this._setPaginationVars is no longer valid. Repository has been destroyed.');
+			this.throwError('this._setPaginationVars is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		if (!this.isPaginated) {
 			this.totalPages = 1;
@@ -935,7 +957,8 @@ export default class Repository extends EventEmitter {
 	 */
 	add = async (data, isPersisted = false, originalIsMapped = false, isDelayedSave = false) => {
 		if (this.isDestroyed) {
-			throw Error('this.add is no longer valid. Repository has been destroyed.');
+			this.throwError('this.add is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		
 		// Does it already exist? If so, edit the existing
@@ -982,7 +1005,8 @@ export default class Repository extends EventEmitter {
 	 */
 	createStandaloneEntity = async (data, isPersisted = false, originalIsMapped = false, isDelayedSave = false) => {
 		if (this.isDestroyed) {
-			throw Error('this.createStandaloneEntity is no longer valid. Repository has been destroyed.');
+			this.throwError('this.createStandaloneEntity is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		
 		const entity = Repository._createEntity(this.schema, data, this, isPersisted, originalIsMapped, isDelayedSave);
@@ -1046,7 +1070,8 @@ export default class Repository extends EventEmitter {
 	 */
 	_relayEntityEvents = (entity) => {
 		if (this.isDestroyed) {
-			throw Error('this._relayEntityEvents is no longer valid. Repository has been destroyed.');
+			this.throwError('this._relayEntityEvents is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		this.relayEventsFrom(entity, [
 			'change',
@@ -1146,7 +1171,8 @@ export default class Repository extends EventEmitter {
 	 */
 	getByIx = (ix) => {
 		if (this.isDestroyed) {
-			throw Error('this.getByIx is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getByIx is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		return this.entities[ix];
 	}
@@ -1160,7 +1186,8 @@ export default class Repository extends EventEmitter {
 	 */
 	getByRange = (startIx, endIx) => {
 		if (this.isDestroyed) {
-			throw Error('this.getByRange is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getByRange is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		return _.slice(this.entities, startIx, endIx+1);
 	}
@@ -1172,7 +1199,8 @@ export default class Repository extends EventEmitter {
 	 */
 	getById = (id) => {
 		if (this.isDestroyed) {
-			throw Error('this.getById is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getById is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		return this.getFirstBy(entity => entity.id === id);
 	}
@@ -1184,7 +1212,8 @@ export default class Repository extends EventEmitter {
 	 */
 	getIxById = (id) => {
 		if (this.isDestroyed) {
-			throw Error('this.getIxById is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getIxById is no longer valid. Repository has been destroyed.');
+			return;
 		}
 
 		const ix = this.entities.findIndex((entity) => entity.id === id);
@@ -1201,7 +1230,8 @@ export default class Repository extends EventEmitter {
 	 */
 	getBy = (filter) => {
 		if (this.isDestroyed) {
-			throw Error('this.getBy is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getBy is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		return _.filter(this.entities, filter);
 	}
@@ -1217,7 +1247,8 @@ export default class Repository extends EventEmitter {
 	 */
 	getFirstBy = (filter) => {
 		if (this.isDestroyed) {
-			throw Error('this.getFirstBy is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getFirstBy is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		return _.find(this.entities, filter);
 	}
@@ -1229,7 +1260,8 @@ export default class Repository extends EventEmitter {
 	 */
 	getPhantom = (entities = null) => {
 		if (this.isDestroyed) {
-			throw Error('this.getPhantom is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getPhantom is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		if (!entities) {
 			entities = this.entities;
@@ -1244,7 +1276,8 @@ export default class Repository extends EventEmitter {
 	 */
 	getNonPersisted = (entities = null) => {
 		if (this.isDestroyed) {
-			throw Error('this.getDirty is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getDirty is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		if (!entities) {
 			entities = this.entities;
@@ -1259,7 +1292,8 @@ export default class Repository extends EventEmitter {
 	 */
 	getEntities = () => {
 		if (this.isDestroyed) {
-			throw Error('this.getEntities is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getEntities is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		return this.entities;
 	}
@@ -1273,7 +1307,8 @@ export default class Repository extends EventEmitter {
 	 */
 	getEntitiesOnPage = () => {
 		if (this.isDestroyed) {
-			throw Error('this.getPagedEntities is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getPagedEntities is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		const entities = this.getEntities();
 		if (!this.isPaginated) {
@@ -1294,7 +1329,8 @@ export default class Repository extends EventEmitter {
 	 */
 	getDirty = (entities = null) => {
 		if (this.isDestroyed) {
-			throw Error('this.getDirty is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getDirty is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		if (!entities) {
 			entities = this.entities;
@@ -1309,7 +1345,8 @@ export default class Repository extends EventEmitter {
 	 */
 	getDeleted = (entities = null) => {
 		if (this.isDestroyed) {
-			throw Error('this.getDeleted is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getDeleted is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		if (!entities) {
 			entities = this.entities;
@@ -1324,7 +1361,8 @@ export default class Repository extends EventEmitter {
 	 */
 	getStaged = (entities = null) => {
 		if (this.isDestroyed) {
-			throw Error('this.getStaged is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getStaged is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		if (!entities) {
 			entities = this.entities;
@@ -1338,7 +1376,8 @@ export default class Repository extends EventEmitter {
 	 */
 	getSchema = () => {
 		if (this.isDestroyed) {
-			throw Error('this.getSchema is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getSchema is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		return this.schema;
 	}
@@ -1349,7 +1388,8 @@ export default class Repository extends EventEmitter {
 	 */
 	getSortField = () => {
 		if (this.isDestroyed) {
-			throw Error('this.getSortField is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getSortField is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		if (!this.allowsMultiSort || this.sorters.length < 1) {
 			return null;
@@ -1363,7 +1403,8 @@ export default class Repository extends EventEmitter {
 	 */
 	getSortDirection = () => {
 		if (this.isDestroyed) {
-			throw Error('this.getSortDirection is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getSortDirection is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		if (!this.allowsMultiSort || this.sorters.length < 1) {
 			return null;
@@ -1377,7 +1418,8 @@ export default class Repository extends EventEmitter {
 	 */
 	getSortFn = () => {
 		if (this.isDestroyed) {
-			throw Error('this.getSortDirection is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getSortDirection is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		if (!this.allowsMultiSort || this.sorters.length < 1) {
 			return null;
@@ -1392,7 +1434,8 @@ export default class Repository extends EventEmitter {
 	 */
 	getAssociatedRepository = (repositoryName) => {
 		if (this.isDestroyed) {
-			throw Error('this.getAssociatedRepository is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getAssociatedRepository is no longer valid. Repository has been destroyed.');
+			return;
 		}
 
 		const schema = this.getSchema();
@@ -1401,17 +1444,20 @@ export default class Repository extends EventEmitter {
 			!schema.model.associations.belongsTo.includes(repositoryName) &&
 			!schema.model.associations.belongsToMany.includes(repositoryName)
 			) {
-			throw Error(repositoryName + ' is not associated with this schema');
+			this.throwError(repositoryName + ' is not associated with this schema');
+			return;
 		}
 
 		const oneHatData = this.oneHatData;
 		if (!oneHatData) {
-			throw Error('No global oneHatData object');
+			this.throwError('No global oneHatData object');
+			return;
 		}
 
 		const associatedRepository = oneHatData.getRepository(repositoryName);
 		if (!associatedRepository) {
-			throw Error('Repository ' + repositoryName + ' cannot be found');
+			this.throwError('Repository ' + repositoryName + ' cannot be found');
+			return;
 		}
 		
 		return associatedRepository;
@@ -1425,7 +1471,8 @@ export default class Repository extends EventEmitter {
 	 */
 	isInRepository(idOrEntity) {
 		if (this.isDestroyed) {
-			throw Error('this.isInRepository is no longer valid. Repository has been destroyed.');
+			this.throwError('this.isInRepository is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		if (idOrEntity instanceof Entity) {
 			return this.entities.indexOf(idOrEntity) !== -1;
@@ -1440,7 +1487,8 @@ export default class Repository extends EventEmitter {
 	 */
 	get isDirty() {
 		if (this.isDestroyed) {
-			throw Error('this.isDirty is no longer valid. Repository has been destroyed.');
+			this.throwError('this.isDirty is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		return !!this.getDirty().length;
 	}
@@ -1473,7 +1521,8 @@ export default class Repository extends EventEmitter {
 	 */
 	save = async (entity = null, useStaged = false) => {
 		if (this.isDestroyed) {
-			throw Error('this.save is no longer valid. Repository has been destroyed.');
+			this.throwError('this.save is no longer valid. Repository has been destroyed.');
+			return;
 		}
 
 		this.emit('beforeSave'); // So subclasses can prep anything needed for saving
@@ -1619,7 +1668,8 @@ export default class Repository extends EventEmitter {
 	 * @abstract
 	 */
 	_doBatchAdd(entities) { // standard function notation
-		throw new Error('_doBatchAdd must be implemented by Repository subclass');
+		this.throwError('_doBatchAdd must be implemented by Repository subclass');
+		return;
 	}
 
 	/**
@@ -1630,7 +1680,8 @@ export default class Repository extends EventEmitter {
 	 * @abstract
 	 */
 	_doAdd(entity) { // standard function notation
-		throw new Error('_doAdd must be implemented by Repository subclass');
+		this.throwError('_doAdd must be implemented by Repository subclass');
+		return;
 	}
 
 	/**
@@ -1641,7 +1692,8 @@ export default class Repository extends EventEmitter {
 	 * @abstract
 	 */
 	_doBatchEdit(entities) { // standard function notation
-		throw new Error('_doBatchEdit must be implemented by Repository subclass');
+		this.throwError('_doBatchEdit must be implemented by Repository subclass');
+		return;
 	}
 
 	/**
@@ -1652,7 +1704,8 @@ export default class Repository extends EventEmitter {
 	 * @abstract
 	 */
 	_doEdit(entity) { // standard function notation
-		throw new Error('_doEdit must be implemented by Repository subclass');
+		this.throwError('_doEdit must be implemented by Repository subclass');
+		return;
 	}
 
 	/**
@@ -1663,7 +1716,8 @@ export default class Repository extends EventEmitter {
 	 * @abstract
 	 */
 	_doBatchDelete(entities) { // standard function notation
-		throw new Error('_doBatchDelete must be implemented by Repository subclass');
+		this.throwError('_doBatchDelete must be implemented by Repository subclass');
+		return;
 	}
 
 	/**
@@ -1674,7 +1728,8 @@ export default class Repository extends EventEmitter {
 	 * @abstract
 	 */
 	_doDelete(entity) { // standard function notation
-		throw new Error('_doDelete must be implemented by Repository subclass');
+		this.throwError('_doDelete must be implemented by Repository subclass');
+		return;
 	}
 
 	/**
@@ -1710,7 +1765,8 @@ export default class Repository extends EventEmitter {
 	 */
 	delete = async (entities) => {
 		if (this.isDestroyed) {
-			throw Error('this.delete is no longer valid. Repository has been destroyed.');
+			this.throwError('this.delete is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		if (!entities) {
 			return false;
@@ -1873,6 +1929,26 @@ export default class Repository extends EventEmitter {
 		_.merge(this, options);
 	}
 
+	/**
+	 * Set error handler for this repository
+	 * @param {function} handler - the error handler
+	 */
+	setErrorHandler = (handler) => {
+		this.errorHandler = handler;
+	}
+
+
+	/**
+	 * Either generates an exception, or handles it with the repository's errorHandler
+	 * @param {string|object|bool} error - the error message
+	 */
+	throwError(obj) {
+		if (this.errorHandler) {
+			this.errorHandler(obj);
+		} else {
+			throw Error(obj);
+		}
+	}
 
 	/**
 	 * Destroy this object.
@@ -1904,7 +1980,8 @@ export default class Repository extends EventEmitter {
 	 */
 	getClassName = () => {
 		if (this.isDestroyed) {
-			throw Error('this.getClassName is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getClassName is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		return this.__proto__.constructor.className;
 	}
@@ -1919,7 +1996,8 @@ export default class Repository extends EventEmitter {
 	 */
 	getType = () => {
 		if (this.isDestroyed) {
-			throw Error('this.getClassName is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getClassName is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		return this.__proto__.constructor.type;
 	}
@@ -1930,7 +2008,8 @@ export default class Repository extends EventEmitter {
 
 	toString = () => {
 		if (this.isDestroyed) {
-			throw Error('this.toString is no longer valid. Repository has been destroyed.');
+			this.throwError('this.toString is no longer valid. Repository has been destroyed.');
+			return;
 		}
 		return this.getClassName() + 'Repository {' + this.name + '} - ' + this.id;
 	}