@onehat/data 1.23.3 → 1.23.6

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

@@ -942,6 +942,7 @@ describe('Repository Base', function() {
 
 	describe('deleting', function() {
 
+
 		it('clear', function() {
 			this.repository.clear();
 			expect(this.repository.entities.length).to.be.eq(0);
@@ -967,6 +968,21 @@ describe('Repository Base', function() {
 			expect(this.repository.entities.length).to.be.eq(5);
 		});
 
+		it('removeById', function() {
+			const entity = this.repository.entities[0];
+			const id = entity.id;
+			this.repository.removeById(id);
+			expect(this.repository.entities.includes(entity)).to.be.false;
+		});
+
+		it('removeDestroyedEntities', function() {
+			const entity = this.repository.entities[0];
+			expect(this.repository.entities.includes(entity)).to.be.true;
+			entity.destroy();
+			this.repository.removeDestroyedEntities();
+			expect(this.repository.entities.includes(entity)).to.be.false;
+		});
+
 
 		// I'm going to skip these, as they're just combinations of other, tested functions
 		// deleteByIx

package/package.json

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

package/src/Repository/OneBuild.js

@@ -417,10 +417,6 @@ class OneBuildRepository extends AjaxRepository {
 			return null;
 		}
 
-		this._relayEntityEvents(entity);
-		this.entities.push(entity);
-		this.total++;
-		this._setPaginationVars();
 		this.emit('changeData', this.entities);
 		return entity;
 	}
@@ -430,33 +426,69 @@ class OneBuildRepository extends AjaxRepository {
 			this.throwError('this.getSingleEntityFromServer is no longer valid. Repository has been destroyed.');
 			return;
 		}
+		return this.getMultipleEntitiesFromServer([id])
+					.then(entities => {
+						if (!entities || entities.length === 0) {
+							return null;
+						}
+						return entities[0];
+					});
+	}
+
+	async getMultipleEntitiesFromServer(ids) {
+		if (this.isDestroyed) {
+			this.throwError('this.getMultipleEntitiesFromServer is no longer valid. Repository has been destroyed.');
+			return;
+		}
 		if (!this.api.get) {
 			this.throwError('No "get" api endpoint defined.');
 			return;
 		}
 
-		if (!id) {
+		if (!ids || !Array.isArray(ids) || ids.length === 0) {
 			return null;
 		}
 
+		const entitiesById = new Map();
+		_.each(this.entities, (entity) => {
+			entitiesById.set(entity.id, entity);
+		});
+
+		const idsToFetch = [];
+		const idsToFetchSet = new Set();
+		_.each(ids, (id) => {
+			if (entitiesById.has(id)) {
+				return;
+			}
+			if (idsToFetchSet.has(id)) {
+				return;
+			}
+			idsToFetchSet.add(id);
+			idsToFetch.push(id);
+		});
+
+		if (!idsToFetch.length) {
+			return [];
+		}
+
 		this.markLoading();
 
 		const idPropertyName = this.getSchema().model.idProperty;
 		const params = {};
-		params['conditions[' + idPropertyName + ']'] = id;
+		params['conditions[' + idPropertyName + ' IN]'] = idsToFetch;
 
 		const
 			url = this.getModel() + '/' + this.api.get,
 			data = _.merge(params, this._baseParams);
 
 		if (this.debugMode) {
-			console.log('getSingleEntityFromServer', data);
+			console.log('getMultipleEntitiesFromServer', data);
 		}
 
 		return this._send(this.methods.get, url, data)
 					.then(result => {
 						if (this.debugMode) {
-							console.log('Response for getSingleEntityFromServer for ' + this.name, result);
+							console.log('Response for getMultipleEntitiesFromServer for ' + this.name, result);
 						}
 
 						if (this.isDestroyed) {
@@ -473,18 +505,48 @@ class OneBuildRepository extends AjaxRepository {
 						} = this._processServerResponse(result);
 
 						if (!root[0]) {
-							return null;
+							return [];
 						}
 
-						const entity = this.createStandaloneEntity(root[0]);
-						entity.isPersisted = true;
-						entity.isRemotePhantom = false;
-						return entity;
+						const newEntities = [];
+						_.each(root, (item) => {
+							const entity = this.createStandaloneEntity(item);
+
+							if (entitiesById.has(entity.id)) {
+								// If an entity with the same ID already exists, we don't want to add a duplicate.
+								entity.destroy();
+								return;
+							}
+
+							entity.isPersisted = true;
+							entity.isRemotePhantom = false;
+							this._relayEntityEvents(entity);
+							entitiesById.set(entity.id, entity);
+							newEntities.push(entity);
+						});
+
+						// Add any new entities to the repository's main entities array.
+						if (newEntities.length) {
+							this.entities = this.entities.concat(newEntities);
+						}
+						if (this.isTree) {
+							this.assembleTreeNodes();
+							// pagination vars shouldn't be affected by the loading of additional entities
+						}
+
+						// I don't want to do the following because there might be event handler
+						// side-effects of loading these!
+						// this.markLoaded();
+						// this.rehash();
+						// this.emit('load', this);
+
+						return newEntities;
 					})
 					.finally(() => {
 						this.markLoading(false);
 					});
 
+
 	}
 
 	async getLastModifiedDate() {

package/src/Repository/Repository.js

@@ -2074,6 +2074,24 @@ export default class Repository extends EventEmitter {
 		}
 	}
 
+	/**
+	 * Removes an Entity from the current page by ID
+	 */
+	removeById(id) {
+		const entity = this.getById(id);
+		if (entity) {
+			this.removeEntity(entity);
+		}
+	}
+
+	/**
+	 * Removes all entities that have been destroyed from the current page.
+	 * This is an optimized version of removeById, specifically targeting destroyed entities.
+	 */
+	removeDestroyedEntities() {
+		this.entities = _.filter(this.entities, (entity) => !entity.isDestroyed);
+	}
+
 	/**
 	 * Deletes a single Entity by its index (zero-indexed) on the current page
 	 * @param {integer} ix - Index