@onehat/data 1.20.1 → 1.20.3

package/package.json

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

package/src/Entity/Entity.js

@@ -908,7 +908,7 @@ class Entity extends EventEmitter {
 		if (this.isDestroyed) {
 			throw Error('this.getIdProperty is no longer valid. Entity has been destroyed.');
 		}
-		const idProperty = this.getSchema().model?.idProperty || null;
+		const idProperty = this.getSchema()?.model?.idProperty || null;
 		if (!idProperty) {
 			throw new Error('No idProperty found for ' + schema.name);
 		}
@@ -964,7 +964,7 @@ class Entity extends EventEmitter {
 		}
 		const
 			schema = this.getSchema(),
-			model = schema.model,
+			model = schema?.model,
 			displayProperty = model && model.displayProperty ? model.displayProperty : null;
 		if (!displayProperty) {
 			throw new Error('No displayProperty found for ' + schema.name);
@@ -1066,10 +1066,10 @@ class Entity extends EventEmitter {
 		}
 
 		const schema = this.getSchema();
-		if (!schema.model.associations.hasOne.includes(repositoryName) &&
-			!schema.model.associations.hasMany.includes(repositoryName) &&
-			!schema.model.associations.belongsTo.includes(repositoryName) &&
-			!schema.model.associations.belongsToMany.includes(repositoryName)
+		if (!schema?.model.associations.hasOne.includes(repositoryName) &&
+			!schema?.model.associations.hasMany.includes(repositoryName) &&
+			!schema?.model.associations.belongsTo.includes(repositoryName) &&
+			!schema?.model.associations.belongsToMany.includes(repositoryName)
 			) {
 			throw Error(repositoryName + ' is not associated with this schema');
 		}
@@ -1449,7 +1449,7 @@ class Entity extends EventEmitter {
 			throw Error('this.getParentIdProperty is no longer valid. TreeNode has been destroyed.');
 		}
 
-		const parentIdProperty = this.getSchema().model.parentIdProperty;
+		const parentIdProperty = this.getSchema()?.model.parentIdProperty;
 		return this.getProperty(parentIdProperty);
 	}
 
@@ -1509,7 +1509,7 @@ class Entity extends EventEmitter {
 			throw Error('this.getDepthProperty is no longer valid. TreeNode has been destroyed.');
 		}
 
-		const depthProperty = this.getSchema().model.depthProperty;
+		const depthProperty = this.getSchema()?.model.depthProperty;
 		return this.getProperty(depthProperty);
 	}
 
@@ -1546,7 +1546,7 @@ class Entity extends EventEmitter {
 			throw Error('this.getHasChildrenProperty is no longer valid. TreeNode has been destroyed.');
 		}
 
-		const hasChildrenProperty = this.getSchema().model.hasChildrenProperty;
+		const hasChildrenProperty = this.getSchema()?.model.hasChildrenProperty;
 		return this.getProperty(hasChildrenProperty);
 	}
 
@@ -1840,8 +1840,8 @@ class Entity extends EventEmitter {
 		})
 		this.properties = null;
 
-		this.emit('destroy', this._proxy);
 		this.isDestroyed = true;
+		this.emit('destroy', this._proxy);
 		
 		// listeners
 		this.removeAllListeners();

package/src/Repository/Ajax.js

@@ -1036,7 +1036,10 @@ class AjaxRepository extends Repository {
 									this.assembleTreeNodes();
 									this.emit('changeData', this.entities);
 								} else 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.add) {
+										// Do nothing, as we don't want to immediately reload on add for a remote phantom mode record. 
+										// The entity wouldn't appear, and it would cause all kinds of trouble!
+									}
 									if (this._operations.deletePhantom) {
 										// sweep existing deleted records and remove them
 										_.each(this.entities, (entity) => {

package/src/Repository/OneBuild.js

@@ -340,6 +340,9 @@ class OneBuildRepository extends AjaxRepository {
 
 		
 		const duplicateEntity = await this.createStandaloneEntity(root, true, true);
+		if (entity.isRemotePhantomMode) {
+			entity.isRemotePhantom = true;
+		}
 		this._insertBefore(duplicateEntity, entity);
 
 		this.markLoading(false);

package/src/Repository/Repository.js

@@ -1716,6 +1716,10 @@ export default class Repository extends EventEmitter {
 						break;
 					case 'edit':
 						entities = this.getDirty();
+						if (_.isEmpty(entities) && this.isRemotePhantomMode) {
+							// In remote phantom mode, we need to save phantoms even if they're not dirty
+							entities = this.getPhantom();
+						}
 						if (useStaged) {
 							entities = this.getStaged(entities);
 						}