@onehat/data 1.21.11 → 1.21.13

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

@@ -325,14 +325,24 @@ describe('Repository Base', function() {
 			expect(filter.value).to.be.eq('1');
 		});
 	
-		it('filter - object', function() {
+		it.only('filter - object', function() {
+			// two possible ways to call filter with an object
+			// 1. filter({ name: 'key', value: '1' });
 			this.repository.filter({
 				name: 'key',
 				value: '1',
 			});
-			const filter = this.repository.filters[0];
-			expect(filter.name).to.be.eq('key');
-			expect(filter.value).to.be.eq('1');
+			const filter1 = this.repository.filters[0];
+			expect(filter1.name).to.be.eq('key');
+			expect(filter1.value).to.be.eq('1');
+
+			// 2. filter({ key: '1' });
+			this.repository.filter({
+				key: '1',
+			});
+			const filter2 = this.repository.filters[0];
+			expect(filter2.name).to.be.eq('key');
+			expect(filter2.value).to.be.eq('1');
 		});
 	
 		it('filter - array', function() {

package/package.json

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

package/src/Repository/OneBuild.js

@@ -238,17 +238,26 @@ class OneBuildRepository extends AjaxRepository {
 	 */
 	_processServerResponse(result) {
 
+		const retNull = {
+			root: null,
+			success: false,
+			total: 0,
+			message: null,
+		};
+
 		if (result === false) { // e.g. 401 error
-			return {
-				root: null,
-				success: false,
-				total: 0,
-				message: null,
-			};
+			return retNull;
+		}
+
+		// use try/catch in case the response is not JSON
+		let response;
+		try {
+			response = _.isPlainObject(result.data) ? result.data : this.reader.read(result.data);
+		} catch(e) {
+			return retNull;
 		}
 
 		const
-			response = _.isPlainObject(result.data) ? result.data : this.reader.read(result.data),
 			root = response[this.rootProperty],
 			success = response[this.successProperty],
 			total = response[this.totalProperty],
@@ -543,22 +552,22 @@ class OneBuildRepository extends AjaxRepository {
 			return;
 		}
 
+		const data = {
+			url: 'Users/apiLogout',
+			method: 'POST',
+			baseURL: this.api.baseURL,
+			headers: _.merge({
+				'Content-Type': 'application/json',
+				Accept: 'application/json',
+			}, this.headers),
+			timeout: this.timeout,
+		};
+
 		if (this.debugMode) {
-			console.log('logout');
+			console.log('logout', data);
 		}
 
-		const headers = _.merge({
-							'Content-Type': 'application/json',
-							Accept: 'application/json',
-						}, this.headers);
-
-		return this.axios({
-				url: 'Users/apiLogout',
-				method: 'POST',
-				baseURL: this.api.baseURL,
-				headers,
-				timeout: this.timeout,
-			})
+		return this.axios(data)
 			.then((result) => {
 				if (this.debugMode) {
 					console.log('logout response', result);

package/src/Repository/Repository.js

@@ -729,7 +729,19 @@ export default class Repository extends EventEmitter {
 			}];
 		} else if (_.isArray(arg1)) {
 			newFilters = arg1;
-		} else if (_.isObject(arg1)) { // includes functions
+		} else if (_.isPlainObject(arg1)) {
+			if (arg1.name) {
+				// like { name: 'first_name', value: 'Steve' }
+				newFilters = [arg1];
+			} else {
+				// like { first_name: 'Steve' }
+				const name = Object.keys(arg1)[0];
+				newFilters = [{
+					name,
+					value: arg1[name],
+				}];
+			}
+		} else if (_.isFunction(arg1)) {
 			newFilters = [arg1];
 		}