alchemy-chimera 1.2.5 → 1.2.7

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.2.7 (2023-11-27)
+
+* Fix expecting underscored model names
+
+## 1.2.6 (2023-10-05)
+
+* Do not queue a toolbar_manager model fallback on system routes without a model
+* Fix the toolbar not having an `add` button on non-ajax pageviews
+* Fix abstract model classes from showing up in the default chimera sidebar
+* Don't show models without a valid chimera configuration in the sidebar
+* Make date input fields look like the others
+
 ## 1.2.5 (2023-06-17)
 
 * Improve stylings

package/assets/stylesheets/chimera/chimera.scss

@@ -3,6 +3,10 @@
 
 body {
 	font-family: 'Roboto', sans-serif;
+
+	.he-context-contents {
+		overflow: auto;
+	}
 }
 
 .default-form-editor,
@@ -343,6 +347,30 @@ al-field[mode="inline"] {
 		background: rgba(190,190,190,0.1);
 		min-height: 37px;
 	}
+
+	.field {
+		input[type="text"],
+		input[type="number"],
+		input[type="color"],
+		input[type="datetime-local"],
+		input[type="date"],
+		input[type="password"] {
+			@extend .chimera-input-field;
+			height: 3rem;
+		}
+
+		textarea {
+			@extend .chimera-input-field;
+			min-height: 5rem;
+			padding: 1rem;
+		}
+
+		input[type="color"] {
+			background-color: transparent;
+			border: none;
+			padding: 0;
+		}
+	}
 }
 
 .default-form-editor,
@@ -410,6 +438,10 @@ al-field[mode="inline"] {
 				flex: 10;
 			}
 
+			> .does-not-expand {
+				flex: 0 1 auto;
+			}
+
 			> al-widget {
 				border: 1px solid var(--color-input-border);
 				padding: 0 12px;
@@ -421,6 +453,7 @@ al-field[mode="inline"] {
 			input[type="number"],
 			input[type="color"],
 			input[type="datetime-local"],
+			input[type="date"],
 			input[type="password"] {
 				@extend .chimera-input-field;
 				height: 3rem;
@@ -440,6 +473,10 @@ al-field[mode="inline"] {
 		}
 	}
 
+	.field {
+		justify-content: flex-start;
+	}
+
 	al-field-array {
 		.add-entry {
 			@extend .btn;

package/config/routes.js

@@ -46,16 +46,18 @@ chimera_section.add({
 
 // Editor data action
 chimera_section.add({
-	name       : 'Chimera.Editor#records',
-	methods    : ['post'],
-	paths      : '/api/editor/{model}/records',
+	name            : 'Chimera.Editor#records',
+	methods         : ['post'],
+	paths           : '/api/editor/{model}/records',
+	is_system_route : true,
 });
 
 // Sidebar
 chimera_section.add({
-	name       : 'Chimera.Static#sidebar',
-	methods    : ['get'],
-	paths      : '/api/content/sidebar',
+	name            : 'Chimera.Static#sidebar',
+	methods         : ['get'],
+	paths           : '/api/content/sidebar',
+	is_system_route : true,
 });
 
 alchemy.sputnik.after('base_app', () => {

package/controller/00-chimera_controller.js

@@ -20,11 +20,27 @@ let ChimeraController = Function.inherits('Alchemy.Controller', 'Alchemy.Control
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.2.4
- * @version  1.2.4
+ * @version  1.2.6
  */
 ChimeraController.setMethod(function beforeAction() {
+
+	const model = this.conduit.params.model,
+	      is_system_route = this.conduit.route.is_system_route;
+
 	this.set('toolbar_manager', this.toolbar_manager);
-	this.toolbar_manager.queueModelFallback(this.conduit.params.model);
+	
+	// If this is not a system route and no model is defined in the parameters,
+	// do not queue a model fallback
+	if (is_system_route && !model) {
+		return;
+	}
+
+	// Ignore loopback conduits
+	if (this.conduit instanceof Classes.Alchemy.Conduit.Loopback) {
+		return;
+	}
+
+	this.toolbar_manager.queueModelFallback(model);
 });
 
 /**

package/controller/chimera_editor_controller.js

@@ -87,7 +87,7 @@ Editor.setAction(function index(conduit, model_name) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  1.0.2
+ * @version  1.2.7
  *
  * @param    {Conduit}   conduit
  * @param    {String}    model_name
@@ -102,7 +102,7 @@ Editor.setAction(async function add(conduit, model_name) {
 
 		let record = model.createDocument();
 
-		record.setDataRecord(conduit.body[model_name]);
+		record.setDataRecord(conduit.body);
 
 		try {
 			await record.save();
@@ -141,7 +141,7 @@ Editor.setAction(async function add(conduit, model_name) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.1.0
- * @version  1.2.4
+ * @version  1.2.7
  *
  * @param    {Conduit}   conduit
  * @param    {String}    model_name
@@ -169,7 +169,7 @@ Editor.setAction(async function edit(conduit, model_name, pk_val) {
 
 	if (conduit.method == 'post') {
 
-		Object.assign(record, conduit.body[model_name]);
+		Object.assign(record, conduit.body);
 
 		try {
 			await record.save();

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.2
+ * @version  1.2.6
  *
  * @param    {Conduit}   conduit
  */
@@ -95,6 +95,13 @@ ChimeraStatic.setAction(function sidebar(conduit) {
 		models.sortByPath(1, 'model_name');
 
 		for (let model of models) {
+
+			// Skip abstract classes (like `App`)
+			// or models without any chimera configuration
+			if (model.is_abstract || !model.chimera.has_configuration) {
+				continue;
+			}
+
 			let entry = {
 				type   : 'link',
 				config : {
@@ -109,8 +116,6 @@ ChimeraStatic.setAction(function sidebar(conduit) {
 				}
 			};
 
-			console.log(entry)
-
 			widgets.push(entry);
 		}
 	}

package/lib/chimera_config.js

@@ -17,7 +17,7 @@ const Config = Function.inherits('Alchemy.Base', 'Alchemy.Chimera', function Con
 	this.ModelClass = ModelClass;
 
 	// The different default field sets
-	this.field_sets = {};
+	this.field_sets = null;
 
 	// The record preview action
 	this.record_preview = null;
@@ -25,6 +25,38 @@ const Config = Function.inherits('Alchemy.Base', 'Alchemy.Chimera', function Con
 	this.record_preview_action = null;
 });
 
+/**
+ * Has this been configured in any way?
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.6
+ * @version  1.2.6
+ *
+ * @type     {Boolean}
+ */
+Config.setProperty(function has_configuration() {
+
+	let result = false;
+
+	if (this.field_sets) {
+		let key,
+		    fieldset;
+
+		for (key in this.field_sets) {
+			fieldset = this.field_sets[key];
+
+			if (!fieldset.size) {
+				continue;
+			}
+
+			result = true;
+			break;
+		}
+	}
+
+	return result;
+});
+
 /**
  * Set a record preview
  *
@@ -71,7 +103,7 @@ Config.setMethod(function getActionFields(name) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.0.0
+ * @version  1.2.6
  *
  * @return   {FieldSet}
  */
@@ -81,6 +113,10 @@ Config.setMethod(function getFieldSet(name) {
 		throw new Error('No action group name was given');
 	}
 
+	if (!this.field_sets) {
+		this.field_sets = {};
+	}
+
 	let set = this.field_sets[name];
 
 	if (!set) {

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemy-chimera",
 	"description": "Chimera plugin for Alchemy MVC",
-	"version": "1.2.5",
+	"version": "1.2.7",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",
@@ -11,9 +11,9 @@
 	],
 	"repository": "11ways/alchemy-chimera",
 	"peerDependencies": {
-		"alchemy-acl"    : "~0.8.3",
-		"alchemymvc"     : ">=1.2.7",
-		"alchemy-form"   : "~0.2.1",
+		"alchemy-acl"    : "~0.8.4",
+		"alchemymvc"     : ">=1.3.16",
+		"alchemy-form"   : "~0.2.7",
 		"alchemy-widget" : "~0.2.1"
 	},
 	"license": "MIT",