@onehat/data 1.19.9 → 1.19.11

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

@@ -583,6 +583,15 @@ describe('Repository Base', function() {
 			expect(this.repository.page).to.be.eq(1);
 		});
 
+		it('setIsPaginated', function() {
+			
+			this.repository.setIsPaginated(true);
+			expect(this.repository.isPaginated).to.be.true;
+			
+			this.repository.setIsPaginated(false);
+			expect(this.repository.isPaginated).to.be.false;
+		});
+
 	});
 
 	describe('creating', function() {

package/package.json

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

package/src/Repository/Ajax.js

@@ -362,8 +362,8 @@ class AjaxRepository extends Repository {
 	 * Refreshes entities.
 	 */
 	_onChangePagination = () => {
-		this.setBaseParam(this.paramPageNum, this.page);
-		this.setBaseParam(this.paramPageSize, this.pageSize);
+		this.setBaseParam(this.paramPageNum, this.isPaginated ? this.page : null);
+		this.setBaseParam(this.paramPageSize, this.isPaginated ? this.pageSize : null);
 
 		if (this.isLoaded && !this.eventsPaused) {
 			return this.reload();
@@ -399,6 +399,17 @@ class AjaxRepository extends Repository {
 		this.emit('beforeLoad'); // TODO: canceling beforeLoad will cancel the load operation
 		this.markLoading();
 
+		if (params?.showMore) {
+			delete params.showMore;
+			this.isShowingMore = true;
+		} else {
+			this.isShowingMore = false;
+		}
+		if (this.isShowingMore) {
+			this.pauseEvents();
+			this.setPage(this.page +1);
+			this.resumeEvents();
+		}
 
 		if (!_.isNil(params) && _.isObject(params)) {
 			this.setParams(params);
@@ -426,14 +437,23 @@ class AjaxRepository extends Repository {
 							message
 						} = this._processServerResponse(result);
 
-						this._destroyEntities();
-
-						// Set the current entities
-						this.entities = _.map(root, (data) => {
-							const entity = Repository._createEntity(this.schema, data, repository, true);
-							this._relayEntityEvents(entity);
-							return entity;
-						});
+						if (this.isShowingMore) {
+							// Add to the current entities
+							const newEntities = _.map(root, (data) => {
+								const entity = Repository._createEntity(this.schema, data, repository, true);
+								this._relayEntityEvents(entity);
+								return entity;
+							});
+							this.entities = this.entities.concat(newEntities);
+						} else {
+							// Replace the current entities
+							this._destroyEntities();
+							this.entities = _.map(root, (data) => {
+								const entity = Repository._createEntity(this.schema, data, repository, true);
+								this._relayEntityEvents(entity);
+								return entity;
+							});
+						}
 				
 						// Set the total records that pass filter
 						this.total = total;
@@ -456,6 +476,11 @@ class AjaxRepository extends Repository {
 					});
 	}
 
+	showMore = (params = {}, callback) => {
+		params.showMore = true;
+		return this.load(params, callback);
+	}
+
 	/**
 	 * Reload a single entity from storage. 
 	 * If the entity is in the internal representation, update it.

package/src/Repository/Repository.js

@@ -102,6 +102,11 @@ export default class Repository extends EventEmitter {
 			 */
 			isPaginated: false,
 
+			/**
+			 * @member {bool} isShowingMore - Whether this repository is in "show more" mode
+			 */
+			isShowingMore: false,
+
 			/**
 			 * @member {number} pageSize - Max number of entities per page
 			 * Example: For "Showing 21-30 of 45" This would be 10
@@ -801,8 +806,25 @@ export default class Repository extends EventEmitter {
 		this.setPage(1);
 	}
 
+	/**
+	 * Sets isPaginated
+	 */
+	setIsPaginated = (bool) => {
+		if (this.isDestroyed) {
+			this.throwError('this.setIsPaginated is no longer valid. Repository has been destroyed.');
+			return;
+		}
+		this.isPaginated = bool;
+
+		if (this._onChangePagination) {
+			return this._onChangePagination();
+		}
+		return true;
+	}
+
 	/**
 	 * Sets the pageSize
+	 * @fires changePage
 	 * @fires changePageSize
 	 */
 	setPageSize = (pageSize) => {
@@ -834,6 +856,7 @@ export default class Repository extends EventEmitter {
 	/**
 	 * Advances to a specific page of entities
 	 * @return {boolean} success
+	 * @fires changePage
 	 */
 	setPage = (page) => {
 		if (this.isDestroyed) {