@schukai/monster 3.55.0 → 3.55.2

package/CHANGELOG.md

@@ -1,9 +1,32 @@
 
+## [3.55.2] - 2024-01-22
+
+### Bug Fixes
+
+- double fetch [#134](https://gitlab.schukai.com/oss/libraries/javascript/monster/issues/134)
+
+## [3.55.1] - 2024-01-22
+
+### Bug Fixes
+
+- catch errors  [#133](https://gitlab.schukai.com/oss/libraries/javascript/monster/issues/133)
+- catch errors  [#133](https://gitlab.schukai.com/oss/libraries/javascript/monster/issues/133)
+- check parameter  [#132](https://gitlab.schukai.com/oss/libraries/javascript/monster/issues/132)
+### Changes
+
+- release and publish to npm new version 3.55.1
+- doc
+- lint + formatt
+- update nixos to 23-11
+
 ## [3.55.0] - 2023-11-29
 
 ### Add Features
 
 - various changes [#131](https://gitlab.schukai.com/oss/libraries/javascript/monster/issues/131)
+### Changes
+
+- release and publish to npm new version 3.55.0
 
 ## [3.54.0] - 2023-11-23
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schukai/monster",
-  "version": "3.55.0",
+  "version": "3.55.2",
   "description": "Monster is a simple library for creating fast, robust and lightweight websites.",
   "keywords": [
     "framework",

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

@@ -29,6 +29,15 @@ export {Rest};
  */
 const intersectionObserverHandlerSymbol = Symbol("intersectionObserverHandler");
 
+/**
+ * @private
+ * Original at source/components/datatable/datasource/rest.mjs
+ * @type {symbol}
+ */
+const rawDataSymbol = Symbol.for(
+    "@schukai/monster/data/datasource/server/restapi/rawdata",
+);
+
 /**
  * @private
  * @type {symbol}
@@ -98,7 +107,8 @@ class Rest extends Datasource {
      * @property {Object} datatable Datatable definitions
      * @property {string} datatable.id The id of the datatable control
      * @property {Object} response Response definitions
-     * @property {string} response.errorMessagePath The path to the error message in the response
+     * @property {Object} response.path Path definitions (changed in 3.56.0)
+     * @property {string} response.path.message Path to the message (changed in 3.56.0)
      * @property {Object} read Read configuration
      * @property {string} read.url The url of the rest api
      * @property {string} read.method The method of the rest api
@@ -124,7 +134,7 @@ class Rest extends Datasource {
             },
 
             features: {
-                autoInit: true,
+                autoInit: false,
                 filter: false,
             },
 
@@ -136,13 +146,16 @@ class Rest extends Datasource {
             filter: {
                 id: undefined,
             },
-            
+
             datatable: {
                 id: undefined,
             },
 
             response: {
-                errorMessagePath: "sys.message",
+                path: {
+                    message: "sys.message",
+                    code: "sys.code",
+                }
             },
         });
     }
@@ -192,7 +205,6 @@ class Rest extends Datasource {
      * @returns {Promise<never>|*}
      */
     fetch() {
-        const self = this;
         const opt = clone(this.getOption("read"));
         this[dataSourceSymbol].setOption("read", opt);
 
@@ -206,36 +218,32 @@ class Rest extends Datasource {
         url = formatter.format(url);
 
         this[dataSourceSymbol].setOption("read.url", url);
-        
-        return new Promise((resolve, reject) => {
 
-            fireCustomEvent(self, "monster-datasource-fetch", {
-                datasource: self,
+        return new Promise((resolve, reject) => {
+            fireCustomEvent(this, "monster-datasource-fetch", {
+                datasource: this,
             });
 
             setTimeout(() => {
-            self[dataSourceSymbol].read().then((response) => {
-                    fireCustomEvent(self, "monster-datasource-fetched", {
-                        datasource: self,
-                    });
+                this[dataSourceSymbol]
+                    .read()
+                    .then((response) => {
+                        fireCustomEvent(this, "monster-datasource-fetched", {
+                            datasource: this,
+                        });
+
+                        resolve(response);
+                    })
+                    .catch((error) => {
+                        fireCustomEvent(this, "monster-datasource-error", {
+                            error: error,
+                        });
 
-                    resolve(response);
-                    
-                })
-                .catch((error) => {
-                    fireCustomEvent(self, "monster-datasource-error", {
-                        error: error,
+                        addAttributeToken(this, ATTRIBUTE_ERRORMESSAGE, error.toString());
+                        reject(error);
                     });
-
-                    addAttributeToken(self, ATTRIBUTE_ERRORMESSAGE, error.toString());
-                    reject(error);
-                    
-                });
-            },0);
-            
+            }, 0);
         });
-        
-         
     }
 
     /**
@@ -301,7 +309,6 @@ function removeFilter() {
     }
 }
 
-
 /**
  * @private
  */
@@ -320,13 +327,11 @@ function initFilter() {
         );
 
     this[filterObserverSymbol] = new Observer(() => {
-
         const query = filterControl.getOption("query", undefined);
         this.setParameters({query: query});
         this.fetch()
             .then((response) => {
-
-                if(!(response instanceof Response) ){
+                if (!(response instanceof Response)) {
                     throw new Error("Response is not an instance of Response");
                 }
 
@@ -335,25 +340,29 @@ function initFilter() {
                     filterControl?.showSuccess();
                 }
 
+                if (response.bodyUsed === true) {
+                    return handleIntersectionObserver.call(this, response[rawDataSymbol], response, filterControl);
+                }
+
                 response
-                    .json()
-                    .then((json) => {
-                        const path = new Pathfinder(json);
-                        const error = path.getVia(
-                            this.getOption("response.errorMessagePath"),
-                        );
-                        if (error) {
-                            filterControl?.showFailureMessage(error);
-                            return;
+                    .text()
+                    .then((jsonAsText) => {
+                        let json;
+                        try {
+                            json = JSON.parse(jsonAsText);
+                        } catch (e) {
+                            let message = e instanceof Error ? e.message : `${e}`;
+                            filterControl?.showFailureMessage(message);
+                            return Promise.reject(e);
                         }
 
-                        filterControl?.showFailureMessage(e.message);
+                        return handleIntersectionObserver.call(this,json, response, filterControl);
+
+
                     })
                     .catch((e) => {
                         filterControl?.showFailureMessage(e.message);
                     });
-				
-
             })
             .catch((e) => {
                 this.dispatchEvent(
@@ -366,13 +375,36 @@ function initFilter() {
 
                 filterControl?.showFailureMessage(e.message);
                 return Promise.reject(e);
-
             });
     });
 
     filterControl.attachObserver(this[filterObserverSymbol]);
 }
 
+function handleIntersectionObserver(json, response, filterControl) {
+
+    const path = new Pathfinder(json);
+
+    const codePath = this.getOption("response.path.code");
+
+    if (path.exists(codePath)) {
+        const code = `${path.getVia(codePath)}`;
+        if (code && code === "200") {
+            filterControl?.showSuccess();
+            return Promise.resolve(response);
+        }
+
+        const messagePath = this.getOption("response.path.message");
+        if (path.exists(messagePath)) {
+            const message = path.getVia(messagePath);
+            filterControl?.showFailureMessage(message);
+            return Promise.reject(new Error(message));
+        }
+
+        return Promise.reject(new Error("Response code is not 200"));
+    }
+}
+
 /**
  * @private
  */
@@ -389,7 +421,6 @@ function initAutoInit() {
 
     setTimeout(() => {
         this.fetch().catch(() => {
-            
         });
     }, 0);
 }

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

@@ -111,7 +111,7 @@ class Header extends Base {
 	}
 
 	/**
-	 * 
+	 *
 	 * @param direction
 	 */
 	setDirection(direction) {