alchemy-form 0.1.6 → 0.1.9

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.6
+ * @version  0.1.8
  *
  * @param    {Object}   entry
  */
@@ -728,7 +765,7 @@ Table.setMethod(function attachContextMenus() {
 		let context_actions = this.getEntryActions(record, 'context');
 
 		if (!context_actions || !context_actions.length) {
-			contintue;
+			continue;
 		}
 
 		let pk = record.$pk || record._id || record.id;
@@ -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/element/query_builder.js

@@ -73,7 +73,7 @@ QueryBuilder.setMethod(function applyValue(value) {
 		return;
 	}
 
-	this.root_group.applyValue(value);
+	this.root_group.value = value;
 });
 
 /**

package/element/query_builder_group.js

@@ -104,7 +104,7 @@ QueryBuilderGroup.setProperty(function group_type() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.6
- * @version  0.1.6
+ * @version  0.1.7
  */
 QueryBuilderGroup.setProperty(function inverted() {
 
@@ -116,8 +116,17 @@ QueryBuilderGroup.setProperty(function inverted() {
 
 	return false;
 }, function setInverted(value) {
-	let input = this.header.querySelector('.qb-group-invert input');
-	input.checked = value;
+
+	if (!this.assigned_data.value) {
+		this.assigned_data.value = {};
+	}
+
+	this.assigned_data.value.inverted = value;
+
+	if (this.header) {
+		let input = this.header.querySelector('.qb-group-invert input');
+		input.checked = value;
+	}
 });
 
 /**
@@ -125,7 +134,7 @@ QueryBuilderGroup.setProperty(function inverted() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.6
- * @version  0.1.6
+ * @version  0.1.7
  */
 QueryBuilderGroup.setProperty(function value() {
 
@@ -148,6 +157,13 @@ QueryBuilderGroup.setProperty(function value() {
 	}
 
 	return result;
+}, function setValue(value) {
+
+	this.assigned_data.value = value;
+
+	if (this.has_rendered) {
+		this.applyValue(value);
+	}
 });
 
 /**
@@ -155,7 +171,7 @@ QueryBuilderGroup.setProperty(function value() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.6
- * @version  0.1.6
+ * @version  0.1.7
  */
 QueryBuilderGroup.setMethod(function applyValue(value) {
 
@@ -163,15 +179,25 @@ QueryBuilderGroup.setMethod(function applyValue(value) {
 		return;
 	}
 
+	// Keep track of how many time a value has been applied
+	// (needed for the initial value setter)
+	if (!this.applied_value_counter) {
+		this.applied_value_counter = 0;
+	}
+
+	this.applied_value_counter++;
+
 	this.inverted = value.inverted;
 	this.group_type = value.condition;
 
+	Hawkejs.removeChildren(this.rules_list);
+
 	if (value.rules && value.rules.length) {
 		let element,
 		    rule;
 
 		for (rule of value.rules) {
-			if (rule.type == 'field') {
+			if (rule.type == 'qb_entry') {
 				element = this.createElement('alchemy-query-builder-entry');
 			} else {
 				element = this.createElement('alchemy-query-builder-group');
@@ -188,7 +214,7 @@ QueryBuilderGroup.setMethod(function applyValue(value) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.6
- * @version  0.1.6
+ * @version  0.1.7
  */
 QueryBuilderGroup.setMethod(function introduced() {
 
@@ -215,7 +241,8 @@ QueryBuilderGroup.setMethod(function introduced() {
 		this.remove();
 	});
 
-	if (this.assigned_data.value) {
+	// Apply the value if it hasn't been done already
+	if (this.assigned_data.value && !this.applied_value_counter) {
 		this.applyValue(this.assigned_data.value);
 	}
 });

package/element/query_builder_value.js

@@ -5,7 +5,7 @@
  * @since    0.1.6
  * @version  0.1.6
  */
-const QueryBuilderValue = Function.inherits('Alchemy.Element.Form.QueryBuilderBase', 'QueryBuilderValue');
+const QueryBuilderValue = Function.inherits('Alchemy.Element.Form.QueryBuilderData', 'QueryBuilderValue');
 
 /**
  * The template to use for the content of this element
@@ -124,125 +124,6 @@ QueryBuilderValue.setProperty(function value() {
 	this.assigned_data.value = value;
 });
 
-/**
- * Check a filter
- *
- * @author   Jelle De Loecker <jelle@elevenways.be>
- * @since    0.1.6
- * @version  0.1.6
- */
-QueryBuilderValue.setMethod(function checkFilterType(filter_type, entry) {
-
-	if (!entry) {
-		return false;
-	}
-
-	let whitelist = this[filter_type];
-
-	if (!whitelist) {
-		return true;
-	}
-
-	let type = entry.type_name || entry.type || entry.id || entry.name;
-
-	if (!type) {
-		return false;
-	}
-
-	let entries = whitelist.split(',');
-
-	return entries.indexOf(type) > -1;
-});
-
-/**
- * Load data for a specific element
- *
- * @author   Jelle De Loecker <jelle@elevenways.be>
- * @since    0.1.6
- * @version  0.1.6
- */
-QueryBuilderValue.setMethod(async function loadData(config, element) {
-
-	if (!element) {
-		return;
-	}
-
-	if (!config) {
-		config = {};
-	}
-
-	let filter_type,
-	    result = [],
-	    items;
-
-	if (element.classList.contains('qb-source-type')) {
-		items = await this.loadSourceTypeData(config);
-		filter_type = 'source-types';
-	} else if (element.classList.contains('qb-value-variable')) {
-		items = await this.loadVariableData(config);
-		filter_type = 'variable-types';
-	}
-
-	if (items && items.length) {
-
-		let entry;
-
-		for (entry of items) {
-			if (!entry) {
-				continue;
-			}
-
-			if (filter_type && !this.checkFilterType(filter_type, entry)) {
-				continue;
-			}
-
-			result.push(entry);
-		}
-	}
-
-	return {
-		items: result,
-	};
-});
-
-/**
- * Load variable data
- *
- * @author   Jelle De Loecker <jelle@elevenways.be>
- * @since    0.1.6
- * @version  0.1.6
- */
-QueryBuilderValue.setMethod(async function loadVariableData(config) {
-
-	let dataprovider = this.dataprovider;
-
-	if (!config) {
-		config = {};
-	}
-
-	config.source_type = 'variable';
-
-	let variables = [];
-
-	if (dataprovider) {
-		variables = await dataprovider.loadData(config, this);
-	}
-
-	let result = [];
-
-	if (variables && variables.length) {
-		let entry;
-
-		for (entry of variables) {
-			if (entry) {
-				result.push(entry);
-			}
-		}
-	}
-
-	return result;
-});
-
 /**
  * Load value type data
  *