alchemy-form 0.3.0-alpha.2 → 0.3.0-alpha.4

package/element/al_enum_badge.js

@@ -0,0 +1,157 @@
+/**
+ * The al-enum-badge class:
+ * Shows a selected enum value as a badge.
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.3.0
+ * @version  0.3.0
+ */
+const EnumBadge = Function.inherits('Alchemy.Element.Form.Base', 'EnumBadge');
+
+/**
+ * The template to use for the content of this element
+ *
+ * @author   Jelle De Loecker <jelle@develry.be>
+ * @since    0.3.0
+ * @version  0.3.0
+ */
+EnumBadge.setTemplateFile('form/elements/al_enum_badge');
+
+/**
+ * The ID of the enum value to show.
+ * Can be a string, a number, an ObjectId representation.
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.3.0
+ * @version  0.3.0
+ */
+EnumBadge.setAttribute('enum-id');
+
+/**
+ * The optional Model to get the info from,
+ * in case the source is a Model.
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.3.0
+ * @version  0.3.0
+ */
+EnumBadge.setAttribute('model');
+
+/**
+ * The optional enum-class to use (if the source is not just a model)
+ * This class has to be available on the client-side!
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.3.0
+ * @version  0.3.0
+ */
+EnumBadge.setAttribute('enum-class');
+
+/**
+ * See if we need to prepare any render variables
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.3.0
+ * @version  0.3.0
+ */
+EnumBadge.setMethod(function prepareRenderVariables() {
+
+	let enum_id = this.enum_id;
+
+	if (!enum_id) {
+		return;
+	}
+
+	let enum_class = this.enum_class;
+
+	if (!enum_class) {
+
+		if (this.model) {
+			return this.prepareRenderVariablesFromModel();
+		}
+
+		return;
+	}
+
+	let constructor,
+	    parent = Object.path(Classes, enum_class);
+
+	if (parent?.is_namespace) {
+		parent = parent[parent.name];
+	}
+
+	if (!parent) {
+		return;
+	}
+
+	// Not sure this will always be correct.
+	// Might have to loop over all the children.
+	// Or use `getDescendantsDict()` or `getDescendantsMap()`
+	constructor = parent.getDescendant(enum_id);
+
+	if (!constructor) {
+		return;
+	}
+
+	let title = constructor.title,
+	    color,
+	    index,
+	    icon;
+
+	let enum_info = constructor.enum_info;
+
+	if (enum_info) {
+		if (enum_info.title) {
+			title = enum_info.title;
+		}
+
+		if (enum_info.icon) {
+			icon = enum_info.icon;
+		}
+
+		if (enum_info.index) {
+			index = enum_info.index;
+		}
+
+		if (enum_info.color) {
+			color = enum_info.color;
+		}
+	}
+
+	return {title, color, index, icon};
+});
+
+/**
+ * Get render variables from a model
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.3.0
+ * @version  0.3.0
+ */
+EnumBadge.setMethod(async function prepareRenderVariablesFromModel() {
+
+	let enum_id = this.enum_id,
+	    model = this.model;
+
+	if (!enum_id || !model) {
+		return;
+	}
+
+	let resource_options = {
+		name   : 'FormApi#enumInfo',
+		params : {
+			model_name : model,
+			id         : enum_id
+		}
+	};
+
+	let result;
+
+	try {
+		result = await this.hawkejs_helpers.Alchemy.getResource(resource_options);
+	} catch (err) {
+		console.error('Failed to get enum info:', err);
+	}
+
+	return result;
+});

package/element/al_field.js

@@ -72,6 +72,24 @@ Field.setAttribute('field-view');
  */
 Field.setAttribute('wrapper-view');
 
+/**
+ * Minimum amount of values (in case of an array)
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.1.12
+ * @version  0.1.12
+ */
+Field.setAttribute('min-entry-count', {type: 'number'});
+
+/**
+ * Maximum amount of values (in case of an array)
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.1.12
+ * @version  0.1.12
+ */
+Field.setAttribute('max-entry-count', {type: 'number'});
+
 /**
  * Is this a read only field?
  *
@@ -176,7 +194,7 @@ Field.enforceProperty(function config(new_value, old_value) {
 
 	// If an explicit field is set without a schema,
 	// we need to remember it for serializing purposes
-	if (new_value && !new_value.schema) {
+	if (new_value && (!new_value.schema || new_value == new_value.schema)) {
 		this.assigned_data.field_config = new_value;
 	}
 
@@ -196,7 +214,7 @@ 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;
+		this.field_type = new_value.constructor.type_path || new_value.constructor.type_name;
 	} else if (new_value) {
 		this.field_type = null;
 	}
@@ -209,10 +227,16 @@ Field.enforceProperty(function config(new_value, old_value) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.9
+ * @version  0.3.0
  */
 Field.enforceProperty(function schema(new_value, old_value) {
 
+	let forced_value = !!new_value;
+
+	if (!new_value && this.assigned_data?.schema) {
+		new_value = this.assigned_data.schema;
+	}
+
 	if (!new_value) {
 		// See if this is in a schema field
 		if (this.alchemy_field_schema) {
@@ -238,6 +262,10 @@ Field.enforceProperty(function schema(new_value, old_value) {
 		}
 	}
 
+	if (forced_value) {
+		this.assignData('schema', new_value);
+	}
+
 	return new_value;
 });
 
@@ -246,10 +274,14 @@ Field.enforceProperty(function schema(new_value, old_value) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.3.0
  */
 Field.setProperty(function is_array() {
 
+	if (this.assigned_data?.is_array != null) {
+		return this.assigned_data.is_array;
+	}
+
 	let config = this.config;
 
 	if (config) {
@@ -257,6 +289,8 @@ Field.setProperty(function is_array() {
 	}
 
 	return false;
+}, function setValue(value) {
+	this.assignData('is_array', value);
 });
 
 /**
@@ -264,14 +298,18 @@ Field.setProperty(function is_array() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.3
- * @version  0.1.3
+ * @version  0.3.0
  */
- Field.setProperty(function contains_schema() {
+Field.setProperty(function contains_schema() {
 
 	let config = this.config;
 
 	if (config) {
-		return config instanceof Classes.Alchemy.Field.Schema;
+		if (config instanceof Classes.Alchemy.Field.Schema) {
+			return true;
+		}
+
+		return Classes.Alchemy.Client.Schema.isSchema(config);
 	}
 
 	return false;
@@ -345,17 +383,17 @@ Field.setProperty(function field_path_in_schema() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.3
- * @version  0.1.3
+ * @version  0.3.0
  *
  * @return   {String}
  */
- Field.setMethod(function getPathEntryName() {
+Field.setMethod(function getPathEntryName() {
 
 	if (this.config && this.config.name) {
 		return this.config.name;
 	}
 
-	return '';
+	return this.field_name;
 });
 
 /**
@@ -385,21 +423,17 @@ Field.setProperty(function model() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.11
+ * @version  0.3.0
  */
 Field.enforceProperty(function view_file(new_value, old_value) {
 
 	if (!new_value) {
 
 		let view_type = this.view_type,
-			field_view = this.field_view || this.field_type;
-		
-		if (!field_view) {
-			let config = this.config;
+		    field_view = this.field_view;
 
-			if (config) {
-				field_view = config.constructor.type_name;
-			}
+		if (!field_view) {
+			field_view = this.getFieldType().replaceAll('.', '_');
 		}
 
 		new_value = this.generateTemplatePath('inputs', view_type, field_view);
@@ -441,7 +475,7 @@ Field.enforceProperty(function wrapper_file(new_value, old_value) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.11
+ * @version  0.3.0
  */
 Field.setProperty(function view_files() {
 
@@ -472,6 +506,9 @@ Field.setProperty(function view_files() {
 		return false;
 	}
 
+	// Fallback to the fallback
+	result.push(this.generateTemplatePath('inputs', view_type, 'fallback'));
+
 	// Fallback to a simple string input
 	result.push(this.generateTemplatePath('inputs', view_type, 'string'));
 
@@ -524,21 +561,46 @@ Field.setProperty(function wrapper_files() {
 	return result;
 });
 
+/**
+ * Get the original value container
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.3.0
+ * @version  0.3.0
+ */
+Field.setAssignedProperty(function original_value_container() {
+
+	if (this.assigned_data.original_value_container != null) {
+		return this.assigned_data.original_value_container;
+	}
+
+	let form = this.alchemy_form;
+
+	if (form) {
+		return form.document;
+	}
+});
+
 /**
  * Get the original value
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.8
+ * @version  0.3.0
  */
 Field.setProperty(function original_value() {
 
-	if (this.assigned_data.original_value != null) {
+	if (this.assigned_data.original_value !== undefined) {
 		return this.assigned_data.original_value;
 	}
 
-	let alchemy_field_schema = this.alchemy_field_schema,
-	    path = this.field_path_in_current_schema;
+	let path = this.field_path_in_current_schema;
+
+	if (path == null) {
+		return;
+	}
+
+	let alchemy_field_schema = this.alchemy_field_schema;
 
 	if (alchemy_field_schema) {
 		let original_schema_value = alchemy_field_schema.original_value;
@@ -552,13 +614,13 @@ Field.setProperty(function original_value() {
 		return;
 	}
 
-	let form = this.alchemy_form;
+	let original_container = this.original_value_container;
 
-	if (form && form.document) {
-		return Object.path(form.document, path);
+	if (original_container) {
+		return Object.path(original_container, path);
 	}
 }, function setOriginalValue(value) {
-	return this.assigned_data.original_value = value;
+	return this.assignData('original_value', value);
 });
 
 /**
@@ -566,26 +628,38 @@ Field.setProperty(function original_value() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.2.0
+ * @version  0.3.0
  */
 Field.setProperty(function value_element() {
 
-	let input;
+	let special_input;
 
 	// Translations always get preference
 	if (this.is_translatable) {
-		input = this.querySelector('al-field-translatable');
+		special_input = this.querySelector('al-field-translatable');
 	} else if (this.is_array) {
-		input = this.querySelector('al-field-array');
+		special_input = this.querySelector('al-field-array');
 	} else if (this.contains_schema) {
-		input = this.querySelector('al-field-schema');
+		special_input = this.querySelector('al-field-schema');
 	}
 
-	if (!input) {
-		input = this.querySelector('.alchemy-field-value');
+	let main_input = this.querySelector('.alchemy-field-value');
+
+	// If there is no main input, but there is a special input, simply use that
+	if (!main_input) {
+		return special_input;
+	}
+
+	if (!special_input) {
+		return main_input;
 	}
 
-	return input;
+	// Use the top level one
+	if (special_input.contains(main_input)) {
+		return special_input;
+	}
+
+	return main_input;
 });
 
 /**
@@ -602,7 +676,7 @@ Field.setProperty(function value() {
 	if (element) {
 		let value = element.value;
 
-		if (this.config) {
+		if (this.config?.castContainedValues) {
 			value = this.config.castContainedValues(value);
 		}
 
@@ -615,7 +689,7 @@ Field.setProperty(function value() {
 
 	let has_changed = !Object.alike(this[LAST_SET_VALUE], value);
 
-	if (this.original_value == null) {
+	if (this.original_value === undefined) {
 		this.original_value = value;
 	}
 
@@ -661,6 +735,27 @@ Field.setProperty(function allow_empty_value_placeholder() {
 	return !!(this.applied_options?.empty_value_placeholder ?? true);
 });
 
+/**
+ * Set the value container (like the `Document` instance) the value came from.
+ * Will only be set if there is no `alchemy_form` available.
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.3.0
+ * @version  0.3.0
+ */
+Field.setMethod(function rememberOriginalValueContainer(container) {
+
+	if (!container) {
+		return;
+	}
+
+	if (this.alchemy_form) {
+		return;
+	}
+
+	this.original_value_container = container;
+});
+
 /**
  * Create the empty value placeholder text
  *
@@ -681,7 +776,7 @@ Field.setMethod(function createEmptyValuePlaceholderText() {
 	microcopy = Classes.Alchemy.Microcopy('empty-value-placeholder', {
 		field_name : this.field_name,
 		model_name : this.model,
-		field_type : this.field_type,
+		field_type : this.getFieldType(),
 		zone       : this.zone,
 		path       : this.config?.path_in_document,
 	});
@@ -785,7 +880,7 @@ Field.setMethod(function getFieldType() {
 		}
 	}
 
-	return result;
+	return result || '';
 });
 
 /**

package/element/al_field_array.js

@@ -16,6 +16,24 @@ const FieldArray = Function.inherits('Alchemy.Element.Form.FieldCustom', 'FieldA
  */
 FieldArray.setTemplateFile('form/elements/alchemy_field_array');
 
+/**
+ * Minimum amount of values (in case of an array)
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.3.0
+ * @version  0.3.0
+ */
+FieldArray.setAttribute('min-entry-count', {type: 'number'});
+
+/**
+ * Maximum amount of values (in case of an array)
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.3.0
+ * @version  0.3.0
+ */
+FieldArray.setAttribute('max-entry-count', {type: 'number'});
+
 /**
  * Get the live value
  *
@@ -53,6 +71,10 @@ FieldArray.setMethod(function introduced() {
 
 	const that = this;
 
+	if (this.max_entry_count === 1) {
+		return;
+	}
+
 	this.onEventSelector('click', '.remove', function onClick(e) {
 
 		e.preventDefault();