@webtypen/webframez-core 0.2.15 → 0.2.16

package/dist/Datatable/Datatable.d.ts

@@ -1,4 +1,5 @@
 import { Request } from "../Router/Request";
+type DatatableAutoApplyMatchModeType = "begin" | "end" | null;
 export declare class Datatable {
     collection: string | Function;
     aggregation: {
@@ -18,8 +19,8 @@ export declare class Datatable {
     perPage: number;
     onRow?: Function;
     onAttributes?: Function;
-    autoApplyFilter: boolean;
-    autoApplySearch: boolean;
+    autoApplyFilter: DatatableAutoApplyMatchModeType;
+    autoApplySearch: DatatableAutoApplyMatchModeType;
     getInit(req: Request): Promise<any>;
     getAggregation(req: Request): Promise<any>;
     getSubAggregation(req: Request): Promise<any>;
@@ -38,3 +39,4 @@ export declare class Datatable {
     private formatFilterEntryVal;
     getFilterMatch(req: Request, searchOrFilter: any): Promise<any>;
 }
+export {};

package/dist/Datatable/Datatable.js

@@ -22,8 +22,8 @@ class Datatable {
         this.onPressLink = null;
         this.exports = null;
         this.perPage = 25;
-        this.autoApplyFilter = true;
-        this.autoApplySearch = false;
+        this.autoApplyFilter = "begin";
+        this.autoApplySearch = null;
     }
     getInit(req) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -66,10 +66,20 @@ class Datatable {
         return __awaiter(this, void 0, void 0, function* () {
             const aggr = typeof this.aggregation === "function" ? yield this.aggregation(req) : this.aggregation;
             if (this.autoApplyFilter && req.body.filter && typeof req.body.filter === "object") {
-                return [{ $match: Object.assign({}, this.getFilterMatch(req, req.body.filter)) }];
+                if (this.autoApplyFilter === "begin") {
+                    return [{ $match: Object.assign({}, this.getFilterMatch(req, req.body.filter)) }, ...aggr];
+                }
+                else if (this.autoApplyFilter === "end") {
+                    return [...aggr, { $match: Object.assign({}, this.getFilterMatch(req, req.body.filter)) }];
+                }
             }
             else if (this.autoApplySearch && req.body.search && typeof req.body.search === "object") {
-                return [{ $match: Object.assign({}, this.getFilterMatch(req, req.body.search)) }];
+                if (this.autoApplySearch === "begin") {
+                    return [{ $match: Object.assign({}, this.getFilterMatch(req, req.body.search)) }, ...aggr];
+                }
+                else if (this.autoApplySearch === "end") {
+                    return [...aggr, { $match: Object.assign({}, this.getFilterMatch(req, req.body.search)) }];
+                }
             }
             return aggr;
         });

package/package.json

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

package/src/Datatable/Datatable.ts

@@ -2,6 +2,8 @@ import { DBConnection } from "../Database/DBConnection";
 import { NumericFunctions } from "../Functions/NumericFunctions";
 import { Request } from "../Router/Request";
 
+type DatatableAutoApplyMatchModeType = "begin" | "end" | null;
+
 export class Datatable {
     collection: string | Function = "";
     aggregation: { [key: string]: any } | Function | null = null;
@@ -13,8 +15,8 @@ export class Datatable {
     perPage: number = 25;
     onRow?: Function;
     onAttributes?: Function;
-    autoApplyFilter = true;
-    autoApplySearch = false;
+    autoApplyFilter: DatatableAutoApplyMatchModeType = "begin";
+    autoApplySearch: DatatableAutoApplyMatchModeType = null;
 
     async getInit(req: Request) {
         const out: any = { table: req.body._table };
@@ -64,9 +66,17 @@ export class Datatable {
     async getAggregation(req: Request) {
         const aggr = typeof this.aggregation === "function" ? await this.aggregation(req) : this.aggregation;
         if (this.autoApplyFilter && req.body.filter && typeof req.body.filter === "object") {
-            return [{ $match: { ...this.getFilterMatch(req, req.body.filter) } }];
+            if (this.autoApplyFilter === "begin") {
+                return [{ $match: { ...this.getFilterMatch(req, req.body.filter) } }, ...aggr];
+            } else if (this.autoApplyFilter === "end") {
+                return [...aggr, { $match: { ...this.getFilterMatch(req, req.body.filter) } }];
+            }
         } else if (this.autoApplySearch && req.body.search && typeof req.body.search === "object") {
-            return [{ $match: { ...this.getFilterMatch(req, req.body.search) } }];
+            if (this.autoApplySearch === "begin") {
+                return [{ $match: { ...this.getFilterMatch(req, req.body.search) } }, ...aggr];
+            } else if (this.autoApplySearch === "end") {
+                return [...aggr, { $match: { ...this.getFilterMatch(req, req.body.search) } }];
+            }
         }
         return aggr;
     }