@webtypen/webframez-core 0.2.17 → 0.2.19

package/dist/Datatable/Datatable.d.ts

@@ -21,6 +21,7 @@ export declare class Datatable {
     onAttributes?: Function;
     autoApplyFilter: DatatableAutoApplyType;
     autoApplySearch: DatatableAutoApplyType;
+    logAggregation: boolean;
     getInit(req: Request): Promise<any>;
     getAggregation(req: Request): Promise<any>;
     getSubAggregation(req: Request): Promise<any>;

package/dist/Datatable/Datatable.js

@@ -24,6 +24,7 @@ class Datatable {
         this.perPage = 25;
         this.autoApplyFilter = "begin";
         this.autoApplySearch = null;
+        this.logAggregation = false;
     }
     getInit(req) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -143,16 +144,21 @@ class Datatable {
                     }
                 }
             }
-            const connection = yield DBConnection_1.DBConnection.getConnection();
-            const results = yield connection.client
-                .db(null)
-                .collection(yield this.getCollection(req))
-                .aggregate([
+            const aggr = [
                 ...(aggregation ? aggregation : []),
                 ...(!hasSkip ? [{ $skip: page ? page * this.perPage : 0 }] : []),
                 ...(!hasLimit ? [{ $limit: this.perPage }] : []),
                 ...(subAggregation ? subAggregation : []),
-            ], {
+            ];
+            if (this.logAggregation) {
+                const { log } = console;
+                log("[DATATABLE_AGGREGATION" + (req.body._table ? "-" + req.body._table : "") + "]", this.logAggregation);
+            }
+            const connection = yield DBConnection_1.DBConnection.getConnection();
+            const results = yield connection.client
+                .db(null)
+                .collection(yield this.getCollection(req))
+                .aggregate(aggr, {
                 collation: {
                     locale: "de",
                     strength: 2,
@@ -312,7 +318,7 @@ class Datatable {
                         value = { $ne: null };
                         break;
                     case "==":
-                        value = this.formatFilterEntryVal(entry, filterEl);
+                        value = this.formatFilterEntryVal(entry, filterEl, { regex: filterEl && filterEl.regex ? true : false });
                         break;
                     case "!=":
                         const temp = this.formatFilterEntryVal(entry, filterEl);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@webtypen/webframez-core",
-    "version": "0.2.17",
+    "version": "0.2.19",
     "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

@@ -17,6 +17,7 @@ export class Datatable {
     onAttributes?: Function;
     autoApplyFilter: DatatableAutoApplyType = "begin";
     autoApplySearch: DatatableAutoApplyType = null;
+    logAggregation = false;
 
     async getInit(req: Request) {
         const out: any = { table: req.body._table };
@@ -140,24 +141,27 @@ export class Datatable {
             }
         }
 
+        const aggr = [
+            ...(aggregation ? aggregation : []),
+            ...(!hasSkip ? [{ $skip: page ? page * this.perPage : 0 }] : []),
+            ...(!hasLimit ? [{ $limit: this.perPage }] : []),
+            ...(subAggregation ? subAggregation : []),
+        ];
+        if (this.logAggregation) {
+            const { log } = console;
+            log("[DATATABLE_AGGREGATION" + (req.body._table ? "-" + req.body._table : "") + "]", this.logAggregation);
+        }
+
         const connection = await DBConnection.getConnection();
         const results = await connection.client
             .db(null)
             .collection(await this.getCollection(req))
-            .aggregate(
-                [
-                    ...(aggregation ? aggregation : []),
-                    ...(!hasSkip ? [{ $skip: page ? page * this.perPage : 0 }] : []),
-                    ...(!hasLimit ? [{ $limit: this.perPage }] : []),
-                    ...(subAggregation ? subAggregation : []),
-                ],
-                {
-                    collation: {
-                        locale: "de",
-                        strength: 2,
-                    },
-                }
-            )
+            .aggregate(aggr, {
+                collation: {
+                    locale: "de",
+                    strength: 2,
+                },
+            })
             .toArray();
 
         const statsGroup: any = { $group: { _id: null, count: { $sum: 1 } } };
@@ -324,7 +328,7 @@ export class Datatable {
                     value = { $ne: null };
                     break;
                 case "==":
-                    value = this.formatFilterEntryVal(entry, filterEl);
+                    value = this.formatFilterEntryVal(entry, filterEl, { regex: filterEl && filterEl.regex ? true : false });
                     break;
                 case "!=":
                     const temp = this.formatFilterEntryVal(entry, filterEl);