alchemy-form 0.1.7 → 0.1.8

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.1.8 (2022-06-29)
+
+* Move the `alchemy-select` pagination checker initializer to a static function
+* Prevent `alchemy-select` from keeping on loading remote data when last few results were empty
+* Fix pagination breaking re-opening of `alchemy-select` dropdown
+* Fix initial value of a `BelongsTo` `alchemy-select` element not loading
+* Fix `alchemy-select` downward-arrow-icon being rendered over value content
+* Use `alchemy-code-input` for HTML fields
+* Allow manually setting a value on `alchemy-field` elements
+* Try to let `Field` instances decide the representation of values in `alchemy-table` elements
+* Don't open the `alchemy-table` contextmenu when clicking on anchors
+
 ## 0.1.7 (2022-06-12)
 
 * Fix `<alchemy-table>` code typo

package/assets/stylesheets/form/alchemy_select.scss

@@ -102,7 +102,6 @@ alchemy-select {
 		font-family: inherit;
 		font-size: 13px;
 		line-height: 18px;
-		-webkit-font-smoothing: inherit;
 		display: inline-block !important;
 		padding: 0 !important;
 		min-height: 0 !important;
@@ -113,11 +112,10 @@ alchemy-select {
 		border: 0 none !important;
 		background: none !important;
 		line-height: inherit !important;
-		-webkit-user-select: auto !important;
-		-webkit-box-shadow: none !important;
 		box-shadow: none !important;
 		outline: none !important;
 		flex: 0 1 auto;
+		margin-right: 20px !important;
 	}
 
 	.dropdown {

package/controller/form_api_controller.js

@@ -17,20 +17,23 @@ const FormApi = Function.inherits('Alchemy.Controller', 'FormApi');
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.6
+ * @version  0.1.8
  *
  * @param    {Conduit}   conduit
  */
 FormApi.setAction(async function related(conduit) {
 
-	const body = conduit.body;
+	const body = conduit.body || {},
+	      config = body.config || {};
 
 	const model = this.getModel(body.assoc_model);
 	let crit = model.find();
 	crit.limit(50);
 	crit.setOption('scenario', 'related_data');
 
-	if (body.config && body.config.search) {
+	if (config.value) {
+		crit.where(model.primary_key).equals(config.value);
+	} else if (config.search) {
 		let display_fields = Array.cast(model.displayField);
 
 		let or = crit.or();
@@ -45,6 +48,10 @@ FormApi.setAction(async function related(conduit) {
 		}
 	}
 
+	if (config.page) {
+		crit.page(config.page);
+	}
+
 	let records = await model.find('all', crit);
 
 	let result = {

package/element/alchemy_field.js

@@ -133,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.4
+ * @version  0.1.8
  */
 Field.enforceProperty(function config(new_value, old_value) {
 
@@ -148,7 +148,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;
-	} else {
+	} else if (new_value) {
 		this.field_type = null;
 	}
 
@@ -493,10 +493,14 @@ Field.setProperty(function wrapper_files() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.4
+ * @version  0.1.8
  */
 Field.setProperty(function original_value() {
 
+	if (this.assigned_data.original_value != null) {
+		return this.assigned_data.original_value;
+	}
+
 	let alchemy_field_schema = this.alchemy_field_schema,
 	    path = this.field_path_in_current_schema;
 
@@ -517,6 +521,8 @@ Field.setProperty(function original_value() {
 	if (form && form.document) {
 		return Object.path(form.document, path);
 	}
+}, function setOriginalValue(value) {
+	return this.assigned_data.original_value = value;
 });
 
 /**
@@ -551,7 +557,7 @@ Field.setProperty(function value_element() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.3
+ * @version  0.1.8
  */
 Field.setProperty(function value() {
 
@@ -569,8 +575,9 @@ Field.setProperty(function value() {
 
 	if (element) {
 		element.value = value;
+	} else if (this.original_value == null) {
+		this.original_value = value;
 	}
-
 });
 
 /**

package/element/alchemy_select.js

@@ -5,9 +5,7 @@
  * @since    0.1.0
  * @version  0.1.0
  */
-var AlchemySelect = Function.inherits('Alchemy.Element.Form.Base', function Select() {
-	Select.super.call(this);
-});
+const AlchemySelect = Function.inherits('Alchemy.Element.Form.Base', 'Select');
 
 /**
  * The remote url attribute
@@ -389,14 +387,56 @@ AlchemySelect.setProperty(function loading_dropdown() {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.8
  */
 AlchemySelect.setProperty(function search_value() {
-	var type_area = this.type_area;
+
+	let type_area = this.type_area,
+	    result = '';
 
 	if (type_area) {
-		return type_area.value;
+		result = type_area.value;
 	}
+
+	if (this.previous_search_value == null) {
+		this.previous_search_value = '';
+	}
+
+	// If the search value changed, nullify the last page result
+	if (this.previous_search_value != result) {
+		this.setLastSuccessfulLoadedPage(null);
+	}
+
+	this.previous_search_value = result;
+
+	return result;
+});
+
+/**
+ * Make sure the pagination watcher exists
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.1.0
+ * @version  0.1.8
+ */
+AlchemySelect.setStatic(function ensurePaginationChecker() {
+
+	if (AlchemySelect.has_paginator_viewer) {
+		return;
+	}
+
+	// Only ever add 1 viewer per page
+	AlchemySelect.has_paginator_viewer = true;
+
+	hawkejs.scene.appears('js-he-ais-pager', {live: true, padding: 10, throttle: 200}, function onInfinity(el) {
+
+		if (!el.parentElement || !el.parentElement.parentElement) {
+			return;
+		}
+
+		const alchemy_select_instance = el.parentElement.parentElement;
+		alchemy_select_instance.loadOptions(++alchemy_select_instance.loaded_page);
+	});
 });
 
 /**
@@ -420,7 +460,7 @@ AlchemySelect.setMethod(function rendered() {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.8
  */
 AlchemySelect.setMethod(function introduced() {
 
@@ -433,14 +473,7 @@ AlchemySelect.setMethod(function introduced() {
 		this.makeSortable();
 	}
 
-	if (!AlchemySelect.has_paginator_viewer) {
-		AlchemySelect.has_paginator_viewer = true;
-
-		hawkejs.scene.appears('js-he-ais-pager', {live: true, padding: 10, throttle: 200}, function onInfinity(el) {
-			var ais = el.parentElement.parentElement;
-			ais.loadOptions(++ais.loaded_page);
-		});
-	}
+	AlchemySelect.ensurePaginationChecker();
 
 	this.addEventListener('focus-without', function onFocusOut(e) {
 		that.type_area.value = '';
@@ -462,8 +495,6 @@ AlchemySelect.setMethod(function introduced() {
 
 	this.addEventListener('keydown', function onKeydown(e) {
 
-		console.log('keydown:', e);
-
 		// Only listen for keydowns on the alchemy-select itself
 		if (e.target != that) {
 			return;
@@ -829,11 +860,12 @@ AlchemySelect.setMethod(function _processPreloadedValues() {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.1.0
- * @version  0.1.6
+ * @version  0.1.8
  *
  * @param    {Object}   response
+ * @param    {Number}   page       The page, if it's via pagination
  */
-AlchemySelect.setMethod(function _processResponseData(response) {
+AlchemySelect.setMethod(function _processResponseData(response, page) {
 
 	if (!response) {
 		response = {};
@@ -851,14 +883,48 @@ AlchemySelect.setMethod(function _processResponseData(response) {
 		records = [];
 	}
 
-	for (record of records) {
+	this._processResponseList(records, page);
+
+	this.refreshResultAmount();
+	this._markSelectedItems();
+});
+
+/**
+ * Process the response list of a certain paige
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.1.8
+ * @version  0.1.8
+ *
+ * @param    {Array}   list
+ * @param    {Number}  page
+ */
+AlchemySelect.setMethod(function _processResponseList(list, page) {
+
+	let record,
+	    item;
+
+	if (page == 1 && this.current_option && this.current_option.data) {
+		record = this.current_option.data;
+		item = this._makeOption(record._id || record.id, record);
+		this.addToDropdown(item);
+	}
+
+	for (record of list) {
 		item = this._makeOption(record._id || record.id, record);
 		this.addToDropdown(item);
 	}
 
 	this.loading_dropdown = false;
-	this.refreshResultAmount();
-	this._markSelectedItems();
+
+	// If there were values & they come from a page, record this as a succesful page
+	if (page != null && list.length) {
+		if (!this.last_page_result) {
+			this.setLastSuccessfulLoadedPage(page);
+		} else if (page > this.last_page_result) {
+			this.setLastSuccessfulLoadedPage(page);
+		}
+	}
 });
 
 /**
@@ -866,7 +932,7 @@ AlchemySelect.setMethod(function _processResponseData(response) {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.8
  *
  * @param    {Number}   page
  *
@@ -887,6 +953,10 @@ AlchemySelect.setMethod(function loadRemote(page) {
 		return pledge;
 	}
 
+	if (page == null) {
+		page = 1;
+	}
+
 	const that = this;
 
 	this.loading_dropdown = true;
@@ -906,11 +976,11 @@ AlchemySelect.setMethod(function loadRemote(page) {
 			throw err;
 		}
 
-		if (page == null) {
+		if (page == null || page == 1) {
 			Hawkejs.removeChildren(that.dropdown_content);
 		}
 
-		that._processResponseData(data);
+		that._processResponseData(data, page);
 
 		pledge.resolve(true);
 	};
@@ -1001,7 +1071,19 @@ AlchemySelect.setMethod(function _markSelectedItems() {
 			}
 		}
 	}
+});
 
+/**
+ * Set the last successful loaded page
+ *
+ * @author   Jelle De Loecker <jelle@develry.be>
+ * @since    0.1.8
+ * @version  0.1.8
+ *
+ * @param    {Number}   page
+ */
+AlchemySelect.setMethod(function setLastSuccessfulLoadedPage(page) {
+	this.last_page_result = page;
 });
 
 /**
@@ -1009,15 +1091,13 @@ AlchemySelect.setMethod(function _markSelectedItems() {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.8
  *
  * @param    {Number}   page
  */
 AlchemySelect.setMethod(function loadOptions(page) {
 
-	var that = this,
-	    model,
-	    field;
+	const that = this;
 
 	if (this.total_item_count >= this.loaded_item_count) {
 		if (this.dropdown_content.children.length == 0) {
@@ -1029,12 +1109,34 @@ AlchemySelect.setMethod(function loadOptions(page) {
 		return;
 	}
 
+	// Prevent it from keeping on loading empty pages if the previous page was empty
+	if (page && this.last_page_result) {
+		let next_allowed_page = this.last_page_result + 1;
+
+		if (page > next_allowed_page) {
+			return;
+		}
+	}
+
+	// Previous page will only be set to the last page that had items.
+	// So if there are 0 results overall, it won't ever be set.
+	// In that case: ignore any page load over 1.
+	if (page > 1 && !this.last_page_result) {
+		return;
+	}
+
+	// If stuff has already been loaded and this is just re-opening the dropdown,
+	// don't do anything yet
+	if (page == null && this.last_page_result > 0) {
+		return;
+	}
+
 	// If an URL is provided, use that
 	if (this.src || this.dataprovider) {
 		return this.loadRemote(page);
 	}
 
-	field = this.model_field;
+	let field = this.model_field;
 
 	if (!field) {
 		return;
@@ -1042,7 +1144,7 @@ AlchemySelect.setMethod(function loadOptions(page) {
 
 	this.loading_dropdown = true;
 
-	model = this.form.getModel(field.modelName);
+	let model = this.form.getModel(field.modelName);
 
 	model.find('all', {
 		limit : 20,
@@ -1053,12 +1155,7 @@ AlchemySelect.setMethod(function loadOptions(page) {
 			throw err;
 		}
 
-		records.forEach(function eachRecord(record) {
-			var item = that._makeOption(record._id || record.id, record);
-			that.addToDropdown(item);
-		});
-
-		that.loading_dropdown = false;
+		that._processResponseList(records, page);
 	});
 });
 
@@ -1699,9 +1796,10 @@ AlchemySelect.setMethod(function applyLocalFilter(query) {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.8
  */
 AlchemySelect.setMethod('refreshRemote', Fn.throttle(function refreshRemote() {
+	this.loaded_page = 0;
 	this.loadRemote();
 }, {
 	minimum_wait  : 350,

package/element/alchemy_table.js

@@ -589,12 +589,49 @@ Table.setMethod(function showPagination() {
 	pager.showPage(records.page, Math.ceil(records.available / records.page_size));
 });
 
+/**
+ * Get a fieldset's preferred content view
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.1.8
+ * @version  0.1.8
+ *
+ * @param    {FieldConfig}   field_config   The config on how to display the field
+ * @param    {Object}        container      The container where the field should be in
+ *
+ * @return   
+ */
+Table.setMethod(function getFieldConfigView(field_config, container) {
+
+	let value = field_config.getValueIn(container),
+	    field = field_config.getFieldDefinition();
+	
+	if (value == null && !field) {
+		return null;
+	}
+
+	// Fallback to simple text view
+	if (!field) {
+		let text = field_config.getDisplayValueIn(container);
+
+		return Hawkejs.createText(text);
+	}
+
+	let alchemy_field = this.createElement('alchemy-field');
+	alchemy_field.view_type = 'view_inline';
+	alchemy_field.field_name = field.name;
+	alchemy_field.config = field;
+	alchemy_field.original_value = value;
+
+	return alchemy_field;
+});
+
 /**
  * Create a datarow
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.6
+ * @version  0.1.8
  *
  * @param    {Object}   entry
  *
@@ -602,7 +639,7 @@ Table.setMethod(function showPagination() {
  */
 Table.setMethod(function createDataRow(entry) {
 
-	let field,
+	let field_set_config,
 	    value,
 	    tr = this.createElement('tr'),
 	    td,
@@ -610,13 +647,13 @@ Table.setMethod(function createDataRow(entry) {
 	
 	tr.dataset.pk = id;
 
-	for (field of this.fieldset) {
+	for (field_set_config of this.fieldset) {
 		td = this.createElement('td');
 
-		value = field.getDisplayValueIn(entry);
+		let element = this.getFieldConfigView(field_set_config, entry);
 
-		if (value != null) {
-			td.textContent = value;
+		if (element) {
+			td.append(element);
 		}
 
 		tr.append(td);
@@ -709,7 +746,7 @@ Table.setMethod(function getEntryActions(record, filter) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.6
- * @version  0.1.7
+ * @version  0.1.8
  *
  * @param    {Object}   entry
  */
@@ -745,6 +782,13 @@ Table.setMethod(function attachContextMenus() {
 
 		tr.addEventListener('contextmenu', e => {
 
+			// Ignore right clicks on certain elements
+			if (e && e.target) {
+				if (e.target.closest('a')) {
+					return;
+				}
+			}
+
 			this.selectRow(tr);
 
 			let menu = this.createElement('he-context-menu');

package/package.json

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

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

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

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

@@ -0,0 +1,5 @@
+<alchemy-code-input
+	class="alchemy-field-value"
+	form=<% form_id %>
+	name=<% path %>
+>{{ value }}</alchemy-code-input>

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

@@ -0,0 +1 @@
+<span class="alchemy-field-value">{{ value }}</span>

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

@@ -0,0 +1 @@
+<span class="alchemy-field-value">{{ value }}</span>

package/view/form/wrappers/view_inline/default.hwk

@@ -0,0 +1 @@
+<div data-he-name="field"></div>