alchemy-form 0.1.11 → 0.2.0

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/query_builder_variable_definition/boolean_variable_definition.js

@@ -19,6 +19,6 @@ const BooleanDefinition = Function.inherits('Alchemy.QueryBuilder.VariableDefini
  * @param    {Hawkejs.Renderer}
  */
 BooleanDefinition.setMethod(function createValueInput(renderer) {
-	let toggle = renderer.createElement('alchemy-toggle');
+	let toggle = renderer.createElement('al-toggle');
 	return toggle;
 });

package/helper_field/query_builder_field.js

@@ -50,42 +50,63 @@ QueryBuilderField.setMethod(function cast(value, to_datasource) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.6
- * @version  0.1.6
+ * @version  0.2.0
  *
  * @param    {Object}        config
  * @param    {HTMLElement}   element
  */
 QueryBuilderField.setMethod(function loadData(config, element) {
 
+	const options = this.options || {},
+	      source_type = options.variable_data || 'document',
+	      add_form_value = options.add_form_value || false;
+
+	let api_route,
+	    form;
+
+	let body = {
+		source_type,
+		config,
+	};
+
 	if (element) {
-		let form = element.queryParents('alchemy-form');
-
-		if (form) {
-			let doc = form.document;
-
-			if (doc && doc.root_document) {
-				doc = doc.root_document;
-			}
-
-			let model_name,
-			    $pk;
-			
-			if (doc) {
-				model_name = doc.$model_name;
-				$pk = doc.$pk;
-			}
-
-			return element.hawkejs_helpers.Alchemy.getResource({
-				name  : 'FormApi#queryBuilderData',
-				post  : true,
-				body  : {
-					model        : model_name,
-					$pk          : $pk,
-					config       : config,
-				}
-			});
+		form = element.queryParents('al-form');
+
+		if (add_form_value && form) {
+			body.form_value = form.value;
 		}
 	}
 
-	return [];
+	// Use the current document data to get the variable data
+	if (form && source_type == 'document') {
+
+		let doc = form.document;
+
+		if (doc && doc.root_document) {
+			doc = doc.root_document;
+		}
+
+		let model_name,
+			$pk;
+		
+		if (doc) {
+			model_name = doc.$model_name;
+			$pk = doc.$pk;
+		}
+
+		body.model = model_name;
+		body.$pk = $pk;
+	}
+
+	if (options.route) {
+		api_route = options.route;
+	} else {
+		api_route = 'FormApi#queryBuilderData';
+	}
+
+	return element.hawkejs_helpers.Alchemy.getResource({
+		name  : api_route,
+		post  : true,
+		body,
+	});
 });

package/helper_field/query_builder_value.js

@@ -9,48 +9,3 @@
  * @version  0.1.6
  */
 const QueryBuilderValue = Function.inherits('Alchemy.Field.QueryBuilder', 'QueryBuilderValue');
-
-/**
- * Load remote data
- *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
- * @since    0.1.6
- * @version  0.1.6
- *
- * @param    {Object}        config
- * @param    {HTMLElement}   element
- */
-QueryBuilderValue.setMethod(function loadData(config, element) {
-
-	if (element) {
-		let form = element.queryParents('alchemy-form');
-
-		if (form) {
-			let doc = form.document;
-
-			if (doc && doc.root_document) {
-				doc = doc.root_document;
-			}
-
-			let model_name,
-			    $pk;
-			
-			if (doc) {
-				model_name = doc.$model_name;
-				$pk = doc.$pk;
-			}
-
-			return element.hawkejs_helpers.Alchemy.getResource({
-				name  : 'FormApi#queryBuilderData',
-				post  : true,
-				body  : {
-					model        : model_name,
-					$pk          : $pk,
-					config       : config,
-				}
-			});
-		}
-	}
-
-	return [];
-});

package/helper_field/query_builder_variable.js

@@ -9,48 +9,3 @@
  * @version  0.1.6
  */
 const QueryBuilderVariable = Function.inherits('Alchemy.Field.QueryBuilder', 'QueryBuilderVariable');
-
-/**
- * Load remote data
- *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
- * @since    0.1.6
- * @version  0.1.6
- *
- * @param    {Object}        config
- * @param    {HTMLElement}   element
- */
-QueryBuilderVariable.setMethod(function loadData(config, element) {
-
-	if (element) {
-		let form = element.queryParents('alchemy-form');
-
-		if (form) {
-			let doc = form.document;
-
-			if (doc && doc.root_document) {
-				doc = doc.root_document;
-			}
-
-			let model_name,
-				$pk;
-			
-			if (doc) {
-				model_name = doc.$model_name;
-				$pk = doc.$pk;
-			}
-
-			return element.hawkejs_helpers.Alchemy.getResource({
-				name  : 'FormApi#queryBuilderData',
-				post  : true,
-				body  : {
-					model        : model_name,
-					$pk          : $pk,
-					config       : config,
-				}
-			});
-		}
-	}
-
-	return [];
-});

package/package.json

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

package/view/form/elements/alchemy_button.hwk

@@ -0,0 +1 @@
+<div class="apb-content"><% Hawkejs.replaceChildren($0, child_nodes) %></div>

package/view/form/elements/alchemy_field.hwk

@@ -15,15 +15,15 @@ variables = {
 
 <% if (wrapper_files) start('field') %>
 	<% if (self.is_translatable) { %>
-		<alchemy-field-translatable
+		<al-field-translatable
 			#field_context=<% self %>
 			#alchemy_field=<% self %>
-		></alchemy-field-translatable>
+		></al-field-translatable>
 	<% } else if (self.is_array) { %>
-		<alchemy-field-array
+		<al-field-array
 			#field_context=<% self %>
 			#alchemy_field=<% self %>
-		></alchemy-field-array>
+		></al-field-array>
 	<% } else if (view_files && view_files.length) { %>
 		<div class="field">
 			<% include(view_files, variables); %>

package/view/form/elements/alchemy_field_array.hwk

@@ -9,14 +9,14 @@
 <div class="entries">
 	{% with values as value %}
 	{% each %}
-		<alchemy-field-array-entry
+		<al-field-array-entry
 			#alchemy_field_array=<% self %>
 			#field_context=<% self %>
 			#alchemy_field=<% alchemy_field %>
 
 			#value=<% value %>
 			index=<% $index %>
-		></alchemy-field-array-entry>
+		></al-field-array-entry>
 	{% /each %}
 	{% /with %}
 </div>

package/view/form/elements/alchemy_field_schema.hwk

@@ -1,7 +1,7 @@
 {% each self.sub_fields as sub_field %}
-	<alchemy-field
+	<al-field
 		#alchemy_field_schema=<% self %>
 		#schema=<% self.schema %>
 		field-name=<% sub_field.name %>
-	></alchemy-field>
+	></al-field>
 {% /each %}

package/view/form/elements/alchemy_field_translatable.hwk

@@ -21,14 +21,14 @@
 	<% index = 0 %>
 	<% for (prefix in prefixes) { %>
 
-		<alchemy-field-translatable-entry
+		<al-field-translatable-entry
 			#alchemy_field_translatable=<% self %>
 			#field_context=<% self %>
 			#alchemy_field=<% alchemy_field %>
 
 			#value=<% values[prefix] %>
 			prefix=<% prefix %>
-		><% if (index > 0) $0.hidden = true; %></alchemy-field-translatable-entry>
+		><% if (index > 0) $0.hidden = true; %></al-field-translatable-entry>
 
 		<% index++ %>
 	<% } %>

package/view/form/elements/alchemy_field_translatable_entry.hwk

@@ -9,10 +9,10 @@
 
 <div class="field">
 	<% if (alchemy_field.is_array) { %>
-		<alchemy-field-array
+		<al-field-array
 			#field_context=<% self %>
 			#alchemy_field=<% alchemy_field %>
-		></alchemy-field-array>
+		></al-field-array>
 	<% } else { %>
 		<% include(view_files, variables) %>
 	<% } %>

package/view/form/elements/alchemy_select_item.hwk

@@ -1,7 +1,5 @@
-<% data = self.data %>
-
 {% if self.custom_template %}
 	{% include self.custom_template %}
 {% else %}
-	{{ data.title or data.name or data.$pk or self.value }}
+	{{ self.display_title }}
 {% /if %}

package/view/form/elements/query_builder.hwk

@@ -1 +1 @@
-<alchemy-query-builder-group></alchemy-query-builder-group>
+<al-query-builder-group></al-query-builder-group>

package/view/form/elements/query_builder_entry.hwk

@@ -1,26 +1,26 @@
 <div class="qb-field-wrapper">
-	<alchemy-select
+	<al-select
 		class="qb-field"
 		#dataprovider={% self %}
 		value-item-template="form/select/qb_item"
 		option-item-template="form/select/qb_item"
-	></alchemy-select>
+	></al-select>
 </div>
 <div class="qb-operator-wrapper">
-	<alchemy-select
+	<al-select
 		class="qb-operator"
 		#dataprovider={% self %}
 		value-item-template="form/select/qb_item"
 		option-item-template="form/select/qb_item"
-	></alchemy-select>
+	></al-select>
 </div>
 <div class="qb-value-wrapper">
-	<alchemy-select
+	<al-select
 		class="qb-value-type"
 		#dataprovider={% self %}
 		value-item-template="form/select/qb_item"
 		option-item-template="form/select/qb_item"
-	></alchemy-select>
+	></al-select>
 
 	<div class="qb-value-input-wrapper">
 

package/view/form/elements/query_builder_value.hwk

@@ -1,9 +1,9 @@
-<alchemy-select
+<al-select
 	class="qb-source-type"
 	#dataprovider={% self %}
 	value-item-template="form/select/qb_item"
 	option-item-template="form/select/qb_item"
-></alchemy-select>
+></al-select>
 
 <div class="qb-value-input-wrapper">
 

package/view/form/elements/query_builder_variable.hwk

@@ -1,6 +1,6 @@
-<alchemy-select
+<al-select
 	class="qb-variable"
 	#dataprovider={% self %}
 	value-item-template="form/select/qb_item"
 	option-item-template="form/select/qb_item"
-></alchemy-select>
+></al-select>

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

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

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

@@ -1,4 +1,4 @@
-<alchemy-toggle
+<al-toggle
 	class="alchemy-field-value"
 	#value=<% value %>
-></alchemy-toggle>
+></al-toggle>

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

@@ -1,7 +1,7 @@
-<alchemy-select
+<al-select
 	class="alchemy-field-value"
 ><%
 $0.values = vars.alchemy_field.config.options.values;
 $0.value = value;
 $0.name = path;
-%></alchemy-select>
+%></al-select>

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

@@ -1,8 +1,8 @@
-<alchemy-select
+<al-select
 	class="alchemy-field-value"
 	multiple
 ><%
 $0.dataprovider = alchemy_field;
 $0.value = value;
 $0.name = path;
-%></alchemy-select>
+%></al-select>

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

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

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

@@ -1,5 +1,5 @@
-<alchemy-query-builder
+<al-query-builder
 	class="alchemy-field-value"
 	#value={% value %}
 	#dataprovider={% alchemy_field %}
-></alchemy-query-builder>
+></al-query-builder>

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

@@ -1,6 +1,6 @@
-<alchemy-query-builder-entry
+<al-query-builder-entry
 	class="alchemy-field-value"
 	type="assignment"
 	#value={% value %}
 	#dataprovider={% alchemy_field %}
-></alchemy-query-builder-entry>
+></al-query-builder-entry>

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

@@ -2,10 +2,10 @@
 options = alchemy_field.config.options || {};
 %>
 
-<alchemy-query-builder-value
+<al-query-builder-value
 	class="alchemy-field-value"
 	#value={% value %}
 	#dataprovider={% alchemy_field %}
 	variable-types={% options.variable_types %}
 	source-types={% options.source_types %}
-></alchemy-query-builder-value>
+></al-query-builder-value>

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

@@ -2,9 +2,9 @@
 options = alchemy_field.config.options || {};
 %>
 
-<alchemy-query-builder-variable
+<al-query-builder-variable
 	class="alchemy-field-value"
 	#value={% value %}
 	#dataprovider={% alchemy_field %}
 	variable-types={% options.variable_types %}
-></alchemy-query-builder-variable>
+></al-query-builder-variable>

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

@@ -1,4 +1,4 @@
-<alchemy-field-schema
+<al-field-schema
 	#alchemy_field=<% alchemy_field %>
 	#field_context=<% field_context %>
-></alchemy-field-schema>
+></al-field-schema>

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

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

package/view/form/inputs/edit_inline/boolean.hwk

@@ -1,4 +1,4 @@
-<alchemy-toggle
+<al-toggle
 	class="alchemy-field-value"
 	#value=<% value %>
-></alchemy-toggle>
+></al-toggle>