alchemy-chimera 1.2.1 → 1.2.3

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.2.3 (2023-03-10)
+
+* Add support for setting a record preview action per model
+* Fix layout of page actions
+
+## 1.2.2 (2023-02-26)
+
+* Fix default menu items not being rendered properly
+
 ## 1.2.1 (2022-12-23)
 
 * Show field descriptions under the field title

package/assets/stylesheets/chimera/chimera.scss

@@ -172,7 +172,8 @@ body {
 	}
 
 	.page-actions {
-
+		display: flex;
+		gap: 1rem;
 	}
 }
 
@@ -304,7 +305,6 @@ al-field-translatable {
 
 			height: 3rem;
 			display: flex;
-			flex-flow: column;
 			justify-content: center;
 			align-items: center;
 

package/config/routes.js

@@ -58,6 +58,26 @@ chimera_section.add({
 	paths      : '/api/content/sidebar',
 });
 
+alchemy.sputnik.after('base_app', () => {
+
+	let prefixes = Prefix.all();
+	let preview_paths = {
+		'': '/editor/{model}/preview/{pk}',
+	};
+
+	for (let prefix in prefixes) {
+		preview_paths[prefix] = '/editor/{model}/preview/{pk}';
+	}
+
+	// Preview action
+	chimera_section.add({
+		name       : 'Chimera.Editor#preview',
+		methods    : ['get', 'post'],
+		paths      : preview_paths,
+		breadcrumb : 'chimera.editor.{model}.preview.{pk}'
+	});
+});
+
 return
 var chimera_menu;
 

package/controller/chimera_editor_controller.js

@@ -117,7 +117,7 @@ Editor.setAction(async function add(conduit, model_name) {
 	this.set('widget_config', widget_config);
 	this.setTitle(model.constructor.title + ' Add');
 
-	this.render('chimera/widgets');
+	this.render('chimera/editor/add');
 });
 
 /**
@@ -125,7 +125,7 @@ Editor.setAction(async function add(conduit, model_name) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  1.0.5
+ * @version  1.2.3
  *
  * @param    {Conduit}   conduit
  * @param    {String}    model_name
@@ -138,6 +138,11 @@ Editor.setAction(async function edit(conduit, model_name, pk_val) {
 	model.translateItems = false;
 
 	let record = await model.findByPk(pk_val);
+
+	if (!record) {
+		return conduit.notFound('Unable to find record with primary key "' + pk_val + '"');
+	}
+
 	let message_type = conduit.param('message');
 
 	record.keepPrivateFields();
@@ -176,10 +181,55 @@ Editor.setAction(async function edit(conduit, model_name, pk_val) {
 
 	widget_config.class_names.push('chimera-editor-widgets');
 
+	if (model.chimera.record_preview) {
+		this.set('add_preview_button', true);
+	}
+
+	this.set('record_pk', record.$pk);
+	this.set('model_name', model.model_name.toLowerCase());
 	this.set('widget_config', widget_config);
 	this.setTitle(model.constructor.title + ' Edit');
 
-	this.render('chimera/widgets');
+	this.render('chimera/editor/edit');
+});
+
+/**
+ * The preview action
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.3
+ * @version  1.2.3
+ *
+ * @param    {Conduit}   conduit
+ * @param    {String}    model_name
+ * @param    {String}    pk_val
+ */
+Editor.setAction(async function preview(conduit, model_name, pk_val) {
+
+	let model = this.getModel(model_name);
+	const action_name = model?.chimera?.record_preview_action;
+
+	if (!action_name) {
+		return conduit.notFound();
+	}
+
+	let record = await model.findByPk(pk_val);
+
+	if (!record) {
+		return conduit.notFound();
+	}
+
+	const controller = Controller.get(model.chimera.record_preview_controller, conduit);
+
+	console.log(conduit.view_render.variables);
+
+	if (!controller) {
+		return conduit.notFound();
+	}
+
+	console.log('URLPARAMS:', controller.view_render?.variables?.__urlparams)
+
+	controller.doAction(action_name, [conduit, record]);
 });
 
 /**

package/controller/chimera_static_controller.js

@@ -26,7 +26,7 @@ ChimeraStatic.setAction(function dashboard(conduit) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.0.0
- * @version  1.2.1
+ * @version  1.2.2
  *
  * @param    {Conduit}   conduit
  */
@@ -95,16 +95,23 @@ ChimeraStatic.setAction(function sidebar(conduit) {
 		models.sortByPath(1, 'model_name');
 
 		for (let model of models) {
-			widgets.push({
+			let entry = {
 				type   : 'link',
 				config : {
-					route : 'Chimera.Editor#index',
-					parameters: [
-						{name: 'model', value: model.type_name},
-					],
-					content: model.title
+					link_type: 'route',
+					link_settings: {
+						route : 'Chimera.Editor#index',
+						parameters: [
+							{name: 'model', value: model.type_name},
+						],
+					},
+					text: model.title
 				}
-			});
+			};
+
+			console.log(entry)
+
+			widgets.push(entry);
 		}
 	}
 

package/lib/chimera_config.js

@@ -7,7 +7,7 @@
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.0.0
+ * @version  1.2.3
  *
  * @param    {Model}   ModelClass
  */
@@ -18,6 +18,37 @@ const Config = Function.inherits('Alchemy.Base', 'Alchemy.Chimera', function Con
 
 	// The different default field sets
 	this.field_sets = {};
+
+	// The record preview action
+	this.record_preview = null;
+	this.record_preview_controller = null;
+	this.record_preview_action = null;
+});
+
+/**
+ * Set a record preview
+ *
+ * @deprecated
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.3
+ * @version  1.2.3
+ *
+ * @param    {String}   target   The controller#method to use
+ */
+Config.setMethod(function setRecordPreview(target) {
+	this.record_preview = target;
+	this.record_preview_controller = null;
+	this.record_preview_action = null;
+
+	if (target && typeof target == 'string') {
+		let parts = target.split('#');
+
+		if (parts.length == 2) {
+			this.record_preview_controller = parts[0];
+			this.record_preview_action = parts[1];
+		}
+	}
 });
 
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemy-chimera",
 	"description": "Chimera plugin for Alchemy MVC",
-	"version": "1.2.1",
+	"version": "1.2.3",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",

package/view/chimera/editor/add.hwk

@@ -0,0 +1,12 @@
+{% include "layouts/chimera_basics" %}
+
+{% block "page-actions" %}
+	
+{% /block %}
+
+{% block "main" %}
+	<al-widgets
+		#context_variables={% context_variables %}
+		#value={% widget_config %}
+	></al-widgets>
+{% /block %}

package/view/chimera/editor/edit.hwk

@@ -0,0 +1,33 @@
+{% include "layouts/chimera_basics" %}
+
+{% block "page-actions" %}
+
+	{% if add_preview_button %}
+		<a
+			!Route="Chimera.Editor#preview"
+			+model={% model_name %}
+			+pk={% record_pk %}
+			class="btn"
+			target="_blank"
+		>
+			<al-icon icon-name="eye"></al-icon>
+			{%t "preview" model=model_name %}
+		</a>
+	{% /if %}
+
+	<a
+		!Route="Chimera.Editor#add"
+		#model={% model_name %}
+		class="btn"
+	>
+		<al-icon icon-name="plus"></al-icon>
+		{%t "new" model=model_name %}
+	</a>
+{% /block %}
+
+{% block "main" %}
+	<al-widgets
+		#context_variables={% context_variables %}
+		#value={% widget_config %}
+	></al-widgets>
+{% /block %}