alchemy-widget 0.2.1 → 0.2.3

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.2.3 (2023-01-23)
+
+* Fix `List` widgets not having their content saved
+* Fix more issues with saving to the database
+
+## 0.2.2 (2022-12-23)
+
+* Fix widgets not being populated properly
+
 ## 0.2.1 (2022-12-23)
 
 * Add a `-first` modifier class to the first visible entry of a table-of-contents element

package/controller/alchemy_widgets_controller.js

@@ -225,7 +225,7 @@ AlchemyWidgets.setAction(async function uploadImage(conduit) {
 			id : result._id,
 		};
 
-		let default_path = alchemy.routeUrl('Media::image', params);
+		let default_path = alchemy.routeUrl('MediaFile#image', params);
 		let url = RURL.parse(default_path);
 
 		let path_800 = url.clone();

package/element/05-widget_element.js

@@ -215,7 +215,7 @@ Widget.setMethod(function getValueFromRecord(record) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.5
- * @version  0.1.6
+ * @version  0.2.1
  */
 Widget.setMethod(function applyValue(value) {
 
@@ -255,7 +255,7 @@ Widget.setMethod(function applyValue(value) {
 	}
 
 	this.instance.config = config;
-	let promise = this.instance.populateWidget();
+	let promise = this.instance.loadWidget();
 
 	if (promise) {
 		this.delayAssemble(promise);
@@ -389,6 +389,22 @@ Widget.setMethod(function getContextButton() {
 	return button;
 });
 
+/**
+ * Get a list of elements that could be child widgets
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.2.3
+ * @version  0.2.3
+ */
+Widget.setMethod(function getPossibleWidgetChildren() {
+
+	if (this.instance && typeof this.instance.getPossibleWidgetChildren == 'function') {
+		return this.instance.getPossibleWidgetChildren();
+	}
+
+	return this.children;
+});
+
 /**
  * Show the config button
  *

package/element/10-container_elements.js

@@ -139,19 +139,20 @@ AlchemyWidgets.setMethod(function applyValue(value) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.2.3
  *
  * @return   {Array}
  */
 AlchemyWidgets.setMethod(function getWidgetsConfig() {
 
-	let widgets = [],
+	let children = this.getPossibleWidgetChildren(),
+	    widgets = [],
 	    child,
 	    temp,
 	    i;
 
-	for (i = 0; i < this.children.length; i++) {
-		child = this.children[i];
+	for (i = 0; i < children.length; i++) {
+		child = children[i];
 
 		if (child instanceof Classes.Alchemy.Element.Widget.Base) {
 			temp = child.value;

package/helper/widgets/00-widget.js

@@ -627,7 +627,7 @@ Widget.setMethod(function _createWidgetElement() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.2.2
  *
  * @return   {HTMLElement}
  */
@@ -641,14 +641,41 @@ Widget.setMethod(function _createPopulatedWidgetElement() {
 
 	this.widget = element;
 
-	// See if it can be populated
-	if (typeof this.populateWidget == 'function') {
-		this.populateWidget(element);
-	}
+	this.loadWidget();
 
 	return element;
 });
 
+/**
+ * Load the widget element: populate it & finalize it
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.2.2
+ * @version  0.2.2
+ *
+ * @return   {Promise|null}
+ */
+Widget.setMethod(function loadWidget() {
+
+	let populate = this.populateWidget();
+
+	if (Pledge.isThenable(populate)) {
+		let pledge = new Pledge();
+
+		Pledge.done(populate, (err, result) => {
+
+			if (err) {
+				pledge.reject(err);
+			}
+
+			pledge.resolve(this.finalizePopulatedWidget());
+		});
+
+		return pledge;
+	} else {
+		return this.finalizePopulatedWidget();
+	}
+});
 
 /**
  * Populate the actual widget
@@ -826,14 +853,13 @@ Widget.setMethod(function stopEditor() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.2.1
+ * @version  0.2.2
  */
 Widget.setMethod(async function rerender() {
 
 	Hawkejs.removeChildren(this.widget);
 
-	await this.populateWidget();
-	await this.finalizePopulatedWidget();
+	await this.loadWidget();
 
 	if (this.editing) {
 		this.startEditor();

package/helper/widgets/01-container.js

@@ -38,12 +38,10 @@ Container.constitute(function prepareSchema() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
- *
- * @return   {HTMLElement}
+ * @version  0.2.2
  */
 Container.setMethod(function initContainer() {
-	this.populateWidget();
+	return this.loadWidget();
 });
 
 /**

package/helper/widgets/05-list.js

@@ -11,6 +11,18 @@
  */
 const List = Function.inherits('Alchemy.Widget.Container', 'List');
 
+/**
+ * Get a list of elements that could be child widgets
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.2.3
+ * @version  0.2.3
+ */
+List.setMethod(function getPossibleWidgetChildren() {
+	let children = this.widget.querySelectorAll(':scope > ul > li > *');
+	return children;
+});
+
 /**
  * Dummy populate method
  *

package/helper/widgets/alchemy_tabs_widget.js

@@ -178,7 +178,7 @@ Tabs.setMethod(function _startEditor() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  0.2.0
+ * @version  0.2.2
  */
 Tabs.setMethod(function _stopEditor() {
 
@@ -189,5 +189,5 @@ Tabs.setMethod(function _stopEditor() {
 		sub_widget.stopEditor();
 	}
 
-	this.populateWidget();
+	this.loadWidget();
 });

package/helper/widgets/markdown.js

@@ -74,14 +74,14 @@ Markdown.setMethod(async function _startEditor() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.2.2
  */
 Markdown.setMethod(function _stopEditor() {
 
 	Hawkejs.removeChildren(this.widget);
 	this.easy_mde = null;
 
-	this.populateWidget();
+	return this.loadWidget();
 });
 
 /**

package/helper/widgets/partial.js

@@ -57,7 +57,7 @@ Partial.constitute(function prepareSchema() {
 	let contents = this.createSchema();
 
 	contents.addField('name', 'String');
-	contents.addField('content', 'Widgets');
+	contents.addField('contents', 'Widgets');
 
 	this.schema.addField('contents', contents, {array: true});
 });
@@ -87,7 +87,26 @@ Partial.setMethod(async function populateWidget() {
 
 		if (this.config?.contents?.length) {
 			for (let entry of this.config.contents) {
-				variables[entry.name] = entry.contents;
+
+				let actual_contents;
+
+				if (entry.contents) {
+					if (entry.contents.config) {
+						actual_contents = entry.contents.config;
+					} else if (entry.contents.widgets) {
+						actual_contents = entry.contents.widgets;
+
+						let type = actual_contents?.[0]?.type;
+
+						if (type == 'container' || type == 'row') {
+							actual_contents = actual_contents[0].config?.widgets;
+						} else {
+							actual_contents = actual_contents[0];
+						}
+					}
+				}
+
+				variables[entry.name] = actual_contents;
 			}
 		}
 
@@ -161,7 +180,7 @@ Partial.setMethod(function _startEditor() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.6
- * @version  0.1.6
+ * @version  0.2.2
  */
 Partial.setMethod(function _stopEditor() {
 
@@ -172,7 +191,7 @@ Partial.setMethod(function _stopEditor() {
 		sub_widget.stopEditor();
 	}
 
-	this.populateWidget();
+	return this.loadWidget();
 });
 
 /**
@@ -180,7 +199,7 @@ Partial.setMethod(function _stopEditor() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.6
- * @version  0.1.6
+ * @version  0.2.3
  *
  * @return   {Object}
  */
@@ -206,7 +225,23 @@ Partial.setMethod(function syncConfig() {
 			contents.push(widget_config);
 		}
 
-		widget_config.contents = sub_widget.value;
+		let value = sub_widget.value,
+		    widget_contents;
+
+		if (value?.widgets) {
+			widget_contents = {
+				widgets : [{
+					type : 'row',
+					config : value,
+				}]
+			};
+		} else {
+			widget_contents = {
+				widgets: Array.cast(value)
+			};
+		}
+
+		widget_config.contents = widget_contents;
 	}
 
 	return this.config;

package/helper/widgets/sourcecode.js

@@ -80,13 +80,13 @@ Sourcecode.setMethod(function _startEditor() {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.2.2
  */
 Sourcecode.setMethod(function _stopEditor() {
 
 	Hawkejs.removeChildren(this.widget);
 
-	this.populateWidget();
+	return this.loadWidget();
 });
 
 /**

package/helper_field/widget.js

@@ -52,4 +52,26 @@ WidgetField.setMethod(function cast(value, to_datasource) {
 	}
 
 	return value;
-});
+});
+
+/**
+ * Convert to JSON
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.2.3
+ * @version  0.2.3
+ *
+ * @return   {Object}
+ */
+WidgetField.setMethod(function toDry() {
+
+	let {schema, ...options} = this.options;
+
+	let value = {
+		schema  : this.schema,
+		name    : this.name,
+		options : options,
+	};
+
+	return {value};
+});

package/helper_field/widgets.js

@@ -22,4 +22,18 @@ const WidgetsField = Function.inherits('Alchemy.Field.Schema', function Widgets(
 	}
 
 	Widgets.super.call(this, schema, name, options);
+});
+
+/**
+ * Get the client-side options
+ *
+ * @author   Jelle De Loecker   <jelle@develry.be>
+ * @since    0.2.3
+ * @version  0.2.3
+ *
+ * @return   {Object}
+ */
+WidgetsField.setMethod(function getOptionsForDrying() {
+	let {schema, ...options} = this.options;
+	return options;
 });

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemy-widget",
 	"description": "The widget plugin for the AlchemyMVC",
-	"version": "0.2.1",
+	"version": "0.2.3",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",