@onehat/data 1.19.0 → 1.19.2

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

@@ -63,82 +63,6 @@ describe('OneBuildRepository', function() {
 		expect(p.conditions.key2).to.be.eq('2');
 	});
 
-	it.only('getTitles, getVirtualdPropertyNames, getIsFilteringDisabledPropertyNames, getIsEditingDisabledPropertyNames, getFieldGroupNames, getFilterTypes', function() {
-		let repository;
-		(async () => {
-			repository = await this.oneHatData.createRepository({
-				schema: {
-					id: 'foo',
-					name: 'foo',
-					model: {
-						idProperty: 'model__field1',
-						displayProperty: 'model__field2',
-						properties: [
-							{
-								name: 'model__field1',
-								isVirtual: true,
-								isFilteringDisabled: false,
-								filterType: {
-									type: 'Combo',
-									loadAfterRender: false,
-								},
-								isEditingDisabled: true,
-								fieldGroup: 'group1',
-							},
-							{
-								name: 'model__field2',
-								isVirtual: true,
-								isFilteringDisabled: true,
-								isEditingDisabled: false,
-								fieldGroup: 'group1',
-							},
-							{
-								name: 'model__field3',
-								isVirtual: false,
-								isFilteringDisabled: true,
-								isEditingDisabled: true,
-								fieldGroup: 'group2',
-							},
-						],
-					},
-					repository: {
-						type: 'onebuild',
-					},
-				},
-			});
-
-			const
-				virtualPropertyNames = [
-					'model__field1',
-					'model__field2',
-				],
-				isFilteringDisabledPropertyNames = [
-					'model__field2',
-					'model__field3',
-				],
-				isEditingDisabledPropertyNames = [
-					'model__field1',
-					'model__field3',
-				],
-				fieldGroupNames = [
-					'group1',
-					'group2',
-				],
-				filterTypes = [
-					{
-						type: 'Combo',
-						loadAfterRender: false,
-					},
-				];
-			expect(repository.getVirtualPropertyNames()).to.be.eql(virtualPropertyNames);
-			expect(repository.getIsFilteringDisabledPropertyNames()).to.be.eql(isFilteringDisabledPropertyNames);
-			expect(repository.getIsEditingDisabledPropertyNames()).to.be.eql(isEditingDisabledPropertyNames);
-			expect(repository.getFieldGroupNames()).to.be.eql(fieldGroupNames);
-			expect(repository.getFilterTypes()).to.be.eql(filterTypes);
-			
-		})();
-	});
-
 	it.skip('401', function() {
 		cy.wrap((async () => {
 

package/cypress/e2e/Schema.cy.js

@@ -30,4 +30,81 @@ describe('Schema', function() {
 		expect(_.isEqual(propertyDefinition.name, 'groups_users__id')).to.be.true;
 	});
 
+	it.only('getTitles, getVirtualdPropertyNames, getIsFilteringDisabledPropertyNames, getIsEditingDisabledPropertyNames, getFieldGroupNames, getFilterTypes', function() {
+		const
+			schema = new Schema({
+				id: 'foo',
+				name: 'foo',
+				model: {
+					idProperty: 'model__field1',
+					displayProperty: 'model__field2',
+					properties: [
+						{
+							name: 'model__field1',
+							title: 'title1',
+							isVirtual: true,
+							isFilteringDisabled: false,
+							filterType: {
+								type: 'Combo',
+								loadAfterRender: false,
+							},
+							isEditingDisabled: true,
+							fieldGroup: 'group1',
+						},
+						{
+							name: 'model__field2',
+							title: 'title2',
+							isVirtual: true,
+							isFilteringDisabled: true,
+							isEditingDisabled: false,
+							fieldGroup: 'group1',
+						},
+						{
+							name: 'model__field3',
+							title: 'title3',
+							isVirtual: false,
+							isFilteringDisabled: true,
+							isEditingDisabled: true,
+							fieldGroup: 'group2',
+						},
+					],
+				},
+			}),
+			titles = [
+				'title1',
+				'title2',
+				'title3',
+			],
+			virtualPropertyNames = [
+				'model__field1',
+				'model__field2',
+			],
+			isFilteringDisabledPropertyNames = [
+				'model__field2',
+				'model__field3',
+			],
+			isEditingDisabledPropertyNames = [
+				'model__field1',
+				'model__field3',
+			],
+			fieldGroupNames = [
+				'group1',
+				'group2',
+			],
+			filterTypes = {
+				model__field1: {
+					type: 'Combo',
+					loadAfterRender: false,
+				},
+			};
+
+		expect(schema.getTitles()).to.be.eql(titles);
+		expect(schema.getVirtualPropertyNames()).to.be.eql(virtualPropertyNames);
+		expect(schema.getIsFilteringDisabledPropertyNames()).to.be.eql(isFilteringDisabledPropertyNames);
+		expect(schema.getIsEditingDisabledPropertyNames()).to.be.eql(isEditingDisabledPropertyNames);
+		expect(schema.getFieldGroupNames()).to.be.eql(fieldGroupNames);
+		expect(schema.getFilterTypes()).to.be.eql(filterTypes);
+		
+	});
+
 });

package/package.json

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

package/src/Repository/OneBuild.js

@@ -425,81 +425,6 @@ class OneBuildRepository extends AjaxRepository {
 				return response;
 			});
 	}
-	
-	getVirtualPropertyNames = () => {
-		if (this.isDestroyed) {
-			this.throwError('this.getVirtualPropertyNames is no longer valid. Repository has been destroyed.');
-			return;
-		}
-
-		const found = [];
-		_.each(this.schema.model.properties, (property) => {
-			if (property.isVirtual) {
-				found.push(property.name);
-			}
-		});
-		return found;
-	}
-	
-	getIsFilteringDisabledPropertyNames = () => {
-		if (this.isDestroyed) {
-			this.throwError('this.getIsFilteringDisabledPropertyNames is no longer valid. Repository has been destroyed.');
-			return;
-		}
-
-		const found = [];
-		_.each(this.schema.model.properties, (property) => {
-			if (property.isFilteringDisabled) {
-				found.push(property.name);
-			}
-		});
-		return found;
-	}
-	
-	getIsEditingDisabledPropertyNames = () => {
-		if (this.isDestroyed) {
-			this.throwError('this.getIsEditingDisabledPropertyNames is no longer valid. Repository has been destroyed.');
-			return;
-		}
-
-		const found = [];
-		_.each(this.schema.model.properties, (property) => {
-			if (property.isEditingDisabled) {
-				found.push(property.name);
-			}
-		});
-		return found;
-	}
-	
-	getFieldGroupNames = () => {
-		if (this.isDestroyed) {
-			this.throwError('this.getFieldGroupNames is no longer valid. Repository has been destroyed.');
-			return;
-		}
-
-		const found = [];
-		_.each(this.schema.model.properties, (property) => {
-			if (!_.isNil(property.fieldGroup) && !found.includes(property.fieldGroup)) {
-				found.push(property.fieldGroup);
-			}
-		});
-		return found;
-	}
-	
-	getFilterTypes = () => {
-		if (this.isDestroyed) {
-			this.throwError('this.getFilterTypes is no longer valid. Repository has been destroyed.');
-			return;
-		}
-
-		const found = [];
-		_.each(this.schema.model.properties, (property) => {
-			if (!_.isNil(property.filterType) && !found.includes(property.filterType)) {
-				found.push(property.filterType);
-			}
-		});
-		return found;
-	}
 
 
 	//   ______

package/src/Schema/Schema.js

@@ -235,13 +235,100 @@ export default class Schema extends EventEmitter {
 		if (this.isDestroyed) {
 			throw Error('this.getPropertyDefinition is no longer valid. Schema has been destroyed.');
 		}
-		const propertyDefinition = _.find(this.model.properties, (propertyDefinition) => {
+		return _.find(this.model.properties, (propertyDefinition) => {
 			return propertyDefinition.name === propertyName;
 		});
-		if (!propertyDefinition) {
-			throw new Error('Property definition ' + propertyName + ' not found.');
+	}
+	
+	getTitles = () => {
+		if (this.isDestroyed) {
+			this.throwError('this.getTitles is no longer valid. Schema has been destroyed.');
+			return;
+		}
+
+		const found = [];
+		_.each(this.model.properties, (property) => {
+			if (property.title) {
+				found.push(property.title);
+			}
+		});
+		return found;
+	}
+	
+	getVirtualPropertyNames = () => {
+		if (this.isDestroyed) {
+			this.throwError('this.getVirtualPropertyNames is no longer valid. Schema has been destroyed.');
+			return;
 		}
-		return propertyDefinition;
+
+		const found = [];
+		_.each(this.model.properties, (property) => {
+			if (property.isVirtual) {
+				found.push(property.name);
+			}
+		});
+		return found;
+	}
+	
+	getIsFilteringDisabledPropertyNames = () => {
+		if (this.isDestroyed) {
+			this.throwError('this.getIsFilteringDisabledPropertyNames is no longer valid. Schema has been destroyed.');
+			return;
+		}
+
+		const found = [];
+		_.each(this.model.properties, (property) => {
+			if (property.isFilteringDisabled) {
+				found.push(property.name);
+			}
+		});
+		return found;
+	}
+	
+	getIsEditingDisabledPropertyNames = () => {
+		if (this.isDestroyed) {
+			this.throwError('this.getIsEditingDisabledPropertyNames is no longer valid. Schema has been destroyed.');
+			return;
+		}
+
+		const found = [];
+		_.each(this.model.properties, (property) => {
+			if (property.isEditingDisabled) {
+				found.push(property.name);
+			}
+		});
+		return found;
+	}
+	
+	getFieldGroupNames = () => {
+		if (this.isDestroyed) {
+			this.throwError('this.getFieldGroupNames is no longer valid. Schema has been destroyed.');
+			return;
+		}
+
+		const found = [];
+		_.each(this.model.properties, (property) => {
+			if (!_.isNil(property.fieldGroup) && !found.includes(property.fieldGroup)) {
+				found.push(property.fieldGroup);
+			}
+		});
+		return found;
+	}
+	
+	getFilterTypes = () => {
+		if (this.isDestroyed) {
+			this.throwError('this.getFilterTypes is no longer valid. Schema has been destroyed.');
+			return;
+		}
+
+		const found = {};
+		_.each(this.model.properties, (property) => {
+			if (_.isNil(property.filterType) || property.isFilteringDisabled) { 
+				return;
+			}
+			found[property.name] = property.filterType;
+		});
+		return found;
 	}
 
 	/**