alchemy-chimera 1.2.7 → 1.3.0-alpha.1

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.3.0-alpha.1 (2024-02-15)
+
+* Upgrade to Alchemy v1.4.0
+
 ## 1.2.7 (2023-11-27)
 
 * Fix expecting underscored model names

package/assets/stylesheets/chimera/chimera.scss

@@ -426,6 +426,10 @@ al-field[mode="inline"] {
 				&:empty {
 					display: none;
 				}
+
+				&:has(> micro-copy:empty) {
+					display: none;
+				}
 			}
 		}
 
@@ -470,6 +474,21 @@ al-field[mode="inline"] {
 				border: none;
 				padding: 0;
 			}
+
+			textarea,
+			input[type=text],
+			input[type=number],
+			input[type=color],
+			input[type=datetime-local],
+			input[type=date],
+			input[type=password],
+			select {
+				&:disabled {
+					background-color: rgb(223 223 223 / 30%);
+					color: rgb(84, 84, 84);
+					border-color: rgba(118, 118, 118, 0.3);
+				}
+			}
 		}
 	}
 

package/bootstrap.js

@@ -1,14 +1,27 @@
 alchemy.requirePlugin('widget');
 alchemy.requirePlugin('form');
 
-// Define the default options
-let options = {
-	// The name to use in the routing
-	base_path: 'chimera',
+/**
+ * Convert a model name to an string to be used in a url
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.3.0
+ * @version  1.3.0
+ *
+ * @param    {string}   model_name
+ */
+Plugin.modelNameToUrl = function modelNameToUrl(model_name) {
 
-	// Use a custom theme?
-	theme    : false
+	let path = Blast.parseClassPath(model_name),
+	    result = [];
+
+	for (let entry of path) {
+		result.push(entry.underscore());
+	}
+
+	return result.join('.');
 };
 
-// Inject the user-overridden options
-alchemy.plugins.chimera = Object.merge(options, alchemy.plugins.chimera);
+// Load the following files right now:
+Plugin.useOnce('lib/chimera_config');
+Plugin.useOnce('model/model');

package/config/routes.js

@@ -1,6 +1,6 @@
 // Create a new chimera section.
 // By default this will be /chimera
-let chimera_section = Router.section('chimera', '/' + alchemy.plugins.chimera.base_path);
+let chimera_section = Router.section('chimera', '/chimera');
 
 chimera_section.requirePermission('chimera');
 
@@ -12,6 +12,14 @@ chimera_section.add({
 	paths      : '/',
 	handler    : 'Chimera.Static#dashboard',
 });
+
+// Settings editor
+chimera_section.add({
+	name            : 'Chimera.Settings#editor',
+	methods         : ['post', 'get'],
+	paths           : '/settings',
+});
+
 // Editor index action
 chimera_section.add({
 	name       : 'Chimera.Editor#index',
@@ -79,129 +87,3 @@ alchemy.sputnik.after('base_app', () => {
 		breadcrumb : 'chimera.editor.{model}.preview.{pk}'
 	});
 });
-
-return
-var chimera_menu;
-
-// Link to the dashboard
-chimera_section.add({
-	title      : __('chimera', 'Dashboard'),
-	name       : 'Dashboard',
-	methods    : 'get',
-	paths      : '/',
-	handler    : 'Chimera.Static#dashboard',
-	breadcrumb : 'chimera.dashboard'
-});
-
-chimera_section.add({
-	name       : 'IdActionLink',
-	methods    : ['get', 'post'],
-	paths      : '/{controller}/{action}/{[ObjectId]id}',
-	handler    : 'Chimera.{controller}#{action}',
-	breadcrumb : 'chimera.{controller}.{action}.{id}'
-});
-
-chimera_section.add({
-	name       : 'ActionLink',
-	methods    : ['get', 'post'],
-	paths      : '/{controller}/{action}',
-	handler    : 'Chimera.{controller}#{action}',
-	breadcrumb : 'chimera.{controller}.{action}'
-});
-
-chimera_section.add({
-	name       : 'RecordAction',
-	methods    : ['get', 'post'],
-	paths      : '/{controller}/{subject}/{action}/{[ObjectId]id}',
-	handler    : 'Chimera.{controller}#{action}',
-	breadcrumb : 'chimera.{controller}.{subject}.{action}.{id}'
-});
-
-chimera_section.add({
-	name       : 'ModelAction',
-	methods    : ['get', 'post'],
-	paths      : '/{controller}/{subject}/{action}',
-	handler    : 'Chimera.{controller}#{action}',
-	breadcrumb : 'chimera.{controller}.{subject}'
-});
-
-chimera_section.add({
-	name       : 'SettingsAction',
-	methods    : ['get', 'post'],
-	paths      : '/settings',
-	handler    : 'Chimera.Settings#index',
-	breadcrumb : 'chimera.settings'
-});
-
-chimera_section.get('PageEditor', '/page_editor', 'Chimera.Static#pageEditor');
-
-// @TODO: add this to the chimera router
-Router.socket('al-rcommand-action', 'TaskChimera#action');
-
-// alchemy.plugins.chimera.menu_items.addItem('route', {
-// 	title      : 'Dashboard',
-// 	route      : 'chimera@Dashboard',
-// 	parameters : {}
-// });
-
-
-// Set user data for chimera
-chimera_section.use(function setChimeraData(req, res, next) {
-
-	// Always set the user data
-	req.conduit.internal('UserData', req.conduit.session('UserData') || {});
-
-	// Set the theme to use
-	req.conduit.renderer.setTheme(alchemy.plugins.chimera.view_settings.theme);
-
-	// Skip the rest if it's an ajax call
-	if (req.conduit.ajax) {
-		return next();
-	}
-
-	// req.conduit.getModel('Menu').getPosition('chimera_main_sidebar', function gotMainSidebarMenu(err, result) {
-	// 	// Do nothing on an error,
-	// 	if (err) {
-	// 		return console.error('ERROR: ' + err);
-	// 	}
-	// });
-
-	// Send the ACL layout options to the client
-	req.conduit.expose('chimera-view-setting', alchemy.plugins.chimera.view_settings);
-
-	// var chimera_menu = [];
-
-	// chimera_menu.push({
-	// 	title: 'Dashboard',
-	// 	route: 'chimera@Dashboard',
-	// 	parameters: {},
-	// 	icon: {svg: 'chimera/home'}
-	// });
-
-	// chimera_menu.push({
-	// 	title: 'Dashboard2',
-	// 	route: 'chimera@Dashboard',
-	// 	parameters: {},
-	// 	children: [
-	// 		{
-	// 			title: 'Child',
-	// 			route: 'chimera@Dashboard',
-	// 			parameters: {},
-	// 			icon: {svg: 'chimera/home'}
-	// 		}
-	// 	]
-	// });
-
-	req.conduit.set('chimera_menu', alchemy.plugins.chimera.menu);
-	req.conduit.set('project_title', alchemy.plugins.chimera.title || 'Chimera');
-
-	next();
-});
-
-Router.get('ChimeraCmsRedirect', '/cms', function(conduit) {
-	conduit.redirect('/' + alchemy.plugins.chimera.routename);
-});
-
-Router.get('ChimeraAdminRedirect', '/admin', function(conduit) {
-	conduit.redirect('/' + alchemy.plugins.chimera.routename);
-});

package/controller/chimera_editor_controller.js

@@ -204,7 +204,7 @@ Editor.setAction(async function edit(conduit, model_name, pk_val) {
 	this.setContextDocument(record);
 
 	this.set('record_pk', record.$pk);
-	this.set('model_name', model.model_name.toLowerCase());
+	this.set('model_name', model.model_name);
 	this.set('widget_config', widget_config);
 	this.setTitle(model.constructor.title + ' Edit');
 
@@ -239,14 +239,10 @@ Editor.setAction(async function preview(conduit, model_name, pk_val) {
 
 	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_settings_controller.js

@@ -0,0 +1,43 @@
+/**
+ * The Chimera Settings Controller:
+ * Allows editing the application settings
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.3.0
+ * @version  1.3.0
+ */
+const SettingsController = Function.inherits('Alchemy.Controller.Chimera', 'Settings');
+
+/**
+ * The settings editor action
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.3.0
+ * @version  1.3.0
+ *
+ * @param    {Alchemy.Conduit}   conduit
+ */
+SettingsController.setAction(async function editor(conduit) {
+
+	if (conduit.method == 'post') {
+		let changes = conduit.body;
+
+		if (!changes) {
+			return conduit.end();
+		}
+
+		const AlchemySetting = this.getModel('AlchemySetting');
+
+		console.log('Changes:', changes);
+
+		await AlchemySetting.saveChanges(changes, conduit);
+
+		return conduit.end();
+	}
+
+	const settings_config = Classes.Alchemy.Setting.SYSTEM.getEditorConfiguration(alchemy.system_settings, conduit);
+
+	this.set('settings_config', settings_config);
+
+	this.render('chimera/settings/editor');
+});

package/controller/chimera_static_controller.js

@@ -80,7 +80,10 @@ ChimeraStatic.setAction(function sidebar(conduit) {
 						link_settings: {
 							route : 'Chimera.Editor#index',
 							parameters: [
-								{name: 'model', value: model.constructor.type_name},
+								{
+									name: 'model',
+									value: Plugin.modelNameToUrl(model.constructor.model_name),
+								},
 							],
 						},
 						text: title
@@ -94,6 +97,17 @@ ChimeraStatic.setAction(function sidebar(conduit) {
 		let models = Model.getAllChildren();
 		models.sortByPath(1, 'model_name');
 
+		widgets.push({
+			type   : 'link',
+				config : {
+					link_type: 'route',
+					link_settings: {
+						route : 'Chimera.Settings#editor',
+					},
+					text: new Classes.Alchemy.Microcopy('alchemy.settings'),
+				}
+		});
+
 		for (let model of models) {
 
 			// Skip abstract classes (like `App`)
@@ -109,7 +123,10 @@ ChimeraStatic.setAction(function sidebar(conduit) {
 					link_settings: {
 						route : 'Chimera.Editor#index',
 						parameters: [
-							{name: 'model', value: model.type_name},
+							{
+								name: 'model',
+								value: Plugin.modelNameToUrl(model.model_name),
+							},
 						],
 					},
 					text: model.title

package/lib/chimera_config.js

@@ -269,7 +269,7 @@ Config.setMethod(function getWidgetConfig(action, conduit) {
 												{
 													"type": "alchemy_form",
 													"config": {
-														model     : this.ModelClass.type_name,
+														model     : Plugin.modelNameToUrl(this.ModelClass.model_name),
 														purpose   : 'edit',
 														widgets   : action_widgets
 													}
@@ -315,12 +315,12 @@ Config.setMethod(function getWidgetConfig(action, conduit) {
 								fieldset     : fieldset,
 								page_size    : 25,
 								show_filters : true,
-								id           : 'aft-' + this.ModelClass.type_name,
+								id           : 'aft-' + this.ModelClass.model_name,
 								use_url_pagination : true,
 								recordsource : {
 									route      : 'Chimera.Editor#records',
 									parameters : {
-										model  : this.ModelClass.type_name
+										model  : Plugin.modelNameToUrl(this.ModelClass.model_name),
 									}
 								}
 							}

package/package.json

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

package/view/chimera/settings/editor.hwk

@@ -0,0 +1,12 @@
+{% include "layouts/chimera_basics" %}
+
+{% block "page-actions" %}
+	
+{% /block %}
+
+{% block "main" %}
+	<al-settings-editor
+		!Route="Chimera.Settings#editor"
+		#settings_config={% settings_config %}
+	></al-settings-editor>
+{% /block %}