@onehat/data 1.4.4 → 1.4.8

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

@@ -372,6 +372,19 @@ describe('Repository Base', function() {
 			expect(didFireChangeFilters).to.be.true;
 		});
 
+		it('changing filters resets pagination', function() {
+			this.repository.isPaginated = true;
+			this.repository.setPageSize(1);
+			this.repository.setPage(3);
+
+			this.repository.setFilters({
+				b: '1',
+				c: '2',
+			});
+
+			expect(this.repository.page).to.be.eq(1);
+		});
+
 	});
 
 	describe('pagination', function() {
@@ -414,29 +427,73 @@ 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);
+		});
+
+		it('reset pagination', function() {
+			expect(this.repository.page).to.be.eq(1);
+			
+			this.repository.isPaginated = true;
+			this.repository.setPageSize(1);
+			this.repository.setPage(3);
+			expect(this.repository.page).to.be.eq(3);
+
+			this.repository.resetPagination();
+			expect(this.repository.page).to.be.eq(1);
 		});
 
 	});

package/package.json

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

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/Ajax.js

@@ -292,8 +292,8 @@ class AjaxRepository extends Repository {
 	 */
 	_onChangeSorters = () => {
 		const sorter = this.sorters[0];
-		this.setParam(this.paramSort, sorter.name);
-		this.setParam(this.paramDirection, sorter.direction);
+		this.setParam(this.paramSort, sorter.name, true); // true to set baseParam
+		this.setParam(this.paramDirection, sorter.direction, true);
 		
 		if (this.isLoaded) {
 			return this.reload();
@@ -319,8 +319,8 @@ class AjaxRepository extends Repository {
 	 * Refreshes entities.
 	 */
 	_onChangePagination = () => {
-		this.setParam(this.paramPageNum, this.page);
-		this.setParam(this.paramPageSize, this.pageSize);
+		this.setParam(this.paramPageNum, this.page, true); // true to set baseParam
+		this.setParam(this.paramPageSize, this.pageSize, true);
 
 		if (this.isLoaded) {
 			return this.reload();

package/src/Repository/Repository.js

@@ -648,6 +648,7 @@ export default class Repository extends EventEmitter {
 		if (!_.isEqual(this.filters, filters)) {
 			isChanged = true;
 			this.filters = filters;
+			this.resetPagination();
 			this.emit('changeFilters');
 			if (this._onChangeFilters) {
 				return this._onChangeFilters();
@@ -666,6 +667,17 @@ export default class Repository extends EventEmitter {
 	// /_/    \__,_/\__, /_/_/ /_/\__,_/\__/\___/
 	//             /____/
 
+	/**
+	 * Resets the pagination to page one
+	 * @fires changePageSize
+	 */
+	resetPagination = (pageSize) => {
+		if (this.isDestroyed) {
+			throw Error('this.resetPagination is no longer valid. Repository has been destroyed.');
+		}
+		this.setPage(1);
+	}
+
 	/**
 	 * Sets the pageSize
 	 * @fires changePageSize
@@ -779,12 +791,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,
@@ -1302,6 +1340,9 @@ export default class Repository extends EventEmitter {
 		if (!_.isArray(entities)) {
 			entities = [entities];
 		}
+		if (!entities.length) {
+			return;
+		}
 		_.each(entities, (entity) => {
 			entity.markDeleted(); // Entity is still there, it's just marked for deletion
 		});