@onehat/data 1.19.2 → 1.19.4

package/cypress/e2e/Schema.cy.js

@@ -30,7 +30,35 @@ describe('Schema', function() {
 		expect(_.isEqual(propertyDefinition.name, 'groups_users__id')).to.be.true;
 	});
 
-	it.only('getTitles, getVirtualdPropertyNames, getIsFilteringDisabledPropertyNames, getIsEditingDisabledPropertyNames, getFieldGroupNames, getFilterTypes', function() {
+	it('getDefaultValues', function() {
+		const
+			defaultValues = this.schema.getDefaultValues(),
+			expectedDefaultValues = {
+				groups_users__id: null,
+				groups_users__group_id: null,
+				groups_users__user_id: null,
+				groups__id: null,
+				groups__name: 'default_group_name',
+				groups__description: null,
+				users__id: null,
+				users__username: 'default_username',
+				users__password: null,
+				users__full_name: null,
+				users__first_name: null,
+				users__last_name: null,
+				users__job_title: null,
+				users__email: null,
+				users__login_count: null,
+				users__last_login: null,
+			};
+
+		console.log('defaultValues', defaultValues);
+		console.log('expectedDefaultValues', expectedDefaultValues);
+
+		expect(defaultValues).to.be.eql(expectedDefaultValues);
+	});
+
+	it('getTitles, getVirtualdPropertyNames, getIsFilteringDisabledPropertyNames, getIsEditingDisabledPropertyNames, getFieldGroupNames, getFilterTypes', function() {
 		const
 			schema = new Schema({
 				id: 'foo',

package/cypress/fixtures/Definitions/GroupsUsers.js

@@ -11,10 +11,10 @@ const GroupsUsers = {
 			{ name: 'groups_users__group_id',	mapping: 'group_id',	type: 'int' },
 			{ name: 'groups_users__user_id',	mapping: 'user_id',	type: 'int' },
 			{ name: 'groups__id',	mapping: 'group.id',	type: 'int' },
-			{ name: 'groups__name',	mapping: 'group.name',	type: 'string' },
+			{ name: 'groups__name',	mapping: 'group.name',	type: 'string',	defaultValue: 'default_group_name', },
 			{ name: 'groups__description',	mapping: 'group.description',	type: 'string' },
 			{ name: 'users__id',	mapping: 'user.id',	type: 'int' },
-			{ name: 'users__username',	mapping: 'user.username',	type: 'string' },
+			{ name: 'users__username',	mapping: 'user.username',	type: 'string',	defaultValue: 'default_username', },
 			{ name: 'users__password',	mapping: 'user.password',	type: 'string' },
 			{ name: 'users__full_name',	mapping: 'user.full_name',	type: 'string' },
 			{ name: 'users__first_name',	mapping: 'user.first_name',	type: 'string' },

package/package.json

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

package/src/Repository/Memory.js

@@ -459,7 +459,7 @@ class MemoryRepository extends Repository {
 
 	/**
 	 * Get a single Entity's index by its id.
-	 * Overrides Repository method, to limite results to only the current page.
+	 * Overrides Repository method, to limit results to only the current page.
 	 * @param {integer} id - id of record to retrieve
 	 * @return {integer} The numerical index, or undefined
 	 */

package/src/Repository/OneBuild.js

@@ -236,6 +236,10 @@ class OneBuildRepository extends AjaxRepository {
 			};
 		}
 
+		if (!result) {
+			debugger;
+		}
+
 		const
 			response = _.isPlainObject(result.data) ? result.data : this.reader.read(result.data),
 			root = response[this.rootProperty],

package/src/Schema/Schema.js

@@ -1,6 +1,7 @@
 /** @module Schema */
 
 import EventEmitter from '@onehat/events';
+import PropertyTypes from '../Property/index.js';
 import _ from 'lodash';
 
 /**
@@ -255,6 +256,34 @@ export default class Schema extends EventEmitter {
 		return found;
 	}
 	
+	getDefaultValues = () => {
+		if (this.isDestroyed) {
+			this.throwError('this.getDefaultValues is no longer valid. Schema has been destroyed.');
+			return;
+		}
+
+		const found = {};
+		_.each(this.model.properties, (property) => {
+			let defaultValue = null;
+			if (!_.isNil(property.defaultValue)) {
+				defaultValue = property.defaultValue;
+			} else {
+				// Look in the property types for a default value
+				let propertyType = PropertyTypes[property.type];
+				if (!_.isNil(propertyType)) {
+					defaultValue = propertyType.defaultValue;
+				} else {
+					propertyType = PropertyTypes['string'];
+					if (!_.isNil(propertyType.defaultValue)) {
+						defaultValue = propertyType.defaultValue;
+					}
+				}
+			}
+			found[property.name] = defaultValue;
+		});
+		return found;
+	}
+	
 	getVirtualPropertyNames = () => {
 		if (this.isDestroyed) {
 			this.throwError('this.getVirtualPropertyNames is no longer valid. Schema has been destroyed.');
@@ -328,6 +357,16 @@ export default class Schema extends EventEmitter {
 			}
 			found[property.name] = property.filterType;
 		});
+
+		if (!_.isNil(this.model.ancillaryFilters)) {
+			_.each(this.model.ancillaryFilters, (value, key) => {
+				found[key] = {
+					isAncillary: true,
+					title: value,
+				};
+			});
+		}
+
 		return found;
 	}