@onehat/data 1.4.2 → 1.4.6

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

@@ -414,29 +414,61 @@ describe('Repository Base', function() {
 		});
 
 		it('_calculatePaginationVars', function() {
-			let results = this.Repository._calculatePaginationVars(15, 1, 10), // Capital "R"
-				expected = {
-					page: 1,
-					pageSize: 10,
-					total: 15,
-					totalPages: 2,
-					pageStart: 1,
-					pageEnd: 10,
-					pageTotal: 10,
-				};
-			expect(_.isEqual(results, expected)).to.be.true;
-
-			results = this.Repository._calculatePaginationVars(15, 2, 10); // Capital "R"
-			expected = {
-				page: 2,
-				pageSize: 10,
-				total: 15,
-				totalPages: 2,
-				pageStart: 11,
-				pageEnd: 15,
-				pageTotal: 5,
-			};
-			expect(_.isEqual(results, expected)).to.be.true;
+			let results;
+
+			results = this.Repository._calculatePaginationVars(0, 1, 10);
+			expect(results.page).to.be.eq(1);
+			expect(results.pageSize).to.be.eq(10);
+			expect(results.total).to.be.eq(0);
+			expect(results.totalPages).to.be.eq(1);
+			expect(results.pageStart).to.be.eq(0);
+			expect(results.pageEnd).to.be.eq(0);
+			expect(results.pageTotal).to.be.eq(0);
+
+			results = this.Repository._calculatePaginationVars(15, 1, 10);
+			expect(results.page).to.be.eq(1);
+			expect(results.pageSize).to.be.eq(10);
+			expect(results.total).to.be.eq(15);
+			expect(results.totalPages).to.be.eq(2);
+			expect(results.pageStart).to.be.eq(1);
+			expect(results.pageEnd).to.be.eq(10);
+			expect(results.pageTotal).to.be.eq(10);
+
+			results = this.Repository._calculatePaginationVars(15, 2, 10);
+			expect(results.page).to.be.eq(2);
+			expect(results.pageSize).to.be.eq(10);
+			expect(results.total).to.be.eq(15);
+			expect(results.totalPages).to.be.eq(2);
+			expect(results.pageStart).to.be.eq(11);
+			expect(results.pageEnd).to.be.eq(15);
+			expect(results.pageTotal).to.be.eq(5);
+
+			results = this.Repository._calculatePaginationVars(15, 2, 5);
+			expect(results.page).to.be.eq(2);
+			expect(results.pageSize).to.be.eq(5);
+			expect(results.total).to.be.eq(15);
+			expect(results.totalPages).to.be.eq(3);
+			expect(results.pageStart).to.be.eq(6);
+			expect(results.pageEnd).to.be.eq(10);
+			expect(results.pageTotal).to.be.eq(5);
+
+			results = this.Repository._calculatePaginationVars(7, 2, 5);
+			expect(results.page).to.be.eq(2);
+			expect(results.pageSize).to.be.eq(5);
+			expect(results.total).to.be.eq(7);
+			expect(results.totalPages).to.be.eq(2);
+			expect(results.pageStart).to.be.eq(6);
+			expect(results.pageEnd).to.be.eq(7);
+			expect(results.pageTotal).to.be.eq(2);
+
+			results = this.Repository._calculatePaginationVars(15, 15, 1);
+			expect(results.page).to.be.eq(15);
+			expect(results.pageSize).to.be.eq(1);
+			expect(results.total).to.be.eq(15);
+			expect(results.totalPages).to.be.eq(15);
+			expect(results.pageStart).to.be.eq(15);
+			expect(results.pageEnd).to.be.eq(15);
+			expect(results.pageTotal).to.be.eq(1);
 		});
 
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/data",
-	"version": "1.4.2",
+	"version": "1.4.6",
 	"description": "JS data modeling package with adapters for many storage mediums.",
 	"main": "src/index.js",
 	"type": "module",
@@ -47,8 +47,7 @@
 		"numeral": "^2.0.6",
 		"qs": "^6.10.1",
 		"relative-time-parser": "^1.0.13",
-		"uuid-random": "^1.3.2",
-		"uuidv4": "^3.0.1"
+		"uuid": "^8.3.2"
 	},
 	"devDependencies": {
 		"@babel/core": "^7.14.6",

package/src/OneHatData.js

@@ -282,12 +282,15 @@ export class OneHatData extends EventEmitter {
 		if (this.isDestroyed) {
 			throw new Error('this.createRepositories is no longer valid. OneHatData has been destroyed.');
 		}
-		let promises = [];
-		_.each(schemas, (schema) => {
-			promises.push( this.createRepository({ schema, }, bound) );
-		});
-
-		await Promise.all(promises);
+		const schemasArray = _.map(schemas, (schema) => schema);
+		let i, schema, repository;
+		for (i = 0; i < schemasArray.length; i++) {
+			schema = schemasArray[i];
+			repository = await this.createRepository({ schema, }, bound);
+			if (!repository) {
+				throw new Error('Repository could not be created');
+			}
+		}
 		return this;
 	}
 

package/src/Repository/LocalFromRemote/LocalFromRemote.js

@@ -4,7 +4,9 @@ import EventEmitter from '@onehat/events';
 import Repository from '../Repository';
 import Command from './Command';
 import moment from 'relative-time-parser'; // Notice this version of moment is imported from 'relative-time-parser', and may be out of sync with our general 'moment' package
-import uuid from 'uuid-random'; // TEMP, until Expo supports cypto.getRandomValues() - https://github.com/uuidjs/uuid/issues/375
+import {
+	v4 as uuid,
+} from 'uuid';
 import _ from 'lodash';
 
 export const MODE_LOCAL_MIRROR = 'MODE_LOCAL_MIRROR';

package/src/Repository/OneBuild.js

@@ -4,6 +4,21 @@ import AjaxRepository from './Ajax';
 import qs from 'qs';
 import _ from 'lodash';
 
+const nonConditionFilters = [
+	'q',
+	'hydrate',
+	'fields',
+	'distinct',
+	'leftJoinWith',
+	'join',
+	'where',
+	'matching',
+	'contain',
+	'order',
+	'limit',
+	'page',
+];
+
 /**
  * This class contains overrides of specific functions in
  * AjaxRepository that are unique to OneBuild.
@@ -129,12 +144,16 @@ class OneBuildRepository extends AjaxRepository {
 		// Clear existing "conditions" params
 		if (!_.isEmpty(this._params)) {
 			this._params = _.omitBy(this._params, (value, key) => {
-				return key.match(/^conditions/);
+				return key.match(/^conditions/) || _.includes(nonConditionFilters, key);
 			});
 		}
 
 		_.each(this.filters, (filter, ix) => {
-			this.setParam('conditions[' + filter.name + ']', filter.value);
+			if (_.includes(nonConditionFilters, filter.name)) {
+				this.setParam(filter.name, filter.value);
+			} else {
+				this.setParam('conditions[' + filter.name + ']', filter.value);
+			}
 		});
 
 		if (this.isLoaded) {

package/src/Repository/Repository.js

@@ -2,7 +2,9 @@
 
 import EventEmitter from '@onehat/events';
 import Entity from '../Entity';
-import uuid from 'uuid-random'; // TEMP, until Expo supports cypto.getRandomValues() - https://github.com/uuidjs/uuid/issues/375
+import {
+	v4 as uuid,
+} from 'uuid';
 import _ from 'lodash';
 
 /**
@@ -777,12 +779,38 @@ export default class Repository extends EventEmitter {
 	 * @static
 	 */
 	static _calculatePaginationVars = (total, page, pageSize) => {
+
+		// Special case: empty pages
+		if (total < 1) {
+			return {
+				page,
+				pageSize,
+				total,
+				totalPages: 1,
+				pageStart: 0,
+				pageEnd: 0,
+				pageTotal: 0,
+			};
+		}
+
 		const totalPages = Math.ceil(total / pageSize),
-			pageStart = !total ? 0 : ((page -1) * pageSize) + 1,
-			remainder = total > pageSize ? total % pageSize : 0,
-			pageTotal = (page === 1 && totalPages === 1) ? total : 
-						(page < totalPages ? pageSize : remainder),
-			pageEnd = !total ? 0 : pageStart -1 + pageTotal;
+			pageStart = ((page -1) * pageSize) + 1;
+		
+		let remainder,
+			pageEnd,
+			pageTotal;
+
+		if (page === 1 && totalPages === 1) {
+			pageTotal = total;
+		} else if (page < totalPages) {
+			pageTotal = pageSize;
+		} else {
+			// last page
+			remainder = total % pageSize;
+			pageTotal = remainder || pageSize;
+		}
+
+		pageEnd = pageStart + pageTotal -1;
 		
 		return {
 			page,