@onehat/data 1.17.3 → 1.18.0

package/cypress/e2e/Entity.cy.js

@@ -542,6 +542,23 @@ describe('Entity', function() {
 			expect(this.entity.isDirty).to.be.true;
 		});
 
+		it('getMappedData', function() {
+
+			const mapped = this.entity.getMappedData({
+				foo: 2,
+				bar: 'two',
+				baz: {
+					test: {
+						val: false,
+					},
+				},
+			});
+			
+			expect(mapped.foo).to.be.eq(2);
+			expect(mapped.bar).to.be.eq('two');
+			expect(mapped.baz).to.be.eq(false);
+		});
+
 		it('setId', function() {
 			expect(this.entity.foo).to.be.eq(1);
 			expect(this.entity.isTempId).to.be.false;
@@ -640,11 +657,17 @@ describe('Entity', function() {
 				lateLastModified;
 
 			earlyLastModified = this.entity.lastModified;
+			cy.wait(100);
+
 			this.entity.setValue('foo', '125');
 			lateLastModified = this.entity.lastModified;
 			expect(earlyLastModified < lateLastModified).to.be.true;
 
+			cy.wait(100);
+
 			earlyLastModified = this.entity.lastModified;
+			
+			cy.wait(100);
 			this.entity.foo = '126';
 			lateLastModified = this.entity.lastModified;
 			expect(earlyLastModified < lateLastModified).to.be.true;

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

@@ -1214,6 +1214,10 @@ describe('Repository Base', function() {
 				child = await id4.getLastChild();
 				expect(child).to.be.null;
 				
+				// getPath
+				const path = id4.getPath();
+				expect(path).to.be.eq('1/2/4');
+				
 				destoryRepository(repository);
 			})();
 		});

package/cypress.config.js

@@ -1,6 +1,5 @@
 import { defineConfig } from "cypress";
 import webpackPreprocessor from "@cypress/webpack-preprocessor";
-import Webpack from "webpack";
 
 export default defineConfig({
 	e2e: {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/data",
-	"version": "1.17.3",
+	"version": "1.18.0",
 	"description": "JS data modeling package with adapters for many storage mediums.",
 	"main": "src/index.js",
 	"type": "module",
@@ -40,7 +40,7 @@
 		"accounting-js": "^1.1.1",
 		"axios": "^1.4.0",
 		"chrono-node": "^2.6.3",
-		"fast-xml-parser": "^4.2.2",
+		"fast-xml-parser": "^4.2.4",
 		"he": "^1.2.0",
 		"js-base64": "^3.7.5",
 		"lodash": "^4.17.21",
@@ -55,13 +55,13 @@
 		"@babel/core": "^7.22.1",
 		"@babel/node": "^7.22.1",
 		"@babel/plugin-transform-class-properties": "^7.22.3",
-		"@babel/plugin-transform-runtime": "^7.19.6",
+		"@babel/plugin-transform-runtime": "^7.22.4",
 		"@babel/preset-env": "^7.22.4",
 		"@babel/register": "^7.21.0",
 		"@babel/runtime": "^7.22.3",
 		"@cypress/webpack-preprocessor": "^5.17.1",
 		"babel-loader": "^9.1.2",
-		"cypress": "12.13.0",
+		"cypress": "12.15.0",
 		"ink-docstrap": "^1.3.2",
 		"joi": "^17.9.2",
 		"jsdoc": "^4.0.2",

package/src/Entity/Entity.js

@@ -32,10 +32,9 @@ class Entity extends EventEmitter {
 	 * @param {Schema} schema - Schema object
 	 * @param {object} rawData - Raw data object. Keys are Property names, Values are Property values.
 	 * @param {Repository} repository
-	 * @param {boolean} originalIsMapped - Has data already been mapped according to schema?
 	 * @param {boolean} isDelayedSave - Should the repository skip autosave when immediately adding the record?
 	 */
-	constructor(schema, rawData = {}, repository = null, originalIsMapped = false, isDelayedSave = false, isRemotePhantomMode = false) {
+	constructor(schema, rawData = {}, repository = null, isDelayedSave = false, isRemotePhantomMode = false) {
 		super(...arguments);
 
 		if (!schema) {
@@ -89,12 +88,14 @@ class Entity extends EventEmitter {
 		 * @private
 		 */
 		this._originalDataParsed = null;
-
+		
 		/**
 		 * @member {boolean} originalIsMapped - Has the original data already been mapped according to schema?
+		 * The attribute is no longer used. this._originalData should always be UNmapped.
 		 * @private
+		 * @deprecated
 		 */
-		this.originalIsMapped = originalIsMapped;
+		// this.originalIsMapped = originalIsMapped;
 
 		/**
 		 * @member {Object} properties - Object of all Properties, keyed by id (for quick access)
@@ -339,11 +340,6 @@ class Entity extends EventEmitter {
 				throw new Error('PropertyType ' + type + ' does not exist.');
 			}
 
-			if (this.originalIsMapped) {
-				// Data has already been mapped according to schema, so alter definition
-				definition = _.clone(definition); // Clone it so you don't alter original in schema
-				definition.mapping = definition.name;
-			}
 			const
 				Property = PropertyTypes[type],
 				property = new Property(definition, this._proxy);
@@ -383,6 +379,7 @@ class Entity extends EventEmitter {
 			throw Error('this.loadOriginalData is no longer valid. Entity has been destroyed.');
 		}
 		this.isPersisted = true;
+
 		this._originalData = originalData || {};
 		this.reset();
 		this.getIdProperty().isTempId = false;
@@ -1215,9 +1212,16 @@ class Entity extends EventEmitter {
 			throw Error('this.setRawValues is no longer valid. Entity has been destroyed.');
 		}
 
-		const [dependentProperties, nonDependentProperties] = _.partition(this.properties, (property) => {
-			return property.hasDepends;
-		});
+		return this.setValues(this.getMappedData(rawData));
+	}
+
+	/**
+	 * Maps the data, according to schema
+	 * @param {object} rawData - Raw data object, prior to mapping, 
+	 * @returns {object} mappedData
+	 */
+	getMappedData = (rawData) => {
+
 		const mappedData = {};
 		function setMappedValue(property) {
 			let rawValue;
@@ -1232,10 +1236,14 @@ class Entity extends EventEmitter {
 			mappedData[property.name] = rawValue;
 		}
 		
+		const [dependentProperties, nonDependentProperties] = _.partition(this.properties, (property) => {
+			return property.hasDepends;
+		});
+
 		_.each(nonDependentProperties, setMappedValue);
 		_.each(dependentProperties, setMappedValue);
 
-		return this.setValues(mappedData);
+		return mappedData;
 	}
 
 	/**
@@ -1773,6 +1781,29 @@ class Entity extends EventEmitter {
 		return child;
 	}
 
+	/**
+	 * Gets the path to this node.
+	 * @return {string} path
+	 */
+	getPath = () => {
+		this.ensureTree();
+		if (this.isDestroyed) {
+			throw Error('this.getPath is no longer valid. TreeNode has been destroyed.');
+		}
+
+		const parentIds = [];
+		let parent = this;
+		while(parent.hasParent) { // stops at root
+			parentIds.push(parent.id);
+			parent = parent.parent;
+		}
+		if (parent.id !== this.id) {
+			parentIds.push(parent.id); // add root id
+		}
+
+		return parentIds.reverse().join('/');
+	}
+
 	/**
 	 * Helper to make sure this Repository is a tree
 	 * @private

package/src/Repository/Ajax.js

@@ -559,10 +559,6 @@ class AjaxRepository extends Repository {
 			url = this.api.add,
 			data = entity.getSubmitValues();
 
-		if (entity.isRemotePhantomMode) {
-			data.isRemotePhantom = true;
-		}
-
 		return this._send(method, url, data)
 					.then(result => {
 						if (this.debugMode) {
@@ -610,9 +606,6 @@ class AjaxRepository extends Repository {
 			data = {
 				entities: _.map(entities, entity => {
 					const values = entity.submitValues;
-					if (entity.isRemotePhantomMode) {
-						values.isRemotePhantom = true;
-					}
 					entity.isSaving = true;
 					return values;
 				}),
@@ -672,10 +665,6 @@ class AjaxRepository extends Repository {
 			url = this.api.edit,
 			data = entity.getSubmitValues();
 
-		if (entity.isRemotePhantomMode) {
-			data.isRemotePhantom = false;
-		}
-
 		return this._send(method, url, data)
 					.then(result => {
 						if (this.debugMode) {
@@ -723,9 +712,6 @@ class AjaxRepository extends Repository {
 			data = {
 				entities: _.map(entities, entity => {
 					const values = entity.submitValues;
-					if (entity.isRemotePhantomMode) {
-						values.isRemotePhantom = false;
-					}
 					entity.isSaving = true;
 					return values;
 				}),
@@ -971,7 +957,7 @@ class AjaxRepository extends Repository {
 		if (!promises.length) {
 			return;
 		}
-		return this.axios.all(promises)
+		return Promise.all(promises)
 						.then(this.axios.spread((...batchOperationResults) => {
 							// All requests are now complete
 

package/src/Repository/OneBuild.js

@@ -414,12 +414,16 @@ class OneBuildRepository extends AjaxRepository {
 	/**
 	 * Gets the root nodes of this tree.
 	 */
-	getRootNodes = async (getChildren = false, depth) => {
+	getRootNodes = async (getChildren = false, depth, getChildParams) => {
 		this.ensureTree();
 		if (this.isDestroyed) {
 			this.throwError('this.setRootNode is no longer valid. Repository has been destroyed.');
 			return;
 		}
+		if (!this.isOnline) {
+			this.throwError('Offline');
+			return;
+		}
 
 		// Clear all entities, if any exist
 		_.each(this.entities, (entity) => {
@@ -427,11 +431,84 @@ class OneBuildRepository extends AjaxRepository {
 		});
 		this.entities = [];
 		
-		// TODO: Load root nodes (and possibly their children)
+		
+		const data = {
+			url: this.name + '/getRootNodes',
+			data: qs.stringify({
+				getChildren,
+				depth,
+				conditions: getChildParams ? getChildParams() : null 
+			}),
+			method: 'POST',
+			baseURL: this.api.baseURL,
+		};
 
+		if (this.debugMode) {
+			console.log('getRootNodes', data);
+		}
 
+		return this.axios(data)
+			.then((result) => {
+				if (this.debugMode) {
+					console.log('getRootNodes response', result);
+				}
+
+				const response = result.data;
+				if (!response.success) {
+					this.throwError(response.data);
+					return;
+				}
+
+				// TODO: Load up the repository with these root nodes
+
+
+
+			});
 	}
 
+	/**
+	 * Searches all nodes for the supplied text.
+	 * This basically takes the search query and returns whatever the server sends
+	 */
+	searchTree = async (q) => {
+		this.ensureTree();
+		if (this.isDestroyed) {
+			this.throwError('this.searchTree is no longer valid. Repository has been destroyed.');
+			return;
+		}
+		if (!this.isOnline) {
+			this.throwError('Offline');
+			return;
+		}
+		
+		const data = {
+			url: this.name + '/searchTree',
+			data: qs.stringify({
+				q,
+			}),
+			method: 'POST',
+			baseURL: this.api.baseURL,
+		};
+
+		if (this.debugMode) {
+			console.log('searchTree', data);
+		}
+
+		return this.axios(data)
+			.then((result) => {
+				if (this.debugMode) {
+					console.log('searchTree response', result);
+				}
+
+				const response = result.data;
+				if (!response.success) {
+					this.throwError(response.data);
+					return;
+				}
+
+				return response.data;
+			});
+	}
 	/**
 	 * Loads the children of the supplied treeNode
 	 */

package/src/Repository/Repository.js

@@ -965,12 +965,11 @@ export default class Repository extends EventEmitter {
 	 * Creates a single new Entity in storage medium.
 	 * @param {object} data - Either raw data object or Entity. If raw data, keys are Property names, Values are Property values.
 	 * @param {boolean} isPersisted - Whether the new entity should be marked as already being persisted in storage medium.
-	 * @param {boolean} originalIsMapped - Has data already been mapped according to schema?
 	 * @param {boolean} isDelayedSave - Should the repository skip autosave when immediately adding the record?
 	 * @return {object} entity - new Entity object
 	 * @fires add
 	 */
-	add = async (data, isPersisted = false, originalIsMapped = false, isDelayedSave = false) => {
+	add = async (data, isPersisted = false, isDelayedSave = false) => {
 		if (this.isDestroyed) {
 			this.throwError('this.add is no longer valid. Repository has been destroyed.');
 			return;
@@ -992,7 +991,7 @@ export default class Repository extends EventEmitter {
 		let entity = data;
 		if (!(data instanceof Entity)) {
 			// Create the new entity
-			entity = Repository._createEntity(this.schema, data, this, isPersisted, originalIsMapped, isDelayedSave, this.isRemotePhantomMode);
+			entity = Repository._createEntity(this.schema, data, this, isPersisted, isDelayedSave, this.isRemotePhantomMode);
 		}
 		this._relayEntityEvents(entity);
 		this.entities.unshift(entity); // Add to *beginning* of entities array, so the phantom record will appear at the beginning of the current page
@@ -1016,11 +1015,10 @@ export default class Repository extends EventEmitter {
 	 * Used when we want to work with an entity, but don't want that entity to appear in a repository.
 	 * @param {object} data - Either raw data object or Entity. If raw data, keys are Property names, Values are Property values.
 	 * @param {boolean} isPersisted - Whether the new entity should be marked as already being persisted in storage medium.
-	 * @param {boolean} originalIsMapped - Has data already been mapped according to schema?
 	 * @param {boolean} isDelayedSave - Should the repository skip autosave when immediately adding the record?
 	 * @return {object} entity - new Entity object
 	 */
-	createStandaloneEntity = async (data, isPersisted = false, originalIsMapped = false, isDelayedSave = false) => {
+	createStandaloneEntity = async (data, isPersisted = false, isDelayedSave = false) => {
 		if (this.isDestroyed) {
 			this.throwError('this.createStandaloneEntity is no longer valid. Repository has been destroyed.');
 			return;
@@ -1030,7 +1028,7 @@ export default class Repository extends EventEmitter {
 			return;
 		}
 		
-		const entity = Repository._createEntity(this.schema, data, this, isPersisted, originalIsMapped, isDelayedSave, this.isRemotePhantomMode);
+		const entity = Repository._createEntity(this.schema, data, this, isPersisted, isDelayedSave, this.isRemotePhantomMode);
 
 		if (entity.isPhantom) {
 			entity.createTempId();
@@ -1050,10 +1048,9 @@ export default class Repository extends EventEmitter {
 	 * Convenience function to create multiple new Entities in storage medium.
 	 * @param {array} data - Array of data objects or Entities. 
 	 * @param {boolean} isPersisted - Whether the new entities should be marked as already being persisted in storage medium.
-	 * @param {boolean} originalIsMapped - Has data already been mapped according to schema?
 	 * @return {array} entities - new Entity objects
 	 */
-	addMultiple = async (allData, isPersisted = false, originalIsMapped = false) => {
+	addMultiple = async (allData, isPersisted = false) => {
 
 		let entities = [],
 			i,
@@ -1062,7 +1059,7 @@ export default class Repository extends EventEmitter {
 
 		for (i = 0; i < allData.length; i++) {
 			data = allData[i];
-			entity = await this.add(data, isPersisted, originalIsMapped);
+			entity = await this.add(data, isPersisted);
 			entities.push(entity);
 		};
 		
@@ -1076,13 +1073,12 @@ export default class Repository extends EventEmitter {
 	 * @param {object} rawData - Raw data object. Keys are Property names, Values are Property values.
 	 * @param {boolean} repository - Optional repository to connect the entity to.
 	 * @param {boolean} isPersisted - Whether the new entity should be marked as already being persisted in storage medium.
-	 * @param {boolean} originalIsMapped - Has data already been mapped according to schema?
 	 * @param {boolean} isDelayedSave - Should the repository skip autosave when immediately adding the record?
 	 * @return {object} entity - new Entity object
 	 * @private
 	 */
-	static _createEntity = (schema, rawData, repository = null, isPersisted = false, originalIsMapped = false, isDelayedSave = false, isRemotePhantomMode = false) => {
-		const entity = new Entity(schema, rawData, repository, originalIsMapped, isDelayedSave, isRemotePhantomMode);
+	static _createEntity = (schema, rawData, repository = null, isPersisted = false, isDelayedSave = false, isRemotePhantomMode = false) => {
+		const entity = new Entity(schema, rawData, repository, isDelayedSave, isRemotePhantomMode);
 		entity.initialize();
 		entity.isPersisted = isPersisted;
 		return entity;