alchemy-form 0.1.4 → 0.1.5

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.5 (2022-03-21)
+
+* Print `alchemy-select-item` contents as text, not html
+* Only get a maximum of 50 related items
+* Set the parent `alchemy-select` element when creating `alchemy-select-item` element
+
 ## 0.1.4 (2022-03-16)
 
 * Make fields work with the new `Alchemy.Map.Backed` and `Alchemy.Map.Enum` class

package/controller/form_api_controller.js

@@ -17,7 +17,7 @@ const FormApi = Function.inherits('Alchemy.Controller', 'FormApi');
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.5
  *
  * @param    {Conduit}   conduit
  */
@@ -26,8 +26,25 @@ FormApi.setAction(async function related(conduit) {
 	const body = conduit.body;
 
 	const model = this.getModel(body.assoc_model);
+	let crit = model.find();
+	crit.limit(50);
+
+	if (body.config && body.config.search) {
+		let display_fields = Array.cast(model.displayField);
+
+		let or = crit.or();
+		let rx = RegExp.interpretWildcard('*' + body.config.search + '*', 'i');
+
+		for (let field of display_fields) {
+			if (!field) {
+				continue;
+			}
+
+			crit.where(field).equals(rx);
+		}
+	}
 
-	let records = await model.find('all');
+	let records = await model.find('all', crit);
 
 	let result = {
 		available : records.available,

package/element/alchemy_select.js

@@ -1166,7 +1166,7 @@ AlchemySelect.setMethod(function close(event) {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.1.0
- * @version  0.1.4
+ * @version  0.1.5
  *
  * @param    {String}   type    "value" or "option"
  * @param    {Mixed}    value   The actual value of this item
@@ -1184,6 +1184,9 @@ AlchemySelect.setMethod(function _makeValueItem(type, value, data) {
 	// Assign the value
 	item.value = value;
 
+	// Add a reference to this element
+	item.alchemy_select = this;
+
 	if (!data) {
 		data = this.getValueData(value);
 	}

package/element/alchemy_select_item.js

@@ -53,4 +53,36 @@ Item.setAssignedProperty('value');
  * @since    0.1.0
  * @version  0.1.0
  */
-Item.setAssignedProperty('data');
+Item.setAssignedProperty('data');
+
+/**
+ * The parent alchemy-select item
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.1.5
+ * @version  0.1.5
+ */
+Item.enforceProperty(function alchemy_select(new_value) {
+
+	if (new_value == null) {
+		new_value = this.closest('alchemy-select');
+	}
+
+	return new_value;
+});
+
+/**
+ * The display item
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.1.5
+ * @version  0.1.5
+ */
+Item.setProperty(function display_title() {
+
+	if (!this.data) {
+		return '';
+	}
+
+	return this.data.title || this.data.name || this.data.username || this.data.$pk || this.value;
+});

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemy-form",
 	"description": "Form plugin for Alchemy",
-	"version": "0.1.4",
+	"version": "0.1.5",
 	"repository": {
 		"type" : "git",
 		"url"  : "https://github.com/11ways/alchemy-form.git"

package/view/form/elements/alchemy_select_item.hwk

@@ -1,2 +1,2 @@
 <% data = self.data %>
-{%= data.title or data.name or data.$pk or self.value %}
+{{ data.title or data.name or data.$pk or self.value }}