@onehat/data 1.7.12 → 1.7.16

package/cypress/integration/Entity.spec.js

@@ -580,6 +580,21 @@ describe('Entity', function() {
 			this.entity.markStaged(false);
 			expect(this.entity.isStaged).to.be.false;
 		});
+	
+		it('setValue changed lastModified', function() {
+			let earlyLastModified,
+				lateLastModified;
+
+			earlyLastModified = this.entity.lastModified;
+			this.entity.setValue('foo', '125');
+			lateLastModified = this.entity.lastModified;
+			expect(earlyLastModified < lateLastModified).to.be.true;
+
+			earlyLastModified = this.entity.lastModified;
+			this.entity.foo = '126';
+			lateLastModified = this.entity.lastModified;
+			expect(earlyLastModified < lateLastModified).to.be.true;
+		});
 	});
 
 	describe('events', function() {

package/package.json

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

package/src/Entity.js

@@ -2,6 +2,7 @@
 
 import EventEmitter from '@onehat/events';
 import PropertyTypes from './Property';
+import moment from 'moment';
 import _ from 'lodash';
 
 /**
@@ -129,6 +130,11 @@ class Entity extends EventEmitter {
 		 */
 		this.isDestroyed = false;
 
+		/**
+		 * @member {string} lastModified - Last time this entity was modified
+		 */
+		this.lastModified = null;
+
 		// This ES6 Proxy allows us to create magic getters and setters for all property values.
 		// However, these getters and setters are *not* available within the Entity itself.
 		this._proxy = new Proxy(this, {
@@ -325,6 +331,7 @@ class Entity extends EventEmitter {
 		if (this.isDeleted) {
 			this.undelete();
 		}
+		this.setLastModified();
 
 		this.emit('reset', this._proxy);
 	}
@@ -399,6 +406,10 @@ class Entity extends EventEmitter {
 		}
 		return value;
 	}
+	
+	setLastModified = () => {
+		this.lastModified = moment(new Date()).format('YYYY-MM-DD HH:mm:ss.SSSS');
+	}
 
 
 	//    ______     __  __
@@ -990,6 +1001,7 @@ class Entity extends EventEmitter {
 		}
 		
 		idProperty.isTempId = false;
+		this.setLastModified();
 
 		return isChanged;
 	}
@@ -1034,6 +1046,7 @@ class Entity extends EventEmitter {
 			}
 			property.resumeEvents();
 		});
+		this.setLastModified();
 
 		if (isChanged) {
 			this._recalculateDependentProperties();

package/src/Repository/Ajax.js

@@ -362,7 +362,7 @@ class AjaxRepository extends Repository {
 			throw new Error('No "get" api endpoint defined.');
 		}
 		this.emit('beforeLoad'); // TODO: canceling beforeLoad will cancel the load operation
-		this.isLoading = true;
+		this.markLoading();
 
 
 		if (!_.isNil(params) && _.isObject(params)) {
@@ -407,9 +407,9 @@ class AjaxRepository extends Repository {
 						// Set the total records that pass filter
 						this.total = total;
 						this._setPaginationVars();
-				
-						this.isLoading = false;
-						this.isLoaded = true;
+
+						this.markLoaded();
+
 						this.emit('changeData', this.entities);
 						this.emit('load', this);
 					})
@@ -432,7 +432,7 @@ class AjaxRepository extends Repository {
 			throw new Error('No "get" api endpoint defined.');
 		}
 		this.emit('beforeLoad'); // TODO: canceling beforeLoad will cancel the load operation
-		this.isLoading = true;
+		this.markLoading();
 
 		const params = this._getReloadEntityParams(entity);
 		if (this.debugMode) {
@@ -460,8 +460,8 @@ class AjaxRepository extends Repository {
 						entity.loadOriginalData(updatedData, true);
 						entity.emit('reload', entity);
 						
-						this.isLoading = false;
-						this.isLoaded = true;
+						this.markLoaded();
+
 						this.emit('changeData', this.entities);
 						this.emit('load', this);
 						this.emit('reloadEntity', entity);

package/src/Repository/Memory.js

@@ -95,7 +95,7 @@ class MemoryRepository extends Repository {
 		}
 
 		this.emit('beforeLoad');
-		this.isLoading = true;
+		this.markLoading();
 
 
 		const isDirectLoad = !_.isNil(data);
@@ -143,8 +143,7 @@ class MemoryRepository extends Repository {
 			await this._saveToStorage(entities);
 		}
 
-		this.isLoading = false;
-		this.isLoaded = true;
+		this.markLoaded();
 		this._recalculate(); // fires changeData if needed
 		this.emit('load', entities, this);
 		return entities;
@@ -444,6 +443,21 @@ class MemoryRepository extends Repository {
 		})
 	}
 	/* */
+	
+	removeEntity(entity) { // standard function notation
+		const id = entity.id;
+
+		super.removeEntity(entity);
+
+		if (this.hasSorters) {
+			this._applySorters();
+		}
+		if (this.hasFilters) {
+			this._applyFilters();
+		}
+		delete this._keyedEntities[id];
+	}
+
 
 
 

package/src/Repository/Null.js

@@ -46,7 +46,7 @@ class NullRepository extends Repository {
 			throw Error('this.load is no longer valid. Repository has been destroyed.');
 		}
 		this.emit('beforeLoad');
-		this.isLoading = true;
+		this.markLoading();
 
 		if (data) {
 			let entities = data;
@@ -65,8 +65,7 @@ class NullRepository extends Repository {
 
 		this._updateSize();
 
-		this.isLoading = false;
-		this.isLoaded = true;
+		this.markLoaded();
 		this.emit('changeData', this.entities);
 		this.emit('load', this);
 	}

package/src/Repository/Repository.js

@@ -5,6 +5,7 @@ import Entity from '../Entity';
 import {
 	v4 as uuid,
 } from 'uuid';
+import moment from 'moment';
 import _ from 'lodash';
 
 /**
@@ -194,6 +195,11 @@ export default class Repository extends EventEmitter {
 		 */
 		this.isLoading = false;
 
+		/**
+		 * @member {string} lastLoaded - Last time this repository was loaded
+		 */
+		this.lastLoaded = null;
+
 		/**
 		 * @member {Boolean} isSaving - State: whether or not entities are currently being saved
 		 */
@@ -266,9 +272,11 @@ export default class Repository extends EventEmitter {
 		}
 
 		this._createMethods();
+		this._createStatics();
 
-		if (this.schema.repository.init) {
-			await this.schema.repository.init.call(this);
+		const init = this.schema.repository.init || this.originalConfig.init; // The latter is mainly for lfr repositories
+		if (init) {
+			await init.call(this);
 		}
 
 		this.isInitialized = true;
@@ -283,7 +291,7 @@ export default class Repository extends EventEmitter {
 		if (this.isDestroyed) {
 			throw Error('this._createMethods is no longer valid. Repository has been destroyed.');
 		}
-		const methodDefinitions = this.schema.repository.methods;
+		const methodDefinitions = this.schema.repository.methods || this.originalConfig.methods; // The latter is mainly for lfr repositories
 		if (!_.isEmpty(methodDefinitions)) {
 			_.each(methodDefinitions, (method, name) => {
 				this[name] = method; // NOTE: Methods must be defined in schema as "function() {}", not as "() => {}" so "this" will be assigned correctly
@@ -291,6 +299,22 @@ export default class Repository extends EventEmitter {
 		}
 	}
 
+	/**
+	 * Creates the static properties for this Repository, based on Schema.
+	 * @private
+	 */
+	 _createStatics = () => {
+		if (this.isDestroyed) {
+			throw Error('this._createStatics is no longer valid. Entity has been destroyed.');
+		}
+		const staticsDefinitions = this.schema.repository.statics || this.originalConfig.statics; // The latter is mainly for lfr repositories
+		if (!_.isEmpty(staticsDefinitions)) {
+			_.each(staticsDefinitions, (value, key) => {
+				this[key] = value;
+			});
+		}
+	}
+
 
 	//     __                    __
 	//    / /   ____  ____ _____/ /
@@ -306,6 +330,22 @@ export default class Repository extends EventEmitter {
 		throw new Error('load must be implemented by Repository subclass');
 	}
 
+	/**
+	 * Marks this repository as loading
+	 */
+	markLoading = () => {
+		this.isLoading = true;
+	}
+
+	/**
+	 * Marks this repository as loaded
+	 */
+	markLoaded = () => {
+		this.isLoading = false;
+		this.isLoaded = true;
+		this.lastLoaded = moment(new Date()).format('YYYY-MM-DD HH:mm:ss.SSSS');
+	}
+
 	/**
 	 * Reload data from storage medium, using previous settings.
 	 * Subclasses may override this to provide additional 
@@ -1255,49 +1295,6 @@ export default class Repository extends EventEmitter {
 		return associatedRepository;
 	}
 
-	/**
-	 * Gets the Schema object
-	 * @return {Schema} schema
-	 */
-	getSchema = () => {
-		if (this.isDestroyed) {
-			throw Error('this.getSchema is no longer valid. Entity has been destroyed.');
-		}
-		return this.schema;
-	}
-
-	/**
-	 * Gets the associated Repository
-	 * @param {string} repositoryName - Name of the Repository to retrieve
-	 * @return {boolean} hasProperty
-	 */
-	getAssociatedRepository = (repositoryName) => {
-		if (this.isDestroyed) {
-			throw Error('this.getAssociatedRepository is no longer valid. Entity has been destroyed.');
-		}
-
-		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)
-			) {
-			throw Error(repositoryName + ' is not associated with this schema');
-		}
-
-		const oneHatData = this.oneHatData;
-		if (!oneHatData) {
-			throw Error('No global oneHatData object');
-		}
-
-		const associatedRepository = oneHatData.getRepository(repositoryName);
-		if (!associatedRepository) {
-			throw Error('Repository ' + repositoryName + ' cannot be found');
-		}
-		
-		return associatedRepository;
-	}
-
 	/**
 	 * Utility function.
 	 * Detects if entity is in the current page of the storage medium.
@@ -1621,7 +1618,7 @@ export default class Repository extends EventEmitter {
 	 * Mainly used for phantom Entities
 	 * Helper for delete()
 	 */
-	removeEntity = async (entity) => {
+	removeEntity(entity) { // standard function notation so it can be called by child class
 		this.entities = _.filter(this.entities, e => e !== entity);
 		entity.destroy();
 	}