@webtypen/webframez-core 0.2.9 → 0.2.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/Datatable/Datatable.d.ts +1 -1
  2. package/dist/Datatable/Datatable.js +63 -58
  3. package/package.json +1 -1
  4. package/src/Datatable/Datatable.ts +7 -4
package/dist/Datatable/Datatable.d.ts CHANGED
@@ -33,5 +33,5 @@ export declare class Datatable {
33
33
  getFilter(req: Request): Promise<any>;
34
34
  getColumns(req: Request): Promise<any>;
35
35
  getOnPressLink(req: Request): Promise<any>;
36
- getFilterMatch(searchOrFilter: any): any;
36
+ getFilterMatch(req: Request, searchOrFilter: any): Promise<any>;
37
37
  }
package/dist/Datatable/Datatable.js CHANGED
@@ -239,69 +239,74 @@ class Datatable {
239
239
  return this.onPressLink;
240
240
  });
241
241
  }
242
- getFilterMatch(searchOrFilter) {
243
- if (!searchOrFilter || Object.keys(searchOrFilter).length < 1) {
244
- return {};
245
- }
246
- const out = {};
247
- for (let key in searchOrFilter) {
248
- let value = undefined;
249
- const entry = searchOrFilter[key];
250
- const valueClean = entry.value !== undefined && entry.value !== "" ? entry.value : undefined;
251
- const operator = entry.operator && entry.operator.trim() !== ""
252
- ? entry.operator
253
- : entry.mode && entry.mode.trim() !== ""
254
- ? entry.mode
255
- : "==";
256
- switch (operator) {
257
- case "empty":
258
- value = null;
259
- break;
260
- case "not_empty":
261
- value = { $ne: null };
262
- break;
263
- case "==":
264
- value = valueClean;
265
- break;
266
- case "!=":
267
- if (valueClean !== undefined) {
268
- value = { $ne: valueClean };
269
- }
270
- break;
271
- case "$gt":
272
- case "$gte":
273
- case "$lt":
274
- case "$lte":
275
- if (valueClean !== undefined) {
276
- value = {
277
- [operator]: entry.type === "number" || entry.type === "numeric" ? parseFloat(valueClean) : valueClean,
278
- };
279
- }
280
- break;
281
- default:
282
- if (valueClean !== undefined) {
283
- if (entry.type === "number" || entry.type === "numeric" || entry.type === "currency") {
284
- value = parseFloat(valueClean.toString().replace(",", "."));
242
+ getFilterMatch(req, searchOrFilter) {
243
+ return __awaiter(this, void 0, void 0, function* () {
244
+ if (!searchOrFilter || Object.keys(searchOrFilter).length < 1) {
245
+ return {};
246
+ }
247
+ const filterDef = yield this.getFilter(req);
248
+ const out = {};
249
+ for (let key in searchOrFilter) {
250
+ let value = undefined;
251
+ const entry = searchOrFilter[key];
252
+ const valueClean = entry.value !== undefined && entry.value !== "" ? entry.value : undefined;
253
+ const operator = entry.operator && entry.operator.trim() !== ""
254
+ ? entry.operator
255
+ : entry.mode && entry.mode.trim() !== ""
256
+ ? entry.mode
257
+ : "==";
258
+ const filterEl = filterDef && filterDef[key] ? filterDef[key] : null;
259
+ const entryType = entry.type && entry.type.trim() !== "" ? entry.type : filterEl && filterEl.type ? filterEl.type : null;
260
+ switch (operator) {
261
+ case "empty":
262
+ value = null;
263
+ break;
264
+ case "not_empty":
265
+ value = { $ne: null };
266
+ break;
267
+ case "==":
268
+ value = valueClean;
269
+ break;
270
+ case "!=":
271
+ if (valueClean !== undefined) {
272
+ value = { $ne: valueClean };
285
273
  }
286
- else if (entry.type === "boolean") {
287
- if (entry.value === "true") {
288
- value = true;
274
+ break;
275
+ case "$gt":
276
+ case "$gte":
277
+ case "$lt":
278
+ case "$lte":
279
+ if (valueClean !== undefined) {
280
+ value = {
281
+ [operator]: entryType === "number" || entryType === "numeric" ? parseFloat(valueClean) : valueClean,
282
+ };
283
+ }
284
+ break;
285
+ default:
286
+ if (valueClean !== undefined) {
287
+ if (entryType === "number" || entryType === "numeric" || entryType === "currency") {
288
+ value = parseFloat(valueClean.toString().replace(",", "."));
289
289
  }
290
- else if (entry.value === "false") {
291
- value = false;
290
+ else if (entryType === "boolean") {
291
+ if (entry.value === "true") {
292
+ value = true;
293
+ }
294
+ else if (entry.value === "false") {
295
+ value = false;
296
+ }
297
+ }
298
+ else {
299
+ value = new RegExp(valueClean, "i");
292
300
  }
293
301
  }
294
- else {
295
- value = new RegExp(valueClean, "i");
296
- }
297
- }
298
- break;
299
- }
300
- if (value !== undefined) {
301
- out[key] = value;
302
+ break;
303
+ }
304
+ if (value !== undefined) {
305
+ out[key] = value;
306
+ }
302
307
  }
303
- }
304
- return out;
308
+ return out;
309
+ });
305
310
  }
306
311
  }
307
312
  exports.Datatable = Datatable;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@webtypen/webframez-core",
3
- "version": "0.2.9",
3
+ "version": "0.2.10",
4
4
  "description": "The core package of the typescript based webframez (web-framework) by webtypen.de",
5
5
  "homepage": "https://webtypen.de/",
6
6
  "license": "MIT",
package/src/Datatable/Datatable.ts CHANGED
@@ -251,11 +251,12 @@ export class Datatable {
251
251
  return this.onPressLink;
252
252
  }
253
253
 
254
- getFilterMatch(searchOrFilter: any) {
254
+ async getFilterMatch(req: Request, searchOrFilter: any) {
255
255
  if (!searchOrFilter || Object.keys(searchOrFilter).length < 1) {
256
256
  return {};
257
257
  }
258
258
 
259
+ const filterDef = await this.getFilter(req);
259
260
  const out: any = {};
260
261
  for (let key in searchOrFilter) {
261
262
  let value: any = undefined;
@@ -268,6 +269,8 @@ export class Datatable {
268
269
  : entry.mode && entry.mode.trim() !== ""
269
270
  ? entry.mode
270
271
  : "==";
272
+ const filterEl = filterDef && filterDef[key] ? filterDef[key] : null;
273
+ const entryType = entry.type && entry.type.trim() !== "" ? entry.type : filterEl && filterEl.type ? filterEl.type : null;
271
274
  switch (operator) {
272
275
  case "empty":
273
276
  value = null;
@@ -289,15 +292,15 @@ export class Datatable {
289
292
  case "$lte":
290
293
  if (valueClean !== undefined) {
291
294
  value = {
292
- [operator]: entry.type === "number" || entry.type === "numeric" ? parseFloat(valueClean) : valueClean,
295
+ [operator]: entryType === "number" || entryType === "numeric" ? parseFloat(valueClean) : valueClean,
293
296
  };
294
297
  }
295
298
  break;
296
299
  default:
297
300
  if (valueClean !== undefined) {
298
- if (entry.type === "number" || entry.type === "numeric" || entry.type === "currency") {
301
+ if (entryType === "number" || entryType === "numeric" || entryType === "currency") {
299
302
  value = parseFloat(valueClean.toString().replace(",", "."));
300
- } else if (entry.type === "boolean") {
303
+ } else if (entryType === "boolean") {
301
304
  if (entry.value === "true") {
302
305
  value = true;
303
306
  } else if (entry.value === "false") {