alchemy-form 0.1.10 → 0.1.12

package/helper/widgets/alchemy_table_widget.js

@@ -11,12 +11,26 @@
  */
 const AlchemyTable = Function.inherits('Alchemy.Widget', 'AlchemyTable');
 
+/**
+ * Prepare the schema
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.1.12
+ * @version  0.1.12
+ */
+AlchemyTable.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.0
+ * @version  0.1.8
  */
 AlchemyTable.setMethod(function populateWidget() {
 
@@ -46,5 +60,8 @@ AlchemyTable.setMethod(function populateWidget() {
 		table.recordsource = config.recordsource;
 	}
 
+	table.purpose = config.purpose || 'view';
+	table.mode = config.mode || 'inline';
+
 	this.element.append(table);
 });

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.1.12
  *
  * @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('alchemy-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,13 +1,14 @@
 {
 	"name": "alchemy-form",
 	"description": "Form plugin for Alchemy",
-	"version": "0.1.10",
+	"version": "0.1.12",
 	"repository": {
 		"type" : "git",
 		"url"  : "https://github.com/11ways/alchemy-form.git"
 	},
 	"peerDependencies": {
-		"alchemymvc" : ">=1.2.0"
+		"alchemymvc"    : ">=1.2.0",
+		"alchemy-media" : "~0.6.3"
 	},
 	"license": "MIT",
 	"engines": {

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/inputs/edit_inline/boolean.hwk

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

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

@@ -0,0 +1,19 @@
+<span
+	class="alchemy-field-value boolean-wrapper"
+>
+	<%
+		new_class = '';
+
+		if (value) {
+			new_class = 'boolean-true';
+		} else if (value === false) {
+			new_class = 'boolean-false';
+		} else {
+			new_class = 'boolean-null';
+			value = 'empty';
+		}
+
+		$0.classList.add(new_class);
+	%>
+	{{ value }}
+</span>

package/view/form/inputs/view_inline/date.hwk

@@ -0,0 +1,4 @@
+<time
+	class="alchemy-field-value"
+	datetime={% value.toISOString() %}
+>{{ value.format('Y‑m‑d') }}</time>

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

@@ -0,0 +1 @@
+<span class="alchemy-field-value alchemy-field-enum">{{ value }}</span>

package/view/form/inputs/view_inline/objectid.hwk

@@ -0,0 +1 @@
+<code class="alchemy-field-value">{{ value }}</code>

package/view/form/select/qb_item.hwk

@@ -1,3 +1,4 @@
+<% data = self.data %>
 <div class="qb-select-item qb-select-type-{% self.type %}">
 	<div class="type-and-name">
 		<span class="option-type" data-type={% data.type_name %}></span>

package/view/form/wrappers/edit_inline/default.hwk

@@ -0,0 +1 @@
+<div class="wrapped-inline" data-he-name="field"></div>

package/view/form/wrappers/view_inline/default.hwk

@@ -1 +1 @@
-<div data-he-name="field"></div>
+<div class="wrapped-inline" data-he-name="field"></div>

package/view/form/inputs/view_inline/file.hwk

@@ -1,6 +0,0 @@
-{% if value %}
-	<img
-		!Media={% value %}
-		+media-route="Media::thumb"
-	>
-{% /if %}