alchemy-form 0.2.2 → 0.2.4

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 0.2.4 (2023-02-26)
+
+* Don't look for a field when the path is not specified
+* Make `al-field-schema` elements use `Field#getSubSchema()` method
+* Add an icon to the translatable-field entry buttons to see if it has a translation or not
+
+## 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

package/assets/stylesheets/form/elements/_field_translatable.scss

@@ -3,6 +3,46 @@ al-field-translatable {
 	position: relative;
 
 	.prefix-buttons {
-		
+		button {
+			display: flex;
+			flex-flow: row;
+		}
+
+		.has-empty-content {
+			font-size: 0.7rem;
+		}
+
+		.has-content {
+			font-size: 0.9rem;
+		}
+
+		.has-empty-content,
+		.has-content {
+			margin-left: 0.5rem;
+		}
+
+		[data-has-content="true"] {
+			.has-empty-content {
+				display: none;
+			}
+		}
+
+		[data-has-content="false"] {
+			.has-content {
+				display: none;
+			}
+		}
+
+		[icon-name] {
+			color: #333;
+		}
+
+		[icon-name="ban"] {
+			color: tomato;
+		}
+
+		.has-content {
+			color: green;
+		}
 	}
 }

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_field_schema.js

@@ -21,47 +21,39 @@ FieldSchema.setTemplateFile('form/elements/alchemy_field_schema');
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.12
+ * @version  0.2.4
  */
 FieldSchema.setProperty(function schema() {
 
-	if (this.alchemy_field && this.alchemy_field.config.options) {
-		let schema = this.alchemy_field.config.options.schema;
+	const field_element = this.alchemy_field;
+	const field = field_element?.config;
+
+	if (field?.options) {
+
+		let schema = field.options.schema;
 
 		if (typeof schema == 'string') {
-			let other_field = this.getSchemaSupplierField();
-			schema = null;
-
-			if (other_field && other_field.value && other_field.config && other_field.config.options) {
-				let values = other_field.config.options.values;
-
-				if (values) {
-					let value;
-
-					if (values instanceof Classes.Alchemy.Map.Backed) {
-						value = values.get(other_field.value);
-					} else {
-						value = values[other_field.value];
-					}
-
-					if (value) {
-						if (value.schema) {
-							schema = value.schema;
-						} else if (value.value) {
-							// Enumified values can be wrapped on the server-side
-							value = value.value;
-
-							if (value.schema) {
-								schema = value.schema;
-							}
-						}
-					}
-
-					if (!schema) {
-						schema = value;
-					}
+
+			let parent_schema_value;
+
+			let parent_schema = field_element.queryParents('al-field[field-type="schema"]');
+
+			if (parent_schema) {
+				parent_schema_value = parent_schema.value;
+			} else {
+
+				const form = field_element.alchemy_form;
+
+				let record_value = form.value;
+
+				if (form.model) {
+					record_value = record_value[form.model];
 				}
+
+				parent_schema_value = record_value;
 			}
+
+			return field.getSubschema(parent_schema_value, schema)
 		}
 
 		return schema;

package/element/al_field_translatable.js

@@ -75,7 +75,44 @@ FieldTranslatable.setMethod(function showPrefix(prefix) {
 			element.hidden = true;
 		}
 	}
+});
+
+/**
+ * Check the translation contents
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.2.4
+ * @version  0.2.4
+ */
+FieldTranslatable.setMethod(function checkTranslationContents() {
+
+	let field = this.field_context?.config;
+
+	let has_content,
+	    buttons = this.querySelectorAll('button[data-has-content][data-prefix]'),
+	    button,
+	    prefix,
+	    values = this.value,
+	    value,
+	    i;
+	
+	for (i = 0; i < buttons.length; i++) {
+		button = buttons[i];
+		prefix = button.dataset.prefix;
+		value = values?.[prefix];
+
+		if (field) {
+			has_content = field.valueHasContent(value);
+		} else {
+			has_content = value != null && value !== '';
+		}
 
+		if (has_content) {
+			button.dataset.hasContent = 'true';
+		} else {
+			button.dataset.hasContent = 'false';
+		}
+	}
 });
 
 /**
@@ -83,15 +120,37 @@ FieldTranslatable.setMethod(function showPrefix(prefix) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.2.4
  */
 FieldTranslatable.setMethod(function introduced() {
 
-	const that = this;
+	const that = this,
+	      field = this.field_context;
+
+	let doTranslationCheck = Function.throttle(() => {
+
+		if (field?.purpose == 'view') {
+			return;
+		}
+
+		that.checkTranslationContents();
+	}, 500, true, true);
 
 	this.onEventSelector('click', '.prefix-buttons button[data-prefix]', function onClick(e) {
+
 		e.preventDefault();
-		that.showPrefix(this.dataset.prefix);
+
+		let button = this.closest('[data-prefix]');
+
+		if (!button) {
+			return;
+		}
+
+		that.showPrefix(button.dataset.prefix);
+		doTranslationCheck();
 	});
 
+	this.addEventListener('change', doTranslationCheck);
+	this.addEventListener('keyup', doTranslationCheck);
+	this.addEventListener('click', doTranslationCheck);
 });

package/element/al_field_translatable_entry.js

@@ -25,6 +25,22 @@ FieldTranslatableEntry.setTemplateFile('form/elements/alchemy_field_translatable
  */
 FieldTranslatableEntry.setAttribute('prefix');
 
+/**
+ * Does this translation entry have a valid value?
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.2.4
+ * @version  0.2.4
+ */
+FieldTranslatableEntry.setProperty(function has_content() {
+
+	let field_translatable_el = this.field_context,
+	    field_el = field_translatable_el.field_context,
+	    field = field_el.config;
+
+	field.valueHasContent(this.value);
+});
+
 /**
  * Get the original value
  *
@@ -34,7 +50,9 @@ FieldTranslatableEntry.setAttribute('prefix');
  */
 FieldTranslatableEntry.setProperty(function original_value() {
 
-	let context_value = this.field_context.original_value;
+	let field_translatable_el = this.field_context;
+
+	let context_value = field_translatable_el.original_value;
 
 	if (context_value) {
 		return context_value[this.prefix];

package/element/al_form.js

@@ -289,7 +289,7 @@ Form.setMethod(async function showViolations(err) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.2.0
+ * @version  0.2.4
  *
  * @param    {String}   path
  *
@@ -297,6 +297,10 @@ Form.setMethod(async function showViolations(err) {
  */
 Form.setMethod(function findFieldByPath(path) {
 
+	if (!path) {
+		return;
+	}
+
 	let current = this,
 	    result,
 	    pieces = path.split('.'),

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,7 +1,7 @@
 {
 	"name": "alchemy-form",
 	"description": "Form plugin for Alchemy",
-	"version": "0.2.2",
+	"version": "0.2.4",
 	"repository": {
 		"type" : "git",
 		"url"  : "https://github.com/11ways/alchemy-form.git"

package/view/form/elements/alchemy_field_translatable.hwk

@@ -8,9 +8,24 @@
 <div class="prefix-buttons">
 	<% index = 0 %>
 	<% for (prefix in prefixes) { %>
-		<button data-prefix=<% prefix %>>
+		<% value = null %>
+		<% if (values) value = values[prefix] %>
+
+		<button
+			data-prefix={% prefix %}
+			data-has-content=<% alchemy_field.config.valueHasContent(value) ? 'true' : 'false' %>
+		>
 			<% if (index == 0) $0.classList.add('active') %>
-			{%= prefix %}
+
+			<span class="prefix-name">{{ prefix }}</span>
+
+			<al-icon-stack class="has-empty-content">
+				<al-icon icon-name="language"></al-icon>
+				<al-icon icon-name="ban" size=2></al-icon>
+			</al-icon-stack>
+
+			<al-icon class="has-content" icon-name="language"></al-icon>
+
 		</button>
 
 		<% index++ %>

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>