alchemy-form 0.1.3 → 0.1.6

package/element/alchemy_field_schema.js

@@ -23,7 +23,7 @@ FieldSchema.setTemplateFile('form/elements/alchemy_field_schema');
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.3
+ * @version  0.1.4
  */
 FieldSchema.setProperty(function schema() {
 
@@ -34,13 +34,16 @@ FieldSchema.setProperty(function schema() {
 			let other_field = this.getSchemaSupplierField();
 			schema = null;
 
-			console.log('Other field:', other_field, 'of', this)
-
 			if (other_field && other_field.value && other_field.config && other_field.config.options) {
 				let values = other_field.config.options.values;
 
 				if (values) {
-					schema = values[other_field.value];
+
+					if (values instanceof Classes.Alchemy.Map.Backed) {
+						schema = values.get(other_field.value);
+					} else {
+						schema = values[other_field.value];
+					}
 
 					if (schema && schema.schema) {
 						schema = schema.schema;
@@ -113,14 +116,11 @@ FieldSchema.setProperty(function value() {
 FieldSchema.setMethod(function getSchemaSupplierField() {
 
 	if (!this.alchemy_field || !this.alchemy_field.config || !this.alchemy_field.config.options) {
-		console.log('--no config found?')
 		return;
 	}
 
 	let schema = this.alchemy_field.config.options.schema;
 
-	console.log('Schema is...', schema);
-
 	if (typeof schema == 'string') {
 		let other_field_path = this.resolvePath(schema);
 
@@ -128,10 +128,7 @@ FieldSchema.setMethod(function getSchemaSupplierField() {
 	
 		let form = this.alchemy_field.alchemy_form;
 
-		console.log(' -- Got form:', form);
-
 		if (form) {
-			console.log(' -- Looking for path:', other_field_path)
 			return form.findFieldByPath(other_field_path);
 		}
 	}
@@ -155,4 +152,41 @@ FieldSchema.setMethod(function introduced() {
 
 		this.rerender();
 	}
-});
+});
+
+/**
+ * Get the original value
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.1.4
+ * @version  0.1.4
+ */
+FieldSchema.setProperty(function original_value() {
+
+	let field = this.alchemy_field,
+	    path = this.field_path_in_record;
+
+	if (field && path) {
+		let form = field.alchemy_form || this.alchemy_form || this.field_context.alchemy_form;
+
+		if (form) {
+			return Object.path(form.document, path);
+		}
+	}
+
+	let context = this.field_context.alchemy_field_schema,
+	    data;
+
+	if (context) {
+		data = context.original_value;
+	} else {
+		context = this.field_context.alchemy_form || this.alchemy_field.alchemy_form;
+		data = context.document;
+	}
+
+	path = this.field_path_in_current_schema;
+
+	let result = Object.path(data, path);
+
+	return result;
+});

package/element/alchemy_form.js

@@ -5,18 +5,7 @@
  * @since    0.1.0
  * @version  0.1.0
  */
-var Form = Function.inherits('Alchemy.Element.Form.Base', function Form() {
-	Form.super.call(this);
-});
-
-/**
- * The stylesheet to load for this element
- *
- * @author   Jelle De Loecker <jelle@develry.be>
- * @since    0.1.0
- * @version  0.1.0
- */
-Form.setStylesheetFile('form/form');
+var Form = Function.inherits('Alchemy.Element.Form.Base', 'Form');
 
 /**
  * The stylesheet to load for this element

package/element/alchemy_select.js

@@ -36,6 +36,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
  *
@@ -244,12 +264,16 @@ AlchemySelect.setProperty(function loaded_items() {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.4
  *
  * @type     {Number}
  */
 AlchemySelect.setProperty(function loaded_item_count() {
-	return Object.size(this.options.values);
+	if (this.options.values) {
+		return this.options.values.size;
+	} else {
+		return 0;
+	}
 });
 
 /**
@@ -766,7 +790,7 @@ AlchemySelect.setMethod(function _ensureValueData(value) {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.4
  */
 AlchemySelect.setMethod(function _processPreloadedValues() {
 
@@ -784,9 +808,14 @@ AlchemySelect.setMethod(function _processPreloadedValues() {
 	let item,
 	    key;
 
-	for (key in values) {
+	let enum_values = new Classes.Alchemy.Map.Enum(values),
+	    value;
+
+	for (let key of enum_values.keys()) {
+		value = enum_values.get(key);
+
 		response.available++;
-		item = Object.assign({}, values[key]);
+		item = Object.assign({}, value);
 		item.id = key;
 
 		response.items.push(item);
@@ -800,12 +829,16 @@ AlchemySelect.setMethod(function _processPreloadedValues() {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.6
  *
  * @param    {Object}   response
  */
 AlchemySelect.setMethod(function _processResponseData(response) {
 
+	if (!response) {
+		response = {};
+	}
+
 	if (response.available) {
 		this.total_item_count = response.available;
 	}
@@ -814,6 +847,10 @@ AlchemySelect.setMethod(function _processResponseData(response) {
 	    record,
 	    item;
 
+	if (!records) {
+		records = [];
+	}
+
 	for (record of records) {
 		item = this._makeOption(record._id || record.id, record);
 		this.addToDropdown(item);
@@ -915,7 +952,7 @@ AlchemySelect.setMethod(function _loadRemote(config) {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.4
  */
 AlchemySelect.setMethod(function recreateDropdownElements() {
 
@@ -925,8 +962,8 @@ AlchemySelect.setMethod(function recreateDropdownElements() {
 
 	Hawkejs.removeChildren(this.dropdown_content);
 
-	for (key in items) {
-		item = items[key];
+	for (let key of items.keys()) {
+		item = items.get(key);
 		item = this._makeOption(item.id, item);
 		this.addToDropdown(item);
 	}
@@ -1157,7 +1194,7 @@ AlchemySelect.setMethod(function close(event) {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.6
  *
  * @param    {String}   type    "value" or "option"
  * @param    {Mixed}    value   The actual value of this item
@@ -1172,9 +1209,19 @@ 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;
 
+	// Add a reference to this element
+	item.alchemy_select = this;
+
 	if (!data) {
 		data = this.getValueData(value);
 	}
@@ -1188,7 +1235,11 @@ AlchemySelect.setMethod(function _makeValueItem(type, value, data) {
 			this.options.values = {};
 		}
 
-		this.options.values[value] = data;
+		if (this.options.values instanceof Classes.Alchemy.Map.Enum) {
+			this.options.values.set(value, data);
+		} else {
+			this.options.values[value] = data;
+		}
 	}
 
 	// And the associated data
@@ -1207,8 +1258,12 @@ AlchemySelect.setMethod(function _makeValueItem(type, value, data) {
 				return
 			}
 
-			if (that.options.values && that.options.values[value]) {
-				data = that.options.values[value];
+			if (that.options.values) {
+				if (that.options.values instanceof Classes.Alchemy.Map.Enum) {
+					data = that.options.values.get(value);
+				} else if (that.options.values[value]) {
+					data = that.options.values[value];
+				}
 			}
 
 			this.data = data;

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
  *
@@ -53,4 +62,36 @@ Item.setAssignedProperty('value');
  * @since    0.1.0
  * @version  0.1.0
  */
-Item.setAssignedProperty('data');
+Item.setAssignedProperty('data');
+
+/**
+ * The parent alchemy-select item
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.1.5
+ * @version  0.1.5
+ */
+Item.enforceProperty(function alchemy_select(new_value) {
+
+	if (new_value == null) {
+		new_value = this.closest('alchemy-select');
+	}
+
+	return new_value;
+});
+
+/**
+ * The display item
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.1.5
+ * @version  0.1.5
+ */
+Item.setProperty(function display_title() {
+
+	if (!this.data) {
+		return '';
+	}
+
+	return this.data.title || this.data.name || this.data.username || this.data.$pk || this.value;
+});

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();
 });
 
 /**
@@ -593,7 +594,7 @@ Table.setMethod(function showPagination() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.1
+ * @version  0.1.6
  *
  * @param    {Object}   entry
  *
@@ -604,7 +605,10 @@ Table.setMethod(function createDataRow(entry) {
 	let field,
 	    value,
 	    tr = this.createElement('tr'),
-	    td;
+	    td,
+		id = entry.$pk || entry._id || entry.id;
+	
+	tr.dataset.pk = id;
 
 	for (field of this.fieldset) {
 		td = this.createElement('td');
@@ -623,31 +627,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 +653,111 @@ 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.6
+ *
+ * @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) {
+			contintue;
+		}
+
+		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 => {
+
+			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 +1031,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,

package/element/query_builder.js

@@ -0,0 +1,90 @@
+/**
+ * The alchemy-toggle custom element
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.1.6
+ * @version  0.1.6
+ */
+const QueryBuilder = Function.inherits('Alchemy.Element.Form.Base', 'QueryBuilder');
+
+/**
+ * The template code
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.1.6
+ * @version  0.1.6
+ */
+QueryBuilder.setTemplate(`<alchemy-query-builder-group></alchemy-query-builder-group>`, {plain_html: true, render_immediate: true});
+
+/**
+ * The stylesheet to load for this element
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.1.6
+ * @version  0.1.6
+ */
+QueryBuilder.setStylesheetFile('form/query_builder');
+
+/**
+ * The dataprovider used to get the variables
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.1.6
+ * @version  0.1.6
+ */
+QueryBuilder.setAssignedProperty('dataprovider');
+
+/**
+ * Getter for the header element
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.1.6
+ * @version  0.1.6
+ */
+QueryBuilder.addElementGetter('root_group', ':scope > alchemy-query-builder-group');
+
+/**
+ * Get/set the value
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.1.6
+ * @version  0.1.6
+ */
+QueryBuilder.setProperty(function value() {
+	return this.root_group.value;
+}, function setValue(value) {
+	this.assigned_data.value = value;
+
+	if (Blast.isBrowser && this.has_rendered) {
+		this.applyValue(value);
+	}
+});
+
+/**
+ * Apply the given value
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.1.6
+ * @version  0.1.6
+ */
+QueryBuilder.setMethod(function applyValue(value) {
+
+	if (!value) {
+		return;
+	}
+
+	this.root_group.applyValue(value);
+});
+
+/**
+ * Added to the dom
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.1.6
+ * @version  0.1.6
+ */
+QueryBuilder.setMethod(function introduced() {
+	if (this.assigned_data.value) {
+		this.applyValue(this.assigned_data.value);
+	}
+});