@onehat/data 1.18.2 → 1.18.4

package/package.json

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

package/src/Repository/Ajax.js

@@ -124,6 +124,7 @@ class AjaxRepository extends Repository {
 			add: false,
 			edit: false,
 			delete: false,
+			deletePhantom: false,
 		};
 
 	}
@@ -537,6 +538,7 @@ class AjaxRepository extends Repository {
 			add: false,
 			edit: false,
 			delete: false,
+			deletePhantom: false,
 		};
 	}
 
@@ -763,7 +765,11 @@ class AjaxRepository extends Repository {
 			return;
 		}
 
-		this._operations.delete = true;
+		if (entity.isRemotePhantomMode && entity.isPhantom) {
+			this._operations.deletePhantom = true;
+		} else {
+			this._operations.delete = true;
+		}
 		entity.isSaving = true;
 
 		const
@@ -792,7 +798,7 @@ class AjaxRepository extends Repository {
 
 						// Delete it from this.entities
 						const id = entity.id;
-						this.entities = _.filter(this.entities, (entity) => entity.id === id);
+						this.entities = _.filter(this.entities, (entity) => entity.id !== id);
 						entity.destroy();
 					});
 	}
@@ -810,7 +816,7 @@ class AjaxRepository extends Repository {
 			return;
 		}
 
-		this._operations.delete = true;
+		this._operations.delete = true; // NOTE: We don't use batchDelete for remotePhantom records
 
 		const
 			method = this.methods.delete,
@@ -966,8 +972,16 @@ class AjaxRepository extends Repository {
 
 							// Do we need to reload?
 							if (!this.eventsPaused) {
-								if (this._operations.add && this.isRemotePhantomMode) {
+								if (this.isRemotePhantomMode && (this._operations.add || this._operations.deletePhantom)) {
 									// Do nothing, as we don't want to immediately reload on add for a remote phantom mode record. It won't appear, and it will cause all kinds of trouble!
+									if (this._operations.deletePhantom) {
+										// sweep existing deleted records and remove them
+										_.each(this.entities, (entity) => {
+											if (entity.isDeleted && entity.isDestroyed) {
+												this.removeEntity(entity);
+											}
+										})
+									}
 								} else if (this._operations.add || this._operations.delete) {
 									this.reload();
 								} else {

package/src/Repository/Repository.js

@@ -1796,7 +1796,7 @@ export default class Repository extends EventEmitter {
 			if (!entity) {
 				return;
 			}
-			if (entity.isPhantom) {
+			if (entity.isPhantom && !entity.isRemotePhantomMode) {
 				// Just auto-remove it. Don't bother saving to storage medium.
 				this.removeEntity(entity);
 			} else {
@@ -1818,7 +1818,9 @@ export default class Repository extends EventEmitter {
 	 */
 	removeEntity(entity) { // standard function notation so it can be called by child class via super.removeEntity
 		this.entities = _.filter(this.entities, e => e !== entity);
-		entity.destroy();
+		if (!entity.isDestroyed) {
+			entity.destroy();
+		}
 	}
 
 	/**