@webtypen/webframez-core 0.2.42 → 0.2.46

package/.github/workflows/npm-publish.yml

@@ -28,6 +28,10 @@ jobs:
                   registry-url: https://registry.npmjs.org/
             - run: npm install
             - run: npm run build
+            - run: npm whoami
+              env:
+                NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+            - run: npm config get registry
             - run: npm publish --access public
               env:
                   NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

package/dist/DataBuilder/DataBuilder.js

@@ -220,6 +220,11 @@ class DataBuilder {
                         else if (type.forms[form].fields) {
                             newData.forms[form].fields = JSON.parse(JSON.stringify(type.forms[form].fields));
                         }
+                        newData.forms[form].allowDeletion =
+                            (typeof type.forms[form].allowDeletion === "boolean" && type.forms[form].allowDeletion) ||
+                                (typeof type.forms[form].allowDeletion === "function" && (yield type.forms[form].allowDeletion(req)))
+                                ? true
+                                : false;
                     }
                 }
                 else {

package/dist/Database/Model.js

@@ -254,7 +254,9 @@ class Model {
         return model.where(foreignKey, "=", this[localKey !== null && localKey !== void 0 ? localKey : "_id"]);
     }
     buildArrayRelationship(model, localArrayKey, foreignKey) {
-        return model.where(foreignKey !== null && foreignKey !== void 0 ? foreignKey : "_id", "=", { $in: this[localArrayKey] });
+        return model.where(foreignKey !== null && foreignKey !== void 0 ? foreignKey : "_id", "=", {
+            $in: this[localArrayKey] && Array.isArray(this[localArrayKey]) ? this[localArrayKey] : [],
+        });
     }
     /**
      * Returns the model-data without system- and unmapped-fields (new js-object)

package/dist/Datatable/Datatable.js

@@ -324,6 +324,12 @@ class Datatable {
                 if (filterEl && filterEl.ignore) {
                     continue;
                 }
+                if (filterEl.type === "boolean") {
+                    if ((typeof valueClean === "boolean" && valueClean) || (valueClean && valueClean.toString() === "true")) {
+                        out[filterEl && filterEl.mapping && filterEl.mapping.trim() !== "" ? filterEl.mapping : key] = true;
+                        continue;
+                    }
+                }
                 switch (operator) {
                     case "empty":
                         value = null;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@webtypen/webframez-core",
-    "version": "0.2.42",
+    "version": "0.2.46",
     "description": "The core package of the typescript based webframez (web-framework) by webtypen.de",
     "homepage": "https://webtypen.de/",
     "license": "MIT",

package/src/DataBuilder/DataBuilder.ts

@@ -259,7 +259,6 @@ export class DataBuilder {
                     }
 
                     newData.forms[form] = {};
-
                     if (typeof type.forms[form].pageActions === "function") {
                         newData.forms[form].pageActions = await type.forms[form].pageActions(req);
                     } else if (type.forms[form].pageActions) {
@@ -275,6 +274,12 @@ export class DataBuilder {
                     } else if (type.forms[form].fields) {
                         newData.forms[form].fields = JSON.parse(JSON.stringify(type.forms[form].fields));
                     }
+
+                    newData.forms[form].allowDeletion =
+                        (typeof type.forms[form].allowDeletion === "boolean" && type.forms[form].allowDeletion) ||
+                        (typeof type.forms[form].allowDeletion === "function" && (await type.forms[form].allowDeletion(req)))
+                            ? true
+                            : false;
                 }
             } else {
                 newData[key] = type[key];

package/src/Database/Model.ts

@@ -253,7 +253,9 @@ export class Model {
     }
 
     buildArrayRelationship(model: any, localArrayKey: string, foreignKey?: string): any {
-        return model.where(foreignKey ?? "_id", "=", { $in: this[localArrayKey] });
+        return model.where(foreignKey ?? "_id", "=", {
+            $in: this[localArrayKey] && Array.isArray(this[localArrayKey]) ? this[localArrayKey] : [],
+        });
     }
 
     /**

package/src/Datatable/Datatable.ts

@@ -337,6 +337,13 @@ export class Datatable {
                 continue;
             }
 
+            if (filterEl.type === "boolean") {
+                if ((typeof valueClean === "boolean" && valueClean) || (valueClean && valueClean.toString() === "true")) {
+                    out[filterEl && filterEl.mapping && filterEl.mapping.trim() !== "" ? filterEl.mapping : key] = true;
+                    continue;
+                }
+            }
+
             switch (operator) {
                 case "empty":
                     value = null;