alchemy-form 0.2.5 → 0.2.7

package/element/al_select.js

@@ -854,7 +854,7 @@ AlchemySelect.setMethod(function _processPreloadedValues() {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.1.0
- * @version  0.1.8
+ * @version  0.2.6
  *
  * @param    {Object}   response
  * @param    {Number}   page       The page, if it's via pagination
@@ -872,7 +872,11 @@ AlchemySelect.setMethod(function _processResponseData(response, page) {
 	let records = response.items || response.records;
 
 	if (!records) {
-		records = [];
+		if (Array.isArray(response)) {
+			records = response;
+		} else {
+			records = [];
+		}
 	}
 
 	this._processResponseList(records, page);

package/helper/pathway/leaf.js

@@ -0,0 +1,174 @@
+/**
+ * A Pathway tree
+ *
+ * @constructor
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.2.6
+ * @version  0.2.6
+ *
+ * @param    {Leaf}   parent   Optional parent leaf
+ */
+const Leaf = Function.inherits('Alchemy.Base', 'Alchemy.Form.Pathway', function Leaf(id, parent) {
+
+	// The id of this leaf
+	this.id = id;
+
+	// The parent leaf
+	this.parent = parent;
+
+	// The children
+	this.children = [];
+
+	// The data provider
+	this._provider = null;
+});
+
+/**
+ * Undry
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.2.6
+ * @version  0.2.6
+ *
+ * @param    {Object}           obj
+ * @param    {Boolean|String}   cloned
+ *
+ * @return   {Leaf}
+ */
+Leaf.setStatic(function unDry(obj) {
+
+	let result = new this(obj.id);
+
+	if (obj.children) {
+		for (let child of obj.children) {
+			child.parent = result;
+		}
+
+		result.children = obj.children;
+	}
+
+	result._provider = obj.provider;
+
+	return result;
+});
+
+/**
+ * Get the displaytitle of this leaf
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.2.6
+ * @version  0.2.6
+ *
+ * @return   {Microcopy}
+ */
+Leaf.setMethod(function getDisplayTitle() {
+
+	let key = 'pathway-leaf-title',
+	    params = {leaf_id: this.id};
+
+	return new Classes.Alchemy.Microcopy(key, params);
+});
+
+/**
+ * Add a new child
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.2.6
+ * @version  0.2.6
+ *
+ * @return   {Leaf}
+ */
+Leaf.setMethod(function addChild(id) {
+
+	let leaf = new Leaf(id, this);
+
+	this.children.push(leaf);
+
+	return leaf;
+});
+
+/**
+ * Set the data provider
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.2.6
+ * @version  0.2.6
+ */
+Leaf.setMethod(function setProvider(provider) {
+	this._provider = provider;
+});
+
+/**
+ * Get the data provider
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.2.6
+ * @version  0.2.6
+ *
+ * @return   {DataProvider}
+ */
+Leaf.setMethod(function getProvider() {
+
+	if (typeof this._provider == 'string') {
+		let provider = new Classes.Alchemy.DataProvider.Remote();
+		provider.source = alchemy.routeUrl(this._provider);
+
+		provider.context = {
+			leaf_id : this.id
+		};
+
+		return provider;
+	}
+
+});
+
+
+/**
+ * Get the given page
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.2.6
+ * @version  0.2.6
+ *
+ * @return   {DataProvider}
+ */
+Leaf.setMethod(async function getPage(page_nr) {
+
+	let provider = this.getProvider();
+
+	console.log('Getting page...', page_nr, 'from', provider)
+
+	if (!provider) {
+		return;
+	}
+
+	let records = await provider.getAll();
+
+	console.log('Got records:', records)
+
+	return records;
+
+});
+
+/**
+ * Return an object for json-drying this document
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.2.6
+ * @version  0.2.6
+ *
+ * @return   {Object}
+ */
+Leaf.setMethod(function toDry() {
+
+	let result = {
+		value : {
+			id       : this.id,
+			provider : this._provider,
+			children : this.children,
+		}
+	};
+
+	return result;
+});

package/package.json

@@ -1,14 +1,14 @@
 {
 	"name": "alchemy-form",
 	"description": "Form plugin for Alchemy",
-	"version": "0.2.5",
+	"version": "0.2.7",
 	"repository": {
 		"type" : "git",
 		"url"  : "https://github.com/11ways/alchemy-form.git"
 	},
 	"peerDependencies": {
-		"alchemymvc"    : ">=1.2.0",
-		"alchemy-media" : ">=0.7.2"
+		"alchemymvc"    : ">=1.3.0",
+		"alchemy-media" : ">=0.7.6"
 	},
 	"license": "MIT",
 	"engines": {

package/view/form/elements/al_pathway.hwk

@@ -0,0 +1,5 @@
+<al-pathway-selection
+	class="al-pathway-selection-root"
+	#selected_leaf={% self.rootleaf %}
+	#value={% self.value %}
+></al-pathway-selection>

package/view/form/elements/al_pathway_selection.hwk

@@ -0,0 +1,10 @@
+<div class="leaf-info">
+	<span class="select-button">
+		<span class="select-button-title">
+			{{ self.getDisplayTitle() }}
+		</span>
+	</span>
+</div>
+<div class="leaf-children">
+	<% self.populateChildren($0) %>
+</div>

package/view/form/elements/alchemy_toggle.hwk

@@ -1,3 +1,5 @@
+<% self.classList.add('does-not-expand') %>
+
 <input
 	type="checkbox"
 	<% if (self.value) print('checked') %>

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

@@ -4,6 +4,8 @@
 	{% set type = "text" %}
 {% /if %}
 
+<% if (type == 'string') type = 'text'; %>
+
 <input
 	value=<% value %>
 	class="alchemy-field-value"

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

@@ -2,4 +2,4 @@
 	class="alchemy-field-value"
 	form=<% form_id %>
 	name=<% path %>
->{%= value.encodeHTML() %}</textarea>
+>{{ value }}</textarea>

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

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

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

@@ -1,8 +1,28 @@
-{% if alchemy_field.config.options.time_ago %}
-	<time-ago date={% value %}></time-ago>
-{% else %}
+<%
+date_format = '';
+
+if (alchemy_field && alchemy_field.applied_options) {
+	date_format = alchemy_field.applied_options.date_format;
+}
+
+if (!date_format || date_format == 'timeago' || date_format == 'time-ago' || date_format == 'time_ago') {
+	date_format = 'relative';
+}
+
+if (alchemy_field?.config?.options?.time_ago) {
+	date_format = 'relative';
+}
+
+%>
+
+<% if (date_format == 'relative') { %>
+	<time-ago
+		class="alchemy-field-value"
+		date={% value.toISOString() %}
+	></time-ago>
+<% } else { %>
 	<time
 		class="alchemy-field-value"
 		datetime={% value.toISOString() %}
-	>{{ value.format('Y‑m‑d H:i') }}</time>
-{% /if %}
+	>{{ value.format(date_format) }}</time>
+<% } %>

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

@@ -3,11 +3,11 @@
 		<span
 			data-he-name="field-title"
 			data-he-slot="field-title"
-		><%= alchemy_field.field_title %></span>
+		>{{ alchemy_field.field_title }}</span>
 		<small
 			data-he-name="field-description"
 			data-he-slot="field-description"
-		><%= alchemy_field.field_description %></small>
+		>{{ alchemy_field.field_description }}</small>
 	</al-label>
 </div>
 <div data-he-name="field"></div>