@schukai/monster 3.99.1 → 3.99.3

package/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 
 
+## [3.99.3] - 2025-01-11
+
+### Bug Fixes
+
+- filter init, form readonly
+
+
+
+## [3.99.2] - 2025-01-10
+
+### Bug Fixes
+
+- **datatable:** set order template [#187](https://gitlab.schukai.com/oss/libraries/javascript/monster/issues/187)
+
+
+
 ## [3.99.1] - 2025-01-10
 
 ### Bug Fixes

package/package.json

@@ -1 +1 @@
-{"author":"schukai GmbH","dependencies":{"@floating-ui/dom":"^1.6.13","@popperjs/core":"^2.11.8"},"description":"Monster is a simple library for creating fast, robust and lightweight websites.","homepage":"https://monsterjs.org/","keywords":["framework","web","dom","css","sass","mobile-first","app","front-end","templates","schukai","core","shopcloud","alvine","monster","buildmap","stack","observer","observable","uuid","node","nodelist","css-in-js","logger","log","theme"],"license":"AGPL 3.0","main":"source/monster.mjs","module":"source/monster.mjs","name":"@schukai/monster","repository":{"type":"git","url":"https://gitlab.schukai.com/oss/libraries/javascript/monster.git"},"type":"module","version":"3.99.1"}
+{"author":"schukai GmbH","dependencies":{"@floating-ui/dom":"^1.6.13","@popperjs/core":"^2.11.8"},"description":"Monster is a simple library for creating fast, robust and lightweight websites.","homepage":"https://monsterjs.org/","keywords":["framework","web","dom","css","sass","mobile-first","app","front-end","templates","schukai","core","shopcloud","alvine","monster","buildmap","stack","observer","observable","uuid","node","nodelist","css-in-js","logger","log","theme"],"license":"AGPL 3.0","main":"source/monster.mjs","module":"source/monster.mjs","name":"@schukai/monster","repository":{"type":"git","url":"https://gitlab.schukai.com/oss/libraries/javascript/monster.git"},"type":"module","version":"3.99.3"}

package/source/components/datatable/dataset.mjs

@@ -150,8 +150,13 @@ class DataSet extends CustomElement {
 	 */
 	refresh() {
 		// makes sure that handleDataSourceChanges is called
-		this.setOption("data", {});
-		return Promise.resolve(this);
+		return new Promise((resolve) => {
+			this.setOption("data", {});
+			queueMicrotask(() => {
+				handleDataSourceChanges.call(this);
+				resolve();
+			});
+		});
 	}
 
 	/**

package/source/components/datatable/datasource/rest.mjs

@@ -118,7 +118,7 @@ class Rest extends Datasource {
 	 * @property {string} read.method The method of the rest api
 	 * @property {Object} read.parameters The parameters of the rest api
 	 * @property {Object} read.parameters.filter The filter of the rest api
-	 * @property {Object} read.parameters.orderBy The order by of the rest api
+	 * @property {Object} read.parameters.order The order by of the rest api
 	 * @property {Object} read.parameters.page The page of the rest api
 	 * @property {string} read.mapping.currentPage The current page
 	 * @property {Object} write Write configuration
@@ -131,7 +131,7 @@ class Rest extends Datasource {
 
 		restOptions.read.parameters = {
 			filter: null,
-			orderBy: null,
+			order: null,
 			page: "1",
 		};
 
@@ -175,10 +175,10 @@ class Rest extends Datasource {
 	 *
 	 * @param {string} page
 	 * @param {string} query
-	 * @param {string} orderBy
+	 * @param {string} order
 	 * @return {Rest}
 	 */
-	setParameters({ page, query, orderBy }) {
+	setParameters({ page, query, order }) {
 		const parameters = this.getOption("read.parameters");
 		if (query !== undefined) {
 			parameters.query = `${query}`;
@@ -187,7 +187,7 @@ class Rest extends Datasource {
 
 		// after a query the page is set to 1, so if the page is not set, it is set to 1
 		if (page !== undefined) parameters.page = `${page}`;
-		if (orderBy !== undefined) parameters.order = `${orderBy}`;
+		if (order !== undefined) parameters.order = `${order}`;
 		this.setOption("read.parameters", parameters);
 		return this;
 	}
@@ -305,8 +305,8 @@ class Rest extends Datasource {
 			param.page = "1";
 		}
 
-		if (param.orderBy === null || param.orderBy === undefined) {
-			param.orderBy = "";
+		if (param.order === null || param.order === undefined) {
+			param.order = "";
 		}
 
 		const formatter = new Formatter(param);

package/source/components/datatable/datatable/header.mjs

@@ -21,6 +21,7 @@ import {
 	validateIterable,
 	validateInstance,
 } from "../../../types/validate.mjs";
+import {Formatter} from "../../../text/formatter.mjs";
 
 export {
 	Header,
@@ -104,6 +105,7 @@ class Header extends Base {
 			mode: undefined,
 			grid: undefined,
 			features: undefined,
+			orderTemplate: undefined,
 		};
 	}
 
@@ -238,10 +240,11 @@ class Header extends Base {
 
 /**
  * @private
- * @param {Array<Header>} headers
+ * @param {Header[]} headers
+ * @param {string} delimiter
  * @return {string}
  */
-function createOrderStatement(headers) {
+function createOrderStatement(headers, delimiter = ",") {
 	validateIterable(headers);
 
 	const oderStatement = [];
@@ -254,7 +257,7 @@ function createOrderStatement(headers) {
 		}
 		oderStatement.push(order);
 	}
-	return oderStatement.join(",");
+	return oderStatement.join(delimiter);
 }
 
 /**
@@ -274,7 +277,13 @@ function updateStruct() {
 	}
 
 	if (direction) {
-		order = `${field} ${direction}`.trim();
+		const tmpl = this.getInternal("orderTemplate");
+		const formatter = new Formatter({
+			"direction": direction,
+			"label": label,
+			"field": field,
+		});
+		order = formatter.format(tmpl);
 	}
 
 	this.setInternal("order", order);