alchemy-chimera 0.5.4 → 1.0.2

package/controller/chimera_static_controller.js

@@ -1,24 +1,117 @@
 /**
  * The Chimera Static Controller class
  *
- * @author        Jelle De Loecker   <jelle@kipdola.be>
- * @since         0.2.0
- * @version       0.3.0
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.2.0
+ * @version  1.0.0
  */
-var ChimeraStatic = Function.inherits('Alchemy.Controller.Chimera', function Static(conduit) {
-	Static.super.call(this, conduit);
-});
+const ChimeraStatic = Function.inherits('Alchemy.Controller.Chimera', 'Static');
 
 /**
  * The dashboard action
  *
- * @param   {Conduit}   conduit
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    0.1.0
+ * @version  1.0.0
+ *
+ * @param    {Conduit}   conduit
  */
 ChimeraStatic.setAction(function dashboard(conduit) {
 	this.set('pagetitle', 'Dashboard');
 	this.render('chimera/dashboard');
 });
 
-ChimeraStatic.setAction(function pageEditor(conduit) {
-	this.render('chimera/page_editor');
+/**
+ * The sidebar action
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.0.0
+ * @version  1.0.1
+ *
+ * @param    {Conduit}   conduit
+ */
+ChimeraStatic.setAction(function sidebar(conduit) {
+
+	let widgets = [],
+	    config;
+
+	if (Array.isArray(alchemy.plugins.chimera.sidebar_menu)) {
+
+		for (let entry of alchemy.plugins.chimera.sidebar_menu) {
+
+			if (!entry.model && !entry.href) {
+				continue;
+			}
+
+			let model,
+			    title = entry.title;
+
+			if (entry.model) {
+				model = Model.get(entry.model);
+			}
+
+			if (!title) {
+				if (model) {
+					title = model.constructor.title;
+				}
+
+				if (!title && entry.href) {
+					title = entry.href;
+				}
+			}
+
+			if (entry.href) {
+				widgets.push({
+					type   : 'link',
+					config : {
+						href   : entry.href,
+						content: title
+					}
+				});
+			} else {
+
+				widgets.push({
+					type   : 'link',
+					config : {
+						route : 'Chimera.Editor#index',
+						parameters: [
+							{name: 'model', value: model.constructor.type_name},
+						],
+						content: title
+					}
+				});
+			}
+		}
+
+	} else {
+
+		let models = Model.getAllChildren();
+		models.sortByPath(1, 'model_name');
+
+		for (let model of models) {
+			widgets.push({
+				type   : 'link',
+				config : {
+					route : 'Chimera.Editor#index',
+					parameters: [
+						{name: 'model', value: model.type_name},
+					],
+					content: model.title
+				}
+			});
+		}
+	}
+
+	config = [
+		{
+			"type": "navigation",
+			"config": {
+				"widgets": widgets
+			}
+		}
+	];
+
+	this.set('navigation_widgets', config);
+
+	this.renderSegment('chimera/sidebar');
 });

package/lib/chimera_config.js

@@ -5,218 +5,193 @@
  *
  * @constructor
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  0.3.0
+ * @version  1.0.0
  *
  * @param    {Model}   ModelClass
  */
-var ChimeraConfig = Function.inherits('Alchemy.Base', function ChimeraConfig(ModelClass) {
+const Config = Function.inherits('Alchemy.Base', 'Alchemy.Chimera', function Config(ModelClass) {
 
 	// The modal class constructor
 	this.ModelClass = ModelClass;
 
-	// The different action groups
-	this.actionGroups = {};
+	// The different default field sets
+	this.field_sets = {};
 });
 
 /**
- * Show filter fields on index pages
+ * Get the fieldset for a specific action
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
- * @since    0.2.1
- * @version  0.2.1
+ * @deprecated
  *
- * @type     {Boolean}
- */
-ChimeraConfig.setProperty('show_index_filters', true);
-
-/**
- * See if this model's blueprint contains translation fields
- *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  0.2.0
+ * @version  1.0.0
  *
- * @return   {Boolean}
+ * @return   {FieldSet}
  */
-ChimeraConfig.setMethod(function containsTranslations() {
-
-	for (key in this.ModelClass.blueprint) {
-		if (this.ModelClass.blueprint[key].translatable) {
-			return true;
-		}
-	}
-
-	return false;
+Config.setMethod(function getActionFields(name) {
+	return this.getFieldSet(name);
 });
 
 /**
- * Get the fields to show in the index
+ * Get a named fieldset
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  0.2.0
+ * @version  1.0.0
  *
- * @return   {Array}
+ * @return   {FieldSet}
  */
-ChimeraConfig.setMethod(function getIndexFields() {
-
-	var modelName,
-	    fields = [],
-	    key;
-
-	modelName = this.ModelClass.prototype.name;
-
-	return this.ModelClass.blueprint.getSorted();
-
-	for (key in this.ModelClass.blueprint) {
-		fields.push({field: modelName + '.' + key, config: this.ModelClass.blueprint[key]});
-	}
-
-	if (this.containsTranslations()) {
-		fields.push({meta: 'translations'});
-	}
-
-	return fields;
-});
-
-/**
- * Get the fieldgroup for a specific action
- *
- * @author   Jelle De Loecker   <jelle@develry.be>
- * @since    0.2.0
- * @version  0.3.0
- *
- * @return   {Deck}
- */
-ChimeraConfig.setMethod(function getActionFields(name) {
-
-	var group;
+Config.setMethod(function getFieldSet(name) {
 
 	if (name == null) {
 		throw new Error('No action group name was given');
 	}
 
-	if (this.actionGroups[name] == null) {
-		group = new Classes.Alchemy.ChimeraActionFields(this.ModelClass, name);
-		this.actionGroups[name] = group;
-	} else {
-		group = this.actionGroups[name];
-	}
+	let set = this.field_sets[name];
 
-	return group;
-});
-
-/**
- * Get the fields to show in the given type
- *
- * @author   Jelle De Loecker   <jelle@develry.be>
- * @since    0.2.0
- * @version  0.2.0
- *
- * @return   {Array}
- */
-ChimeraConfig.setMethod(function getFields(type) {
-
-	var fields;
-
-	fields = this.ModelClass.blueprint.getSorted();
+	if (!set) {
+		set = new Classes.Alchemy.Criteria.FieldSet(name, this.ModelClass);
+		this.field_sets[name] = set;
+	}
 
-	return this.ModelClass.blueprint.clone();
+	return set;
 });
 
 /**
- * Get a specific field
+ * Get the widget configuration for the given action
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
- * @since    0.2.0
- * @version  0.4.0
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.0.0
+ * @version  1.0.2
  *
- * @param    {String}   actionName   Like edit, list, ...
- * @param    {String}   fieldName    Fieldname path
- * @param    {Object}   record       Optional record
+ * @param    {String}   action
+ * @param    {Conduit}  conduit
  *
- * @return   {ChimeraField}
+ * @return   {Object}
  */
-ChimeraConfig.setMethod(function getField(actionName, fieldName, record) {
-
-	var actionFields,
-	    subschema,
-	    subrecord,
-	    next_name,
-	    pieces,
-	    field,
-	    first,
-	    temp;
-
-	if (fieldName == null || typeof fieldName == 'object') {
-		record = fieldName;
-		fieldName = actionName;
-		actionName = 'edit';
-	}
-
-	pieces = fieldName.split('.');
-
-	// Remove the first piece if it's just this model name
-	if (pieces[0] == this.ModelClass.model_name) {
-		pieces.shift();
-	}
-
-	first = pieces.shift();
-	next_name = first;
+Config.setMethod(function getWidgetConfig(action, conduit) {
 
-	// If the action group isn't defined,
-	// get nothing
-	if (this.actionGroups[actionName] == null) {
-		return;
-	}
+	let fieldset,
+	    widgets;
 
-	field = this.actionGroups[actionName].getField(first);
+	// @TODO: get the possible user-modified widget config!
 
-	// We might need to get something out of the record, too
-	subrecord = record;
+	let result = {};
 
-	while (pieces.length > 0) {
+	if (action == 'edit') {
+		fieldset = this.getFieldSet('edit');
 
-		// Get the subschema of this field
-		subschema = field.fieldType.getSubschema(subrecord, next_name);
+		let field_widgets = [];
 
-		if (!subschema) {
-			return;
-		}
+		let field;
 
-		// Create a new actionfields object
-		actionFields = new Classes.Alchemy.ChimeraActionFields(subschema, actionName);
+		for (field of fieldset) {
 
-		// Get the next fieldname to get
-		next_name = pieces.shift();
-
-		// If this field was a subschema, change the subrecord too
-		if (field.fieldType.type_name == 'schema') {
-			subrecord = Object.path(subrecord, field.path);
+			field_widgets.push({
+				type   : 'alchemy_field',
+				config : {
+					field           : field.name,
+					view            : field.options.view,
+					widget_settings : field.options.widget_settings || {},
+				}
+			});
 		}
 
-		// @TODO: When encountering numbers,
-		// it's probably an arrayable field,
-		// and we can't use that to get the actual field definition
-		if (Number.isInteger(Number(next_name))) {
-
-			if (Array.isArray(subrecord)) {
-				subrecord = subrecord[next_name];
+		field_widgets.push({
+			type   : 'html',
+			config : {
+				html : '<button class="btn btn-submit" type="submit">Save</button>'
 			}
+		});
+
+		widgets = [
+			{
+				"type": "column",
+				"config": {
+					"widgets": [
+						{
+							"type": "header",
+							"config": {
+								"level": 1,
+								"content": this.ModelClass.title + ' edit',
+							}
+						},
+						{
+							type: "row",
+							config: {
+								widgets: [
+									{
+										type: "column",
+										config: {
+											widgets: [
+												{
+													"type": "alchemy_form",
+													"config": {
+														model     : this.ModelClass.type_name,
+														view_type : 'edit',
+														widgets   : field_widgets
+													}
+												}
+											]
+										}
+									},
+									{
+										type: 'column',
+										config: {
+											wrapper_class_names: 'toc-col',
+											widgets: [
+												{
+													type: "table_of_contents",
+													config: {
+														parent_selector: 'alchemy-widgets-row',
+														elements_selector: 'alchemy-field',
+														title_selector: 'alchemy-label'
+													}
+												}
+											]
+										}
+									}
+								]
+							}
+						}
+					]
+				}
+			}
+		];
 
-			// It was a number, skip to the next piece
-			next_name = pieces.shift();
-		}
-
-		// Add the field to get to the actionfields,
-		// so it can init everything it needs to init
-		actionFields.addField(next_name);
-
-		// Get the inited chimerafield we just added
-		field = actionFields.getField(next_name);
+	} else {
+		fieldset = this.getFieldSet('list');
+
+		widgets = [
+			{
+				"type": "column",
+				"config": {
+					"widgets": [
+						{
+							"type": "alchemy_table",
+							"config": {
+								fieldset     : fieldset,
+								page_size    : 50,
+								show_filters : true,
+								id           : 'aft-' + this.ModelClass.type_name,
+								recordsource : {
+									route      : 'Chimera.Editor#records',
+									parameters : {
+										model  : this.ModelClass.type_name
+									}
+								}
+							}
+						}
+					]
+				}
+			}
+		];
 	}
 
-	return field;
+	result.widgets = widgets;
+
+	return result;
 });

package/model/model.js

@@ -9,7 +9,7 @@
  * @type     {Alchemy.ChimeraConfig}
  */
 Model.prepareStaticProperty(function chimera() {
-	return new Classes.Alchemy.ChimeraConfig(this);
+	return new Classes.Alchemy.Chimera.Config(this);
 });
 
 /**

package/package.json

@@ -1,27 +1,23 @@
 {
 	"name": "alchemy-chimera",
 	"description": "Chimera plugin for Alchemy MVC",
-	"version": "0.5.4",
-	"author": "Jelle De Loecker <jelle@develry.be>",
+	"version": "1.0.2",
+	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",
 		"alchemymvc",
 		"plugin",
 		"cms"
 	],
-	"repository": "skerit/alchemy-chimera",
-	"dependencies": {
-		"alchemy-ajatar-theme" : "~1.1.4",
-		"excel-export"         : "0.3.11",
-		"msexcel-builder"      : "0.0.x"
-	},
+	"repository": "11ways/alchemy-chimera",
 	"peerDependencies": {
-		"alchemymvc": "~1.0.6",
-		"alchemy-acl": "~0.5.4",
-		"alchemy-menu": "~0.5.0"
+		"alchemy-acl"  : "~0.7.0",
+		"alchemy-menu" : "~0.6.0",
+		"alchemymvc"   : "~1.1.0",
+		"alchemy-widget": "~0.1.0"
 	},
 	"license": "MIT",
 	"engines": {
-		"node": ">=8.9.0"
+		"node" : ">=12.0.0"
 	}
 }

package/view/chimera/dashboard.hwk

@@ -0,0 +1,8 @@
+{% extend "layouts/chimera_body" %}
+
+{% block "main" %}
+Dashboard Widgets:
+<alchemy-widgets>
+
+</alchemy-widgets>
+{% /block %}

package/view/chimera/editor/index.hwk

@@ -0,0 +1,20 @@
+{% include "layouts/chimera_basics" %}
+
+{% block "main" %}
+	<alchemy-widgets
+		class="main-widgets"
+		#context_variables={% context_variables %}
+		#value={% widget_config %}
+	></alchemy-widgets>
+{% /block %}
+
+{% block "page-actions" %}
+	<a
+		!Route="Chimera.Editor#add"
+		#model={% model_name %}
+		class="btn"
+	>
+		<al-ico type="plus"></al-ico>
+		{%t "new" model=model_name %}
+	</a>
+{% /block %}

package/view/chimera/sidebar.hwk

@@ -0,0 +1,4 @@
+<alchemy-widgets
+	class="sidebar-widgets"
+	#value=<% navigation_widgets %>
+></alchemy-widgets>

package/view/chimera/widgets.hwk

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

package/view/layouts/chimera_base.hwk

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<!-- This puts in all the required styles, scripts, ... -->
+		<% this.foundation({protoblast: true}) %>
+		<% script('chimera/chimera') %>
+	</head>
+	<body>
+		<!-- This is a block you can assign content to -->
+		<he-block data-he-name="base"></he-block>
+
+		<!-- This is an internal element you should not worry about -->
+		<he-bottom></he-bottom>
+	</body>
+</html>

package/view/layouts/chimera_basics.hwk

@@ -0,0 +1,15 @@
+{% extend "layouts/chimera_body" %}
+
+{% if page_title %}
+	{% block "page-title" %}{{ page_title }}{% /block %}
+{% /if %}
+
+{% if window_title %}
+	<% set_title(window_title) %>
+{% elseif page_title %}
+	<% set_title(page_title) %>
+{% /if %}
+
+{% if message %}
+	{% block "page-notification" %}<span class="notification">{{ message }}</span>{% /block %}
+{% /if %}

package/view/layouts/chimera_body.hwk

@@ -0,0 +1,24 @@
+{% extend "layouts/chimera_base" %}
+
+<% style('chimera/chimera') %>
+
+{% block "base" %}
+<div class="chimera-wrapper">
+	<div class="chimera-sidebar">
+		<div class="chimera-page-header">
+			
+		</div>
+		<%= Alchemy.segment('Chimera.Static#sidebar') %>
+	</div>
+	<div class="chimera-content">
+		<div class="chimera-page-header">
+			<div class="page-title" data-he-name="page-title"></div>
+			<div class="page-notification" data-he-name="page-notification"></div>
+			<div class="page-actions" data-he-name="page-actions"></div>
+		</div>
+		<div data-he-name="main" class="chimera-main">
+
+		</div>
+	</div>
+</div>
+{% /block %}