alchemy-form 0.2.1 → 0.2.3

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.2.3 (2023-02-11)
+
+* Use `Scene#pushToHistory()` instead of directly calling `pushState`
+* Select `display_field_select` fields when requesting related data
+* Make local-filtering in `al-select` elements case insensitive
+* Fix `al-select` never getting more than the first page in `getRemoteFetchConfig` method
+* Add `hasOneParent` field support
+* Make `FormApi#related()` action make sure fields exist before querying them
+* Add a workaround so `al-select` actually refreshes elements when removing the search value
+
+## 0.2.2 (2023-01-23)
+
+* Fix `al-button`'s `activate` event not being cancelable
+* Add `placeholder` support to the string field
+
 ## 0.2.1 (2022-12-23)
 
 * Enable `al-form` model validation

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.8
+ * @version  0.2.3
  *
  * @param    {Conduit}   conduit
  */
@@ -34,16 +34,34 @@ FormApi.setAction(async function related(conduit) {
 	if (config.value) {
 		crit.where(model.primary_key).equals(config.value);
 	} else if (config.search) {
-		let display_fields = Array.cast(model.displayField);
+		let display_fields = Array.cast(model.display_field),
+		    search_fields = [];
 
 		let or = crit.or();
 		let rx = RegExp.interpretWildcard('*' + body.config.search + '*', 'i');
 
 		for (let field of display_fields) {
-			if (!field) {
+			if (!field || !model.getField(field)) {
 				continue;
 			}
+			search_fields.push(field);
+		}
+
+		if (!search_fields.length) {
+			if (model.getField('title')) {
+				search_fields.push('title');
+			}
+
+			if (model.getField('name')) {
+				search_fields.push('name');
+			}
 
+			if (model.getField('slug')) {
+				search_fields.push('slug');
+			}
+		}
+
+		for (let field of search_fields) {
 			or.where(field).equals(rx);
 		}
 	}
@@ -52,6 +70,10 @@ FormApi.setAction(async function related(conduit) {
 		crit.page(config.page);
 	}
 
+	if (model.display_field_select) {
+		crit.select(model.display_field_select);
+	}
+
 	let records = await model.find('all', crit);
 
 	let result = {

package/element/al_button.js

@@ -66,7 +66,7 @@ Button.setAssignedProperty('action_instance');
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  0.2.1
+ * @version  0.2.2
  */
 Button.setMethod(function activate() {
 
@@ -82,7 +82,7 @@ Button.setMethod(function activate() {
 		return;
 	}
 
-	let event = this.emit('activate');
+	let event = this.emit('activate', {cancelable: true});
 
 	if (event.defaultPrevented) {
 		return;

package/element/al_field.js

@@ -88,6 +88,15 @@ Field.setAttribute('readonly', {boolean: true});
  */
 Field.setAssignedProperty('widget_settings');
 
+/**
+ * The placeholder
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.2.2
+ * @version  0.2.2
+ */
+Field.setAttribute('placeholder');
+
 /**
  * Get the parent al-form element
  *

package/element/al_form.js

@@ -153,12 +153,37 @@ Form.setMethod(Hawkejs.SERIALIZE_FORM, function serializeForm() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.2.1
+ * @version  0.2.2
  */
 Form.setMethod(async function submit() {
 
 	let result;
 
+	await this.validate();
+
+	try {
+		result = await hawkejs.scene.onFormSubmit(this, null, {render_error: false});
+	} catch (err) {
+		if (err instanceof Classes.Alchemy.Error.Validation) {
+			this.showError(err);
+		} else {
+			this.showError(err);
+			throw err;
+		}
+	}
+
+	return result;
+});
+
+/**
+ * Validate this form
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.2.2
+ * @version  0.2.2
+ */
+Form.setMethod(async function validate() {
+
 	if (this.model) {
 		let model = alchemy.getModel(this.model);
 
@@ -174,17 +199,6 @@ Form.setMethod(async function submit() {
 		}
 	}
 
-	try {
-		result = await hawkejs.scene.onFormSubmit(this, null, {render_error: false});
-	} catch (err) {
-		if (err instanceof Classes.Alchemy.Error.Validation) {
-			this.showError(err);
-		} else {
-			throw err;
-		}
-	}
-
-	return result;
 });
 
 /**

package/element/al_select.js

@@ -924,12 +924,12 @@ AlchemySelect.setMethod(function _processResponseList(list, page) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  0.2.0
+ * @version  0.2.3
  */
 AlchemySelect.setMethod(function getRemoteFetchConfig() {
 
 	// Don't perform request when everything has already been loaded
-	if (this.total_item_count >= this.loaded_item_count) {
+	if (this.loaded_item_count >= this.total_item_count) {
 		return;
 	}
 
@@ -970,7 +970,7 @@ AlchemySelect.setMethod(function applyFetchedData(err, result, config) {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.1.0
- * @version  0.1.4
+ * @version  0.2.3
  */
 AlchemySelect.setMethod(function recreateDropdownElements() {
 
@@ -979,10 +979,12 @@ AlchemySelect.setMethod(function recreateDropdownElements() {
 
 	Hawkejs.removeChildren(this.dropdown_content);
 
-	for (let key of items.keys()) {
-		item = items.get(key);
-		item = this._makeOption(item.id, item);
-		this.addToDropdown(item);
+	if (items && typeof items.keys == 'function') {
+		for (let key of items.keys()) {
+			item = items.get(key);
+			item = this._makeOption(item.id, item);
+			this.addToDropdown(item);
+		}
 	}
 
 	this.refreshResultAmount();
@@ -1667,7 +1669,7 @@ AlchemySelect.setMethod(function onTypeAreaKeydown(e, is_input) {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.2.3
  */
 AlchemySelect.setMethod(function onTypeAreaKeyup(e, is_input) {
 
@@ -1683,15 +1685,20 @@ AlchemySelect.setMethod(function onTypeAreaKeyup(e, is_input) {
 			return;
 	}
 
-	if (this.search_value) {
+	let search_value = this.search_value,
+	    previous = this._previous_typed_search_value || '';
 
+	if (previous != search_value) {
 		// Only perform a remote search
 		// when at least 2 characters have been entered
-		if (this.search_value.length > 2) {
+		if (search_value.length === 0 || search_value.length > 2) {
 			this.refreshRemote();
 		}
+
 	}
 
+	this._previous_typed_search_value = search_value;
+
 	this.applyLocalFilter();
 });
 
@@ -1700,7 +1707,7 @@ AlchemySelect.setMethod(function onTypeAreaKeyup(e, is_input) {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.2.3
  */
 AlchemySelect.setMethod(function applyLocalFilter(query) {
 
@@ -1713,7 +1720,7 @@ AlchemySelect.setMethod(function applyLocalFilter(query) {
 	    i;
 
 	if (query) {
-		query = query.trim();
+		query = query.trim().toLowerCase();
 	}
 
 	for (i = 0; i < this.dropdown_content.children.length; i++) {
@@ -1722,10 +1729,22 @@ AlchemySelect.setMethod(function applyLocalFilter(query) {
 
 		if (!query) {
 			allow = true;
-		} else if (String(element.value).indexOf(query) > -1) {
-			allow = true;
-		} else if (element.textContent.indexOf(query) > -1) {
-			allow = true;
+		}
+
+		if (!allow) {
+			let value = String(element.value).toLowerCase();
+
+			if (value.includes(query)) {
+				allow = true;
+			}
+		}
+
+		if (!allow) {
+			let text = element.textContent.toLowerCase();
+
+			if (text.includes(query)) {
+				allow = true;
+			}
 		}
 
 		if (allow) {

package/element/al_table.js

@@ -1121,7 +1121,7 @@ Table.setMethod(function getRemoteFetchConfig() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  0.2.0
+ * @version  0.2.3
  */
 Table.setMethod(function applyFetchedData(err, result, config) {
 
@@ -1142,8 +1142,7 @@ Table.setMethod(function applyFetchedData(err, result, config) {
 	this.updateAnchors();
 
 	if (Blast.isBrowser) {
-		let current_url = this.getCurrentStateUrl();
-		history.pushState(null, document.title, current_url+'');
+		hawkejs.scene.pushToHistory(null, this.getCurrentStateUrl());
 	}
 });
 

package/package.json

@@ -1,14 +1,14 @@
 {
 	"name": "alchemy-form",
 	"description": "Form plugin for Alchemy",
-	"version": "0.2.1",
+	"version": "0.2.3",
 	"repository": {
 		"type" : "git",
 		"url"  : "https://github.com/11ways/alchemy-form.git"
 	},
 	"peerDependencies": {
 		"alchemymvc"    : ">=1.2.0",
-		"alchemy-media" : "~0.7.1"
+		"alchemy-media" : ">=0.7.2"
 	},
 	"license": "MIT",
 	"engines": {

package/view/form/inputs/edit/has_one_parent.hwk

@@ -0,0 +1,7 @@
+<al-select
+	class="alchemy-field-value"
+><%
+$0.dataprovider = alchemy_field;
+$0.name = path;
+$0.value = value;
+%></al-select>

package/view/form/inputs/edit/string.hwk

@@ -10,4 +10,5 @@
 	type={% type %}
 	form=<% form_id %>
 	name=<% path %>
+	placeholder={% alchemy_field.placeholder %}
 >