alchemy-form 0.1.10 → 0.1.12

package/element/alchemy_table.js

@@ -25,7 +25,7 @@ Table.setTemplate(`<header class="aft-header"></header>
 		<tfoot></tfoot>
 	</table>
 </div>
-<footer class="aft-footer"></footer>`, {plain_html: true, render_immediate: true});
+<footer data-he-slot="footer" class="aft-footer"></footer>`, {plain_html: true, render_immediate: true});
 
 /**
  * The stylesheet to load for this element
@@ -126,6 +126,15 @@ Table.setAttribute('page-size', {number: true});
  */
 Table.setAttribute('show-filters', {boolean: true});
 
+/**
+ * Which optional view-type to use for field values
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.1.11
+ * @version  0.1.11
+ */
+Table.setAttribute('view-type');
+
 /**
  * Keep track of the loadRemote calls
  *
@@ -287,7 +296,7 @@ Table.addObservedAttribute('src', function onSource(src) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.11
  *
  * @param    {*}   config
  */
@@ -302,7 +311,11 @@ Table.setMethod(function setRecordsource(config) {
 	}
 
 	if (url == '#') {
-		url = ''+this.getCurrentUrl();
+		let current_url = this.getCurrentUrl();
+
+		if (current_url) {
+			url = ''+current_url;
+		}
 	}
 
 	this.src = url;
@@ -350,7 +363,7 @@ Table.setMethod(function clearBody() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.11
  *
  * @return   {Number}
  */
@@ -365,14 +378,17 @@ Table.setMethod(function getWantedPage() {
 	if (this.id) {
 		let url = this.getCurrentUrl();
 
-		let data = url.param('aft');
+		if (url) {
 
-		if (data && data[this.id]) {
-			page = parseInt(data[this.id].page);
-		}
+			let data = url.param('aft');
+
+			if (data && data[this.id]) {
+				page = parseInt(data[this.id].page);
+			}
 
-		if (isFinite(page) && page > 0) {
-			return page;
+			if (isFinite(page) && page > 0) {
+				return page;
+			}
 		}
 	}
 
@@ -384,7 +400,7 @@ Table.setMethod(function getWantedPage() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.11
  *
  * @return   {Number}
  */
@@ -405,11 +421,11 @@ Table.setMethod(function getWantedSort() {
 	let url_param = this.getBaseUrlParam() + '[sort]',
 	    url = this.getCurrentUrl();
 
-	if (!result.field) {
+	if (!result.field && url) {
 		result.field = url.param(url_param + '[field]');
 	}
 
-	if (!result.dir) {
+	if (!result.dir && url) {
 		result.dir = url.param(url_param + '[dir]');
 	}
 
@@ -424,7 +440,7 @@ Table.setMethod(function getWantedSort() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.11
  *
  * @return   {Object}
  */
@@ -433,6 +449,11 @@ Table.setMethod(function getWantedFilters() {
 	if (!this.filters) {
 
 		let url = this.getCurrentUrl();
+
+		if (!url) {
+			return null;
+		}
+
 		let data = url.param('aft');
 		let filters;
 
@@ -486,15 +507,20 @@ Table.setMethod(function getBaseUrlParam() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.11
  *
  * @return   {RURL}
  */
 Table.setMethod(function getCurrentStateUrl() {
 
+	let url = this.getCurrentUrl();
+
+	if (!url) {
+		return null;
+	}
+
 	let url_param = this.getBaseUrlParam(),
-	    page = this.getWantedPage(),
-	    url = this.getCurrentUrl();
+	    page = this.getWantedPage();
 
 	url.param(url_param + '[page]', page);
 
@@ -513,7 +539,7 @@ Table.setMethod(function getCurrentStateUrl() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.6
+ * @version  0.1.11
  *
  * @param    {Array}   records
  */
@@ -526,7 +552,7 @@ Table.setMethod(function setRecords(records) {
 	let record;
 
 	for (record of records) {
-		this.table_body.append(this.createDataRow(record));
+		this.addDataRow(record);
 	}
 
 	this.showPagination();
@@ -565,7 +591,7 @@ Table.setMethod(function setFilter(field, value) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.11
  */
 Table.setMethod(function showPagination() {
 
@@ -575,6 +601,12 @@ Table.setMethod(function showPagination() {
 		return;
 	}
 
+	let url = this.getCurrentUrl();
+
+	if (!url) {
+		return;
+	}
+
 	let pager = this.querySelector('alchemy-pager');
 
 	if (!pager) {
@@ -582,7 +614,7 @@ Table.setMethod(function showPagination() {
 		this.footer.append(pager);
 	}
 
-	pager.src = this.getCurrentUrl();
+	pager.src = url;
 	pager.url_param = this.getBaseUrlParam();
 	pager.page_size = records.page_size;
 
@@ -594,7 +626,7 @@ Table.setMethod(function showPagination() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.8
- * @version  0.1.10
+ * @version  0.1.12
  *
  * @param    {FieldConfig}   field_config   The config on how to display the field
  * @param    {Object}        container      The container where the field should be in
@@ -603,6 +635,10 @@ Table.setMethod(function showPagination() {
  */
 Table.setMethod(function getFieldConfigView(field_config, container) {
 
+	if (typeof field_config == 'string') {
+		field_config = this.fieldset.get(field_config);
+	}
+
 	let value = field_config.getValueIn(container),
 	    field;
 	
@@ -624,7 +660,12 @@ Table.setMethod(function getFieldConfigView(field_config, container) {
 	}
 
 	let alchemy_field = this.createElement('alchemy-field');
-	alchemy_field.view_type = 'view_inline';
+	alchemy_field.purpose = this.purpose || 'view';
+	alchemy_field.mode = this.mode || 'inline';
+
+	alchemy_field.applyOptions(field_config.options);
+
+	//alchemy_field.view_type = this.view_type || 'view_inline';
 	alchemy_field.field_name = field.name;
 	alchemy_field.config = field;
 	alchemy_field.original_value = value;
@@ -632,6 +673,34 @@ Table.setMethod(function getFieldConfigView(field_config, container) {
 	return alchemy_field;
 });
 
+/**
+ * Create and add a datarow
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.1.11
+ * @version  0.1.11
+ *
+ * @param    {Object}   entry
+ *
+ * @return   <TR>
+ */
+Table.setMethod(function addDataRow(entry) {
+
+	if (!entry) {
+		entry = {};
+	}
+
+	let tr = this.createDataRow(entry);
+
+	if (!tr) {
+		return;
+	}
+
+	this.table_body.append(tr);
+
+	return tr;
+});
+
 /**
  * Create a datarow
  *
@@ -645,13 +714,19 @@ Table.setMethod(function getFieldConfigView(field_config, container) {
  */
 Table.setMethod(function createDataRow(entry) {
 
+	if (!entry) {
+		throw new Error('Unable to create datarow without data');
+	}
+
 	let field_set_config,
 	    value,
 	    tr = this.createElement('tr'),
 	    td,
 		id = entry.$pk || entry._id || entry.id;
 	
-	tr.dataset.pk = id;
+	if (id) {
+		tr.dataset.pk = id;
+	}
 
 	for (field_set_config of this.fieldset) {
 		td = this.createElement('td');
@@ -813,7 +888,7 @@ Table.setMethod(function attachContextMenus() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.12
  */
 Table.setMethod(function onFieldsetAssignment(value, old_value) {
 
@@ -866,18 +941,22 @@ Table.setMethod(function onFieldsetAssignment(value, old_value) {
 		names_row.append(col);
 
 		col = this.createElement('th');
-		input = this.createElement('input');
-		input.dataset.field = field.path;
-		input.classList.add('filter');
-		input.setAttribute('type', 'search');
-		input.setAttribute('aria-label', 'Filter ' + field.title);
-
-		// If filters have been defined already, put it in the value
-		if (this.filters && this.filters[field.path]) {
-			input.setAttribute('value', this.filters[field.path]);
+
+		if (field.options.filter !== false) {
+			input = this.createElement('input');
+			input.dataset.field = field.path;
+			input.classList.add('filter');
+			input.setAttribute('type', 'search');
+			input.setAttribute('aria-label', 'Filter ' + field.title);
+
+			// If filters have been defined already, put it in the value
+			if (this.filters && this.filters[field.path]) {
+				input.setAttribute('value', this.filters[field.path]);
+			}
+
+			col.append(input);
 		}
 
-		col.append(input);
 		filter_row.append(col);
 	}
 
@@ -899,7 +978,7 @@ Table.setMethod(function onFieldsetAssignment(value, old_value) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.11
  *
  * @param    {String|RURL}   base_url
  */
@@ -911,6 +990,10 @@ Table.setMethod(function updateAnchors(base_url) {
 		base_url = RURL.parse(base_url);
 	}
 
+	if (!base_url) {
+		return;
+	}
+
 	let anchors = this.querySelectorAll('a.sorting-anchor'),
 	    anchor,
 	    url,
@@ -969,7 +1052,7 @@ Table.setMethod(function onRecordsAssignment(value, old_value) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.11
  *
  * @param    <TR>
  */
@@ -985,7 +1068,9 @@ Table.setMethod(function selectRow(row) {
 		child.classList.remove('aft-selected');
 	}
 
-	row.classList.add('aft-selected');
+	if (row) {
+		row.classList.add('aft-selected');
+	}
 });
 
 /**

package/element/query_builder_entry.js

@@ -127,7 +127,7 @@ QueryBuilderEntry.setProperty(function value() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.6
- * @version  0.1.6
+ * @version  0.1.12
  */
 QueryBuilderEntry.setMethod(async function loadData(config, element) {
 
@@ -149,10 +149,11 @@ QueryBuilderEntry.setMethod(async function loadData(config, element) {
 		items = await this.loadValueTypeData(config);
 	}
 
-	console.log('Got items:', items);
-	items.clean(null);
-	items.clean(undefined);
-	items.clean(false);
+	if (items) {
+		items.clean(null);
+		items.clean(undefined);
+		items.clean(false);
+	}
 
 	return {
 		items: items,

package/element/query_builder_value.js

@@ -121,7 +121,7 @@ QueryBuilderValue.setProperty(function value() {
 
 	return result;
 }, function setValue(value) {
-	this.assigned_data.value = value;
+	this.assignData('value', value);
 });
 
 /**

package/helper/form_actions/url_action.js

@@ -23,7 +23,7 @@ UrlAction.addConfigProperty('url');
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.6
- * @version  0.1.6
+ * @version  0.1.11
  *
  * @return   {HTMLElement}
  */
@@ -35,7 +35,7 @@ UrlAction.setMethod(function _constructElement(renderer) {
 
 	if (this.icon) {
 		let alico = renderer.createElement('al-ico');
-		alico.setAttribute('type', this.icon);
+		alico.setIcon(this.icon);
 		anchor.append(alico);
 	} else {
 		anchor.textContent = this.title || this.name;

package/helper/query_builder_ns.js

@@ -0,0 +1,108 @@
+const QueryBuilder = Fn.getNamespace('Alchemy.QueryBuilder');
+
+/**
+ * Apply query builder settings to a criteria
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.1.12
+ * @version  0.1.12
+ *
+ * @param    {Object}     conditions
+ * @param    {Criteria}   criteria
+ * @param    {Boolean}    inverted
+ */
+QueryBuilder.applyToCriteria = function applyToCriteria(conditions, criteria, inverted) {
+
+	if (!conditions || !conditions.rules?.length) {
+		return;
+	}
+
+	let group;
+
+	if (conditions.condition == 'or') {
+		group = criteria.or();
+	} else {
+		group = criteria.and();
+	}
+
+	if (inverted == null) {
+		inverted = false;
+	}
+
+	if (conditions.inverted) {
+		inverted = !inverted;
+	}
+
+	for (let rule of conditions.rules) {
+		applyRule(rule, criteria, inverted);
+	}
+};
+
+/**
+ * Apply a single rule to a criteria
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.1.12
+ * @version  0.1.12
+ *
+ * @param    {Object}     rule
+ * @param    {Criteria}   criteria
+ * @param    {Boolean}    inverted
+ */
+function applyRule(rule, criteria, inverted) {
+
+	if (rule.type == 'group') {
+		return QueryBuilder.applyToCriteria(rule, criteria, inverted);
+	}
+
+	if (rule.type != 'qb_entry') {
+		return;
+	}
+
+	// Referencing other fields is not supported
+	if (rule.value_variable) {
+		return;
+	}
+
+	let context = criteria.where(rule.field);
+
+	if (inverted) {
+		context = context.not();
+	}
+
+	if (rule.operator == 'is_empty') {
+		context.isEmpty();
+		return;
+	}
+
+	if (rule.operator == 'is_null') {
+		context.isNull();
+		return;
+	}
+
+	let value = rule.value_explicit.value;
+
+	let method;
+
+	switch (rule.operator) {
+		case 'ne':
+		case 'not_equals':
+			method = 'ne';
+			break;
+		
+		case 'starts_with':
+			value = RegExp.interpret('^' + value);
+			method = 'equals';
+			break;
+		
+		case 'ends_with':
+			value = RegExp.interpret(value + '$');
+			method = 'equals';
+			break;
+		
+		default:
+			method = rule.operator;
+	}
+
+	context[method](value);
+}

package/helper/query_builder_variable_definition/00_variable_definition.js

@@ -102,12 +102,48 @@ VariableDefinition.constitute(function prepareOperators() {
 	this.assignment_operators = {};
 });
 
+/**
+ * Get a list of definitions from the input
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.1.12
+ * @version  0.1.12
+ *
+ * @param    {*}   input
+ *
+ * @return   {VariableDefinition[]}
+ */
+VariableDefinition.setStatic(function fromMany(input) {
+
+	let result = [];
+
+	if (input) {
+
+		let schema = input.schema;
+
+		if (schema && schema instanceof Classes.Alchemy.Schema) {
+
+			for (let entry of schema) {
+
+				let instance = VariableDefinition.cast(entry);
+		
+				if (instance) {
+					result.push(instance);
+				}
+			}
+
+		}
+	}
+
+	return result;
+});
+
 /**
  * Create the correct variable definition
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.6
- * @version  0.1.6
+ * @version  0.1.12
  */
 VariableDefinition.setStatic(function cast(entry) {
 
@@ -119,6 +155,21 @@ VariableDefinition.setStatic(function cast(entry) {
 		return entry;
 	}
 
+	if (entry instanceof Classes.Alchemy.Field) {
+		let field = entry;
+
+		entry = {
+			name        : field.name,
+			title       : field.title,
+			description : field.options.description,
+			type        : field.constructor.type_name,
+		};
+
+		if (!VariableDefinition.getMember(entry.type)) {
+			entry.type = 'string';
+		}
+	}
+
 	if (!entry.type) {
 		return null;
 	}

package/helper/widgets/alchemy_field_widget.js

@@ -16,16 +16,13 @@ const AlchemyField = Function.inherits('Alchemy.Widget', 'AlchemyField');
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.12
  */
 AlchemyField.constitute(function prepareSchema() {
 
-	//let widgets = this.createSchema();
-
-	// widgets.addField('type', 'Enum', {values: alchemy.getClassGroup('widgets')});
-	// widgets.addField('config', 'Schema', {schema: 'type'});
-
-	// this.schema.addField('widgets', widgets, {array: true});
+	this.setAddChecker(function(widget_element) {
+		return false;
+	});
 });
 
 /**
@@ -73,7 +70,7 @@ AlchemyField.enforceProperty(function alchemy_form(new_value) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.9
+ * @version  0.1.12
  */
 AlchemyField.setMethod(function populateWidget() {
 
@@ -89,21 +86,7 @@ AlchemyField.setMethod(function populateWidget() {
 
 	field_el.field_name = config.field;
 
-	if (config.view) {
-		field_el.field_view = config.view;
-	}
-
-	if (config.readonly) {
-		field_el.readonly = true;
-	}
-
-	if (config.widget_settings) {
-		field_el.widget_settings = config.widget_settings;
-	}
-
-	if (config.data_src) {
-		field_el.data_src = config.data_src;
-	}
+	field_el.applyOptions(config);
 
 	this.element.append(field_el);
 });

package/helper/widgets/alchemy_form_widget.js

@@ -11,12 +11,26 @@
  */
 const AlchemyForm = Function.inherits('Alchemy.Widget', 'AlchemyForm');
 
+/**
+ * Prepare the schema
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.1.12
+ * @version  0.1.12
+ */
+AlchemyForm.constitute(function prepareSchema() {
+
+	this.setAddChecker(function(widget_element) {
+		return false;
+	});
+});
+
 /**
  * Populate the widget
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.4
+ * @version  0.1.11
  */
 AlchemyForm.setMethod(function populateWidget() {
 
@@ -30,6 +44,14 @@ AlchemyForm.setMethod(function populateWidget() {
 
 	form.classList.add('alchemy-widgets-container');
 
+	if (config.purpose) {
+		form.purpose = config.purpose;
+	}
+
+	if (config.mode) {
+		form.mode = config.mode;
+	}
+
 	if (this.config && this.config.widgets) {
 		let widgets = this.config.widgets.slice(0),
 		    widget,
@@ -59,7 +81,9 @@ AlchemyForm.setMethod(function populateWidget() {
 		form.model = config.model;
 	}
 
-	form.view_type = config.view_type || 'edit';
+	if (config.view_type) {
+		form.view_type = config.view_type;
+	}
 
 	form.append(col.widget);