alchemy-form 0.1.5 → 0.1.8

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
@@ -36,6 +34,26 @@ AlchemySelect.setProperty('_clear_count', 0);
  */
 AlchemySelect.setAttribute('total-item-count', {number: true});
 
+/**
+ * The optional template to use for value items
+ * (The chosen value)
+ *
+ * @author   Jelle De Loecker <jelle@develry.be>
+ * @since    0.1.6
+ * @version  0.1.6
+ */
+AlchemySelect.setAttribute('value-item-template');
+
+/**
+ * The optional template to use for option items
+ * (The items visible in the dropdown)
+ *
+ * @author   Jelle De Loecker <jelle@develry.be>
+ * @since    0.1.6
+ * @version  0.1.6
+ */
+AlchemySelect.setAttribute('option-item-template');
+
 /**
  * The hawkejs template to use
  *
@@ -369,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);
+	});
 });
 
 /**
@@ -400,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() {
 
@@ -413,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 = '';
@@ -442,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;
@@ -809,11 +860,16 @@ AlchemySelect.setMethod(function _processPreloadedValues() {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @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 = {};
+	}
 
 	if (response.available) {
 		this.total_item_count = response.available;
@@ -823,14 +879,52 @@ AlchemySelect.setMethod(function _processResponseData(response) {
 	    record,
 	    item;
 
-	for (record of records) {
+	if (!records) {
+		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);
+		}
+	}
 });
 
 /**
@@ -838,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
  *
@@ -859,6 +953,10 @@ AlchemySelect.setMethod(function loadRemote(page) {
 		return pledge;
 	}
 
+	if (page == null) {
+		page = 1;
+	}
+
 	const that = this;
 
 	this.loading_dropdown = true;
@@ -878,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);
 	};
@@ -973,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;
 });
 
 /**
@@ -981,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) {
@@ -1001,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;
@@ -1014,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,
@@ -1025,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);
 	});
 });
 
@@ -1166,7 +1291,7 @@ AlchemySelect.setMethod(function close(event) {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.1.0
- * @version  0.1.5
+ * @version  0.1.6
  *
  * @param    {String}   type    "value" or "option"
  * @param    {Mixed}    value   The actual value of this item
@@ -1181,6 +1306,13 @@ AlchemySelect.setMethod(function _makeValueItem(type, value, data) {
 	// Set the type ("value" or "option")
 	item.type = type;
 
+	// Set the custom template to use, if any
+	let custom_template = this[type + '-item-template'];
+
+	if (custom_template) {
+		item.custom_template = custom_template;
+	}
+
 	// Assign the value
 	item.value = value;
 
@@ -1664,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_select_item.js

@@ -37,6 +37,15 @@ Item.setAttribute('type');
  */
 Item.setAttribute('selected', {boolean: true});
 
+/**
+ * Should a custom template be used?
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.1.6
+ * @version  0.1.6
+ */
+Item.setAttribute('custom-template');
+
 /**
  * The value of this item
  *

package/element/alchemy_table.js

@@ -513,7 +513,7 @@ Table.setMethod(function getCurrentStateUrl() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.6
  *
  * @param    {Array}   records
  */
@@ -530,6 +530,7 @@ Table.setMethod(function setRecords(records) {
 	}
 
 	this.showPagination();
+	this.attachContextMenus();
 });
 
 /**
@@ -588,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.1
+ * @version  0.1.8
  *
  * @param    {Object}   entry
  *
@@ -601,18 +639,21 @@ Table.setMethod(function showPagination() {
  */
 Table.setMethod(function createDataRow(entry) {
 
-	let field,
+	let field_set_config,
 	    value,
 	    tr = this.createElement('tr'),
-	    td;
+	    td,
+		id = entry.$pk || entry._id || entry.id;
+	
+	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);
@@ -623,31 +664,22 @@ Table.setMethod(function createDataRow(entry) {
 		td.classList.add('aft-actions');
 		tr.append(td);
 
-		let actions;
-
-		if (entry.$hold && entry.$hold.actions) {
-			actions = entry.$hold.actions;
-		} else {
-			actions = entry.$actions;
-		}
+		let actions = this.getEntryActions(entry, 'row');
 
 		if (actions && actions.length) {
+
 			let action,
 			    anchor;
 
+			// Iterate over all the defined actions
 			for (action of actions) {
-				anchor = this.createElement('a');
-				anchor.dataset.name = action.name;
-
-				if (action.icon) {
-					let alico = this.createElement('al-ico');
-					alico.setAttribute('type', action.icon);
-					anchor.append(alico);
-				} else {
-					anchor.textContent = action.title || action.name;
+
+				anchor = action.constructElement(this);
+
+				if (!anchor) {
+					continue;
 				}
 
-				anchor.setAttribute('href', action.url);
 				td.append(anchor);
 			}
 		}
@@ -658,6 +690,118 @@ Table.setMethod(function createDataRow(entry) {
 	return tr;
 });
 
+/**
+ * Get a list of actions
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.1.6
+ * @version  0.1.6
+ *
+ * @param    {Object}   record
+ * @param    {Stirng}   filter
+ * 
+ * @return   {Alchemy.Form.Action.Action[]}
+ */
+Table.setMethod(function getEntryActions(record, filter) {
+
+	let result = [];
+
+	if (!record) {
+		return result;
+	}
+
+	let actions;
+
+	if (record.$hold && record.$hold.actions) {
+		actions = record.$hold.actions;
+	} else {
+		actions = record.$actions;
+	}
+
+	if(!actions || !actions.length) {
+		return result;
+	}
+
+	for (let action of actions) {
+
+		if (!action.type) {
+			action.type = 'url';
+		}
+
+		// Make sure it's an action instance
+		action = Classes.Alchemy.Form.Action.Action.cast(action);
+
+		if (!action || (filter && !action.isAllowedIn(filter))) {
+			continue;
+		}
+
+		result.push(action);
+	}
+
+	return result;
+});
+
+/**
+ * Add context menus to rows
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.1.6
+ * @version  0.1.8
+ *
+ * @param    {Object}   entry
+ */
+Table.setMethod(function attachContextMenus() {
+
+	if (!Blast.isBrowser) {
+		return;
+	}
+
+	if (!this.assigned_data.records || !this.assigned_data.records.length) {
+		return;
+	}
+
+	for (let record of this.assigned_data.records) {
+
+		let context_actions = this.getEntryActions(record, 'context');
+
+		if (!context_actions || !context_actions.length) {
+			continue;
+		}
+
+		let pk = record.$pk || record._id || record.id;
+
+		if (!pk) {
+			continue;
+		}
+
+		let tr = this.querySelector('[data-pk="' + pk + '"]');
+
+		if (!tr) {
+			continue;
+		}
+
+		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');
+
+			for (let action of context_actions) {
+				action.addToContextMenu(menu);
+			}
+
+			menu.show(e);
+		});
+	}
+});
+
 /**
  * On new fieldset
  *
@@ -931,12 +1075,14 @@ Table.setMethod(function sortData() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.6
  */
 Table.setMethod(function introduced() {
 
 	const that = this;
 
+	this.attachContextMenus();
+
 	this.addEventListener('click', function onClick(e) {
 
 		let target = e.target,