@onehat/data 1.16.3 → 1.16.6

package/package.json

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

package/src/Entity.js

@@ -105,7 +105,7 @@ class Entity extends EventEmitter {
 
 		/**
 		 * @member {boolean} isPersisted - Whether this object has been persisted in a storage medium
-		 * @private
+		 * @public
 		 */
 		this.isPersisted = false;
 		
@@ -117,16 +117,22 @@ class Entity extends EventEmitter {
 
 		/**
 		 * @member {boolean} isDeleted - Whether this object has been marked for deletion
-		 * @private
+		 * @public
 		 */
 		this.isDeleted = false;
 
 		/**
 		 * @member {boolean} isStaged - Whether this object has been marked for saving
-		 * @private
+		 * @public
 		 */
 		this.isStaged = false;
 
+		/**
+		 * @member {boolean} isSaving - Whether this object is in the process of saving
+		 * @public
+		 */
+		this.isSaving = false;
+
 		/**
 		 * @member {boolean} isDestroyed - Whether this object has been destroyed
 		 * @public
@@ -143,6 +149,7 @@ class Entity extends EventEmitter {
 		 * @member {boolean} isRemotePhantomMode - Whether this Entity uses the "alternate" CRUD mode, with tempIds from server (see OneBuild repository)
 		 * On a Repository, this mode overrides repository.isAutoSave, entity.isPersisted, && entity.isDelayedSave.
 		 * On an Entity, this mode affects the isPhantom getter.
+		 * @public
 		 * @readonly
 		 */
 		this.isRemotePhantomMode = isRemotePhantomMode;
@@ -1293,7 +1300,7 @@ class Entity extends EventEmitter {
 	}
 
 	/**
-	 * Marks an entity as having been saved to storage medium.
+	 * Marks an entity for deletion.
 	 * @param {boolean} bool - How it should be marked. Defaults to true.
 	 */
 	markDeleted = (bool = true) => {

package/src/Repository/Ajax.js

@@ -532,6 +532,7 @@ class AjaxRepository extends Repository {
 		}
 
 		this._operations.add = true;
+		entity.isSaving = true;
 
 		const
 			method = this.methods.add,
@@ -554,6 +555,8 @@ class AjaxRepository extends Repository {
 							message
 						} = this._processServerResponse(result);
 
+						entity.isSaving = false;
+
 						if (!success) {
 							this.throwError(message);
 							return;
@@ -590,6 +593,7 @@ class AjaxRepository extends Repository {
 					if (entity.isRemotePhantomMode) {
 						values.isRemotePhantom = true;
 					}
+					entity.isSaving = true;
 					return values;
 				}),
 			};
@@ -606,6 +610,10 @@ class AjaxRepository extends Repository {
 							message
 						} = this._processServerResponse(result);
 
+						_.each(entities, (entity) => {
+							entity.isSaving = false;
+						});
+
 						if (!success) {
 							this.throwError(message);
 							return;
@@ -634,6 +642,7 @@ class AjaxRepository extends Repository {
 		}
 
 		this._operations.edit = true;
+		entity.isSaving = true;
 
 		const
 			method = this.methods.edit,
@@ -656,6 +665,8 @@ class AjaxRepository extends Repository {
 							message
 						} = this._processServerResponse(result);
 
+						entity.isSaving = false;
+
 						if (!success) {
 							this.throwError(message);
 							return;
@@ -692,6 +703,7 @@ class AjaxRepository extends Repository {
 					if (entity.isRemotePhantomMode) {
 						values.isRemotePhantom = false;
 					}
+					entity.isSaving = true;
 					return values;
 				}),
 			};
@@ -708,6 +720,10 @@ class AjaxRepository extends Repository {
 							message
 						} = this._processServerResponse(result);
 
+						_.each(entities, (entity) => {
+							entity.isSaving = false;
+						});
+
 						if (!success) {
 							this.throwError(message);
 							return;
@@ -736,6 +752,7 @@ class AjaxRepository extends Repository {
 		}
 
 		this._operations.delete = true;
+		entity.isSaving = true;
 
 		const
 			method = this.methods.delete,
@@ -753,6 +770,8 @@ class AjaxRepository extends Repository {
 							total,
 							message
 						} = this._processServerResponse(result);
+
+						entity.isSaving = false;
 						
 						if (!success) {
 							this.throwError(message);
@@ -784,7 +803,10 @@ class AjaxRepository extends Repository {
 		const
 			method = this.methods.delete,
 			url = this.api.batchDelete,
-			ids = _.map(entities, entity => entity.id),
+			ids = _.map(entities, (entity) => {
+				entity.isSaving = true;
+				return entity.id;
+			}),
 			data = { ids, };
 
 		return this._send(method, url, data)
@@ -799,6 +821,10 @@ class AjaxRepository extends Repository {
 							message
 						} = this._processServerResponse(result);
 						
+						_.each(entities, (entity) => {
+							entity.isSaving = false;
+						});
+
 						if (!success) {
 							this.throwError(message);
 							return;

package/src/Repository/Repository.js

@@ -991,7 +991,7 @@ export default class Repository extends EventEmitter {
 			entity = Repository._createEntity(this.schema, data, this, isPersisted, originalIsMapped, isDelayedSave, this.isRemotePhantomMode);
 		}
 		this._relayEntityEvents(entity);
-		this.entities.push(entity);
+		this.entities.unshift(entity);
 
 		// Create id if needed
 		if (!this.isRemotePhantomMode && entity.isPhantom) {
@@ -1286,7 +1286,7 @@ export default class Repository extends EventEmitter {
 		if (!entities) {
 			entities = this.entities;
 		}
-		return _.filter(this.entities, entity => entity.isPhantom);
+		return _.filter(this.entities, entity => entity.isPhantom && !entity.isSaving);
 	}
 
 	/**
@@ -1296,13 +1296,13 @@ export default class Repository extends EventEmitter {
 	 */
 	getNonPersisted = (entities = null) => {
 		if (this.isDestroyed) {
-			this.throwError('this.getDirty is no longer valid. Repository has been destroyed.');
+			this.throwError('this.getNonPersisted is no longer valid. Repository has been destroyed.');
 			return;
 		}
 		if (!entities) {
 			entities = this.entities;
 		}
-		return _.filter(this.entities, entity => !entity.isPersisted);
+		return _.filter(this.entities, entity => !entity.isPersisted && !entity.isSaving);
 	}
 
 	/**
@@ -1355,7 +1355,7 @@ export default class Repository extends EventEmitter {
 		if (!entities) {
 			entities = this.entities;
 		}
-		return _.filter(entities, entity => entity.isDirty);
+		return _.filter(entities, entity => entity.isDirty && !entity.isSaving);
 	}
 
 	/**
@@ -1387,7 +1387,7 @@ export default class Repository extends EventEmitter {
 		if (!entities) {
 			entities = this.entities;
 		}
-		return _.filter(entities, entity => entity.isStaged);
+		return _.filter(entities, entity => entity.isStaged && !entity.isSaving);
 	}
 
 	/**