alchemy-chimera 1.0.3 → 1.0.4

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.4 (2022-05-31)
+
+* Add delete page
+
 ## 1.0.3 (2022-03-16)
 
 * Make table filtering case insensitive

package/assets/stylesheets/chimera/chimera.scss

@@ -48,11 +48,21 @@ body {
 	border-radius: 2px;
 	font-weight: 500;
 	cursor: pointer;
+	padding: 0.4rem 0.7rem;
+
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+	gap: 0.2rem;
 
 	&:hover {
 		background-color: var(--button-bg-hover-color);
 		//filter: brightness(1.05);
 	}
+
+	al-ico {
+		margin-right: 4px;
+	}
 }
 
 .primary {
@@ -127,7 +137,7 @@ body {
 
 .chimera-content {
 	background-color: var(--main-bg-color);
-	flex: 1 0;
+	flex: 10 0;
 	display: flex;
 	flex-flow: column;
 
@@ -163,6 +173,8 @@ body {
 .chimera-main {
 	flex: 1;
 	padding: 0.5rem;
+	display: flex;
+	flex-flow: column;
 
 	&[data-he-template="chimera/widgets"] {
 		h1 {
@@ -290,7 +302,7 @@ alchemy-field {
 			display: flex;
 
 			button {
-				flex: 1;
+				flex: 10;
 				font-size: 16px;
 				font-weight: 500;
 				color: var(--button-text-color);
@@ -319,10 +331,10 @@ alchemy-field {
 	.field {
 		display: flex;
 		padding: 1rem;
-		flex: 1;
+		flex: 10;
 
 		> * {
-			flex: 1;
+			flex: 10;
 		}
 
 		> alchemy-widget {
@@ -397,7 +409,7 @@ alchemy-field-array {
 .chimera-editor-widgets {
 
 	alchemy-widgets-column.toc-col {
-		flex: 1 1;
+		flex: 2 2;
 	}
 
 	table-of-contents[elements-selector="alchemy-field"] {
@@ -448,4 +460,18 @@ alchemy-field-schema {
 			background-color: var(--button-bg-hover-color);
 		}
 	}
+}
+
+.chimera-confirm-page {
+	flex: 1;
+	justify-content: center;
+	display: flex;
+	align-items: center;
+	flex-flow: column;
+	flex-direction: column;
+
+	.action-buttons {
+		display: flex;
+		gap: 1rem;
+	}
 }

package/config/routes.js

@@ -35,6 +35,14 @@ chimera_section.add({
 	breadcrumb : 'chimera.editor.{model}.edit.{pk}'
 });
 
+// Editor trash action
+chimera_section.add({
+	name       : 'Chimera.Editor#trash',
+	methods    : ['get', 'post'],
+	paths      : '/editor/{model}/trash/{pk}',
+	breadcrumb : 'chimera.editor.{model}.trash.{pk}'
+});
+
 // Editor data action
 chimera_section.add({
 	name       : 'Chimera.Editor#records',

package/controller/chimera_editor_controller.js

@@ -178,12 +178,52 @@ Editor.setAction(async function edit(conduit, model_name, pk_val) {
 	this.render('chimera/widgets');
 });
 
+/**
+ * The trash action
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.0.4
+ * @version  1.0.4
+ *
+ * @param    {Conduit}   conduit
+ * @param    {String}    model_name
+ * @param    {String}    pk_val
+ */
+Editor.setAction(async function trash(conduit, model_name, pk_val) {
+
+	let model = this.getModel(model_name);
+
+	model.translateItems = false;
+
+	let record = await model.findByPk(pk_val);
+
+	if (!record) {
+		return conduit.notFound();
+	}
+
+	let index_url = alchemy.routeUrl('Chimera.Editor#index', {
+		model : model_name
+	});
+
+	if (conduit.method == 'post') {
+		await record.remove();
+		conduit.redirect(index_url);
+		return;
+	}
+
+	let referer = conduit.headers.referer || index_url;
+
+	this.set('back_url', referer);
+	this.set('record', record);
+	this.render('chimera/editor/trash');
+});
+
 /**
  * The records API action
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.0.0
- * @version  1.0.3
+ * @version  1.0.4
  *
  * @param    {Conduit}   conduit
  * @param    {String}    model_name
@@ -241,15 +281,29 @@ Editor.setAction(async function records(conduit, model_name) {
 
 	for (record of records) {
 
-		record.$hold.actions = [
-			{
-				name : 'edit',
-				icon : 'edit',
-				url  : alchemy.routeUrl('Chimera.Editor#edit', {
+		let edit_action = new Classes.Alchemy.Form.Action.Url({
+			name : 'edit',
+			icon : 'edit',
+			placement : ['row', 'context'],
+			url       : alchemy.routeUrl('Chimera.Editor#edit', {
+				model : model_name,
+				pk    : record.$pk,
+			})
+		});
+
+		let trash_action = new Classes.Alchemy.Form.Action.Url({
+			name      : 'trash',
+				icon      : 'trash',
+				placement : ['context'],
+				url       : alchemy.routeUrl('Chimera.Editor#trash', {
 					model : model_name,
 					pk    : record.$pk,
 				})
-			}
+		});
+
+		record.$hold.actions = [
+			edit_action,
+			trash_action,
 		];
 	}
 

package/package.json

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

package/view/chimera/editor/trash.hwk

@@ -0,0 +1,34 @@
+{% include "layouts/chimera_basics" %}
+
+{% block "main" %}
+	<div class="chimera-confirm-page">
+		<h1>{%t "confirm-delete-title" %}</h1>
+
+		<p>
+			{%t "confirm-delete-text" model=record.$model_name title=record.getDisplayFieldValue() %}
+		</p>
+
+		<br>
+
+		<form class="action-buttons">
+			<a class="btn" href={% back_url %}>
+				{%t "cancel" %}
+			</a>
+			<button class="btn danger">
+				<al-ico type="trash" class="fas fa-trash"></al-ico>
+				{%t "delete" %}
+			</button>
+		</form>
+	</div>
+{% /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 %}