alchemy-form 0.1.3 → 0.1.4

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.1.4 (2022-03-16)
+
+* Make fields work with the new `Alchemy.Map.Backed` and `Alchemy.Map.Enum` class
+* Add the `field_path_in_current_schema` property
+* Make sure `alchemy-fields` know which `alchemy-form` they belong to
+* Improve the `original_value` getters
+* Set the `field-type` attribute of `alchemy-field` elements
+* Fix `alchemy-field` elements sometimes not getting their value elements
+
 ## 0.1.3 (2022-02-20)
 
 * Fix datetime fields never showing their value

package/element/00_form_base.js

@@ -125,6 +125,38 @@ Base.setProperty(function wrapper_type() {
 
 });
 
+/**
+ * Get the path of this field value in the current (sub)schema
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.1.4
+ * @version  0.1.4
+ */
+Base.setProperty(function field_path_in_current_schema() {
+
+	let result = [],
+	    parent = this.getParentField(),
+		name;
+
+	name = this.getPathEntryName();
+
+	if (name) {
+		result.push(name);
+	}
+
+	while (parent && !(parent instanceof Classes.Alchemy.Element.Form.FieldSchema)) {
+		name = parent.getPathEntryName();
+
+		if (name) {
+			result.unshift(name);
+		}
+
+		parent = parent.getParentField();
+	}
+
+	return result.join('.');
+});
+
 /**
  * Get the path of this field value in the current record
  *
@@ -162,7 +194,7 @@ Base.setProperty(function field_path_in_record() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.3
- * @version  0.1.3
+ * @version  0.1.4
  *
  * @return   {Alchemy.Element.Form.Base}
  */
@@ -179,6 +211,10 @@ Base.setMethod(function getParentField() {
 		parent = parent.parentElement;
 	}
 
+	if (this.field_context) {
+		return this.field_context;
+	}
+
 	return false;
 });
 

package/element/alchemy_field.js

@@ -3,11 +3,9 @@
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.4
  */
-var Field = Function.inherits('Alchemy.Element.Form.Base', function Field() {
-	Field.super.call(this);
-});
+const Field = Function.inherits('Alchemy.Element.Form.Base', 'Field');
 
 /**
  * The template to use for the content of this element
@@ -45,6 +43,15 @@ Field.setStatic('use_new_renderer_scope', true);
  */
 Field.setAttribute('field-name');
 
+/**
+ * The type of the field
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.1.4
+ * @version  0.1.4
+ */
+Field.setAttribute('field-type');
+
 /**
  * The view override
  *
@@ -77,9 +84,24 @@ Field.setAssignedProperty('widget_settings');
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.4
  */
-Field.addParentTypeGetter('alchemy_form', 'alchemy-form');
+Field.enforceProperty(function alchemy_form(new_value) {
+
+	if (new_value == null) {
+		new_value = this.queryUp('alchemy-form');
+
+		if (!new_value && this.field_context) {
+			new_value = this.field_context.queryUp('alchemy-form');
+		}
+
+		if (!new_value && this.alchemy_field_schema && this.alchemy_field_schema.alchemy_field) {
+			new_value = this.alchemy_field_schema.alchemy_field.alchemy_form;
+		}
+	}
+	
+	return new_value;
+});
 
 /**
  * Get the error area
@@ -111,7 +133,7 @@ Field.enforceProperty(function alchemy_field_schema(new_value, old_value) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.4
  */
 Field.enforceProperty(function config(new_value, old_value) {
 
@@ -124,6 +146,12 @@ Field.enforceProperty(function config(new_value, old_value) {
 		}
 	}
 
+	if (new_value && new_value.constructor && new_value.constructor.type_name) {
+		this.field_type = new_value.constructor.type_name;
+	} else {
+		this.field_type = null;
+	}
+
 	return new_value;
 });
 
@@ -465,17 +493,20 @@ Field.setProperty(function wrapper_files() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.4
  */
 Field.setProperty(function original_value() {
 
-	let alchemy_field_schema = this.alchemy_field_schema;
+	let alchemy_field_schema = this.alchemy_field_schema,
+	    path = this.field_path_in_current_schema;
 
 	if (alchemy_field_schema) {
 		let original_schema_value = alchemy_field_schema.original_value;
 
 		if (original_schema_value) {
-			return original_schema_value[this.field_name];
+			if (path) {
+				return Object.path(original_schema_value, path);
+			}
 		}
 
 		return;
@@ -484,7 +515,7 @@ Field.setProperty(function original_value() {
 	let form = this.alchemy_form;
 
 	if (form && form.document) {
-		return form.document[this.field_name];
+		return Object.path(form.document, path);
 	}
 });
 
@@ -493,7 +524,7 @@ Field.setProperty(function original_value() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.3
+ * @version  0.1.4
  */
 Field.setProperty(function value_element() {
 
@@ -506,7 +537,9 @@ Field.setProperty(function value_element() {
 		input = this.querySelector('alchemy-field-array');
 	} else if (this.contains_schema) {
 		input = this.querySelector('alchemy-field-schema');
-	} else {
+	}
+
+	if (!input) {
 		input = this.querySelector('.alchemy-field-value');
 	}
 

package/element/alchemy_field_schema.js

@@ -23,7 +23,7 @@ FieldSchema.setTemplateFile('form/elements/alchemy_field_schema');
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.3
+ * @version  0.1.4
  */
 FieldSchema.setProperty(function schema() {
 
@@ -34,13 +34,16 @@ FieldSchema.setProperty(function schema() {
 			let other_field = this.getSchemaSupplierField();
 			schema = null;
 
-			console.log('Other field:', other_field, 'of', this)
-
 			if (other_field && other_field.value && other_field.config && other_field.config.options) {
 				let values = other_field.config.options.values;
 
 				if (values) {
-					schema = values[other_field.value];
+
+					if (values instanceof Classes.Alchemy.Map.Backed) {
+						schema = values.get(other_field.value);
+					} else {
+						schema = values[other_field.value];
+					}
 
 					if (schema && schema.schema) {
 						schema = schema.schema;
@@ -113,14 +116,11 @@ FieldSchema.setProperty(function value() {
 FieldSchema.setMethod(function getSchemaSupplierField() {
 
 	if (!this.alchemy_field || !this.alchemy_field.config || !this.alchemy_field.config.options) {
-		console.log('--no config found?')
 		return;
 	}
 
 	let schema = this.alchemy_field.config.options.schema;
 
-	console.log('Schema is...', schema);
-
 	if (typeof schema == 'string') {
 		let other_field_path = this.resolvePath(schema);
 
@@ -128,10 +128,7 @@ FieldSchema.setMethod(function getSchemaSupplierField() {
 	
 		let form = this.alchemy_field.alchemy_form;
 
-		console.log(' -- Got form:', form);
-
 		if (form) {
-			console.log(' -- Looking for path:', other_field_path)
 			return form.findFieldByPath(other_field_path);
 		}
 	}
@@ -155,4 +152,41 @@ FieldSchema.setMethod(function introduced() {
 
 		this.rerender();
 	}
-});
+});
+
+/**
+ * Get the original value
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.1.4
+ * @version  0.1.4
+ */
+FieldSchema.setProperty(function original_value() {
+
+	let field = this.alchemy_field,
+	    path = this.field_path_in_record;
+
+	if (field && path) {
+		let form = field.alchemy_form || this.alchemy_form || this.field_context.alchemy_form;
+
+		if (form) {
+			return Object.path(form.document, path);
+		}
+	}
+
+	let context = this.field_context.alchemy_field_schema,
+	    data;
+
+	if (context) {
+		data = context.original_value;
+	} else {
+		context = this.field_context.alchemy_form || this.alchemy_field.alchemy_form;
+		data = context.document;
+	}
+
+	path = this.field_path_in_current_schema;
+
+	let result = Object.path(data, path);
+
+	return result;
+});

package/element/alchemy_form.js

@@ -5,18 +5,7 @@
  * @since    0.1.0
  * @version  0.1.0
  */
-var Form = Function.inherits('Alchemy.Element.Form.Base', function Form() {
-	Form.super.call(this);
-});
-
-/**
- * The stylesheet to load for this element
- *
- * @author   Jelle De Loecker <jelle@develry.be>
- * @since    0.1.0
- * @version  0.1.0
- */
-Form.setStylesheetFile('form/form');
+var Form = Function.inherits('Alchemy.Element.Form.Base', 'Form');
 
 /**
  * The stylesheet to load for this element

package/element/alchemy_select.js

@@ -244,12 +244,16 @@ AlchemySelect.setProperty(function loaded_items() {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.4
  *
  * @type     {Number}
  */
 AlchemySelect.setProperty(function loaded_item_count() {
-	return Object.size(this.options.values);
+	if (this.options.values) {
+		return this.options.values.size;
+	} else {
+		return 0;
+	}
 });
 
 /**
@@ -766,7 +770,7 @@ AlchemySelect.setMethod(function _ensureValueData(value) {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.4
  */
 AlchemySelect.setMethod(function _processPreloadedValues() {
 
@@ -784,9 +788,14 @@ AlchemySelect.setMethod(function _processPreloadedValues() {
 	let item,
 	    key;
 
-	for (key in values) {
+	let enum_values = new Classes.Alchemy.Map.Enum(values),
+	    value;
+
+	for (let key of enum_values.keys()) {
+		value = enum_values.get(key);
+
 		response.available++;
-		item = Object.assign({}, values[key]);
+		item = Object.assign({}, value);
 		item.id = key;
 
 		response.items.push(item);
@@ -915,7 +924,7 @@ AlchemySelect.setMethod(function _loadRemote(config) {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.4
  */
 AlchemySelect.setMethod(function recreateDropdownElements() {
 
@@ -925,8 +934,8 @@ AlchemySelect.setMethod(function recreateDropdownElements() {
 
 	Hawkejs.removeChildren(this.dropdown_content);
 
-	for (key in items) {
-		item = items[key];
+	for (let key of items.keys()) {
+		item = items.get(key);
 		item = this._makeOption(item.id, item);
 		this.addToDropdown(item);
 	}
@@ -1157,7 +1166,7 @@ AlchemySelect.setMethod(function close(event) {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.4
  *
  * @param    {String}   type    "value" or "option"
  * @param    {Mixed}    value   The actual value of this item
@@ -1188,7 +1197,11 @@ AlchemySelect.setMethod(function _makeValueItem(type, value, data) {
 			this.options.values = {};
 		}
 
-		this.options.values[value] = data;
+		if (this.options.values instanceof Classes.Alchemy.Map.Enum) {
+			this.options.values.set(value, data);
+		} else {
+			this.options.values[value] = data;
+		}
 	}
 
 	// And the associated data
@@ -1207,8 +1220,12 @@ AlchemySelect.setMethod(function _makeValueItem(type, value, data) {
 				return
 			}
 
-			if (that.options.values && that.options.values[value]) {
-				data = that.options.values[value];
+			if (that.options.values) {
+				if (that.options.values instanceof Classes.Alchemy.Map.Enum) {
+					data = that.options.values.get(value);
+				} else if (that.options.values[value]) {
+					data = that.options.values[value];
+				}
 			}
 
 			this.data = data;

package/helper/widgets/alchemy_field_widget.js

@@ -28,18 +28,65 @@ AlchemyField.constitute(function prepareSchema() {
 	// this.schema.addField('widgets', widgets, {array: true});
 });
 
+/**
+ * Find the alchemy-form parent
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.1.4
+ * @version  0.1.4
+ */
+AlchemyField.enforceProperty(function alchemy_form(new_value) {
+
+	if (!new_value && this.config && this.config.alchemy_form) {
+		new_value = this.config.alchemy_form;
+	}
+
+	if (!new_value) {
+
+		let parent = this.parent_instance;
+		
+		while (parent) {
+
+			new_value = parent.alchemy_form;
+
+			if (new_value) {
+				break;
+			}
+
+			if (parent.element) {
+				new_value = parent.element.querySelector('alchemy-form');
+
+				if (new_value) {
+					break;
+				}
+			}
+			
+			parent = parent.parent_instance;
+		}
+	}
+
+	return new_value;
+});
+
 /**
  * Populate the widget
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.2
+ * @version  0.1.4
  */
 AlchemyField.setMethod(function populateWidget() {
 
 	let config = this.config;
 
+	let alchemy_form = this.alchemy_form;
+
 	let field_el = this.createElement('alchemy-field');
+
+	if (alchemy_form) {
+		field_el.alchemy_form = alchemy_form;
+	}
+
 	field_el.field_name = config.field;
 
 	if (config.view) {

package/helper/widgets/alchemy_form_widget.js

@@ -16,7 +16,7 @@ const AlchemyForm = Function.inherits('Alchemy.Widget', 'AlchemyForm');
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.3
+ * @version  0.1.4
  */
 AlchemyForm.setMethod(function populateWidget() {
 
@@ -31,7 +31,22 @@ AlchemyForm.setMethod(function populateWidget() {
 	form.classList.add('alchemy-widgets-container');
 
 	if (this.config && this.config.widgets) {
-		col.widget.value = this.config.widgets;
+		let widgets = this.config.widgets.slice(0),
+		    widget,
+			i;
+		
+		for (i = 0; i < widgets.length; i++) {
+			widget = widgets[i];
+
+			if (widget.type == 'alchemy_field') {
+				widget = Object.assign({}, widget);
+				widget.config = Object.assign({}, widget.config);
+				widget.config.alchemy_form = form;
+				widgets[i] = widget;
+			}
+		}
+
+		col.widget.value = widgets;
 	}
 
 	let record = this.element.getContextVariable('record');

package/package.json

@@ -1,13 +1,13 @@
 {
 	"name": "alchemy-form",
 	"description": "Form plugin for Alchemy",
-	"version": "0.1.3",
+	"version": "0.1.4",
 	"repository": {
 		"type" : "git",
 		"url"  : "https://github.com/11ways/alchemy-form.git"
 	},
 	"peerDependencies": {
-		"alchemymvc" : "~1.1.3"
+		"alchemymvc" : "~1.2.0"
 	},
 	"license": "MIT",
 	"engines": {

package/view/form/elements/alchemy_field_schema.hwk

@@ -1,9 +1,7 @@
-{% with self.sub_fields as sub_field %}
-{% each %}
+{% each self.sub_fields as sub_field %}
 	<alchemy-field
 		#alchemy_field_schema=<% self %>
 		#schema=<% self.schema %>
 		field-name=<% sub_field.name %>
 	></alchemy-field>
-{% /each %}
-{% /with %}
+{% /each %}