@recursyve/nice-data-filter-kit 14.3.1 → 14.3.2
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.
- package/esm2020/lib/components/nice-filter-view/components/advanced-filters/advanced-filters.form.mjs +4 -10
- package/fesm2015/recursyve-nice-data-filter-kit.mjs +3 -9
- package/fesm2015/recursyve-nice-data-filter-kit.mjs.map +1 -1
- package/fesm2020/recursyve-nice-data-filter-kit.mjs +3 -9
- package/fesm2020/recursyve-nice-data-filter-kit.mjs.map +1 -1
- package/lib/components/nice-filter-view/components/advanced-filters/advanced-filters.form.d.ts +0 -1
- package/package.json +1 -1
|
@@ -11,7 +11,7 @@ __decorate([
|
|
|
11
11
|
], FilterFormValues.prototype, "value", void 0);
|
|
12
12
|
__decorate([
|
|
13
13
|
Control(),
|
|
14
|
-
AddValidatorIf(({ parent }) => parent.
|
|
14
|
+
AddValidatorIf(({ parent }) => QBFilterUtils.isDoubleInput(parent.operation), Validators.required),
|
|
15
15
|
__metadata("design:type", Object)
|
|
16
16
|
], FilterFormValues.prototype, "secondValue", void 0);
|
|
17
17
|
export class FilterForm {
|
|
@@ -26,7 +26,6 @@ export class FilterForm {
|
|
|
26
26
|
id: rule.id,
|
|
27
27
|
operation: rule.operation,
|
|
28
28
|
condition: "or",
|
|
29
|
-
needsTwoValues,
|
|
30
29
|
values: [
|
|
31
30
|
{
|
|
32
31
|
value: needsTwoValues ? rule.value[0] : rule.value,
|
|
@@ -46,7 +45,6 @@ export class FilterForm {
|
|
|
46
45
|
id: firstRule.id,
|
|
47
46
|
operation: firstRule.operation,
|
|
48
47
|
condition: query.condition,
|
|
49
|
-
needsTwoValues: firstRuleNeedsTwoValues,
|
|
50
48
|
values: query.rules.map((rule) => ({
|
|
51
49
|
value: firstRuleNeedsTwoValues ? rule.value[0] : rule.value,
|
|
52
50
|
secondValue: firstRuleNeedsTwoValues ? rule.value[1] : undefined
|
|
@@ -60,7 +58,7 @@ export class FilterForm {
|
|
|
60
58
|
return {
|
|
61
59
|
id: this.id,
|
|
62
60
|
operation: this.operation,
|
|
63
|
-
value: this.
|
|
61
|
+
value: QBFilterUtils.isDoubleInput(this.operation) ? [value.value, value.secondValue] : value.value
|
|
64
62
|
};
|
|
65
63
|
}
|
|
66
64
|
return {
|
|
@@ -68,7 +66,7 @@ export class FilterForm {
|
|
|
68
66
|
rules: this.values.map((value) => ({
|
|
69
67
|
id: this.id,
|
|
70
68
|
operation: this.operation,
|
|
71
|
-
value: this.
|
|
69
|
+
value: QBFilterUtils.isDoubleInput(this.operation) ? [value.value, value.secondValue] : value.value
|
|
72
70
|
}))
|
|
73
71
|
};
|
|
74
72
|
}
|
|
@@ -83,10 +81,6 @@ __decorate([
|
|
|
83
81
|
Required(),
|
|
84
82
|
__metadata("design:type", String)
|
|
85
83
|
], FilterForm.prototype, "operation", void 0);
|
|
86
|
-
__decorate([
|
|
87
|
-
Control(),
|
|
88
|
-
__metadata("design:type", Boolean)
|
|
89
|
-
], FilterForm.prototype, "needsTwoValues", void 0);
|
|
90
84
|
__decorate([
|
|
91
85
|
Control(),
|
|
92
86
|
Required(),
|
|
@@ -124,4 +118,4 @@ __decorate([
|
|
|
124
118
|
Required(),
|
|
125
119
|
__metadata("design:type", String)
|
|
126
120
|
], AdvancedFiltersForm.prototype, "condition", void 0);
|
|
127
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
121
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"advanced-filters.form.js","sourceRoot":"","sources":["../../../../../../../../projects/nice-data-filter-kit/src/lib/components/nice-filter-view/components/advanced-filters/advanced-filters.form.ts"],"names":[],"mappings":"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","sourcesContent":["import { Validators } from \"@angular/forms\";\nimport { AddValidatorIf, Array, Control, Required } from \"@recursyve/ngx-form-generator\";\nimport { Condition, FilterOperators, QueryModel, QueryRuleModel } from \"../../../../models/query.model\";\nimport { QBFilterUtils } from \"../../../query-builder/utils/qb-filter.utils\";\n\nexport class FilterFormValues {\n    @Control()\n    @Required()\n    public value: any;\n\n    @Control()\n    @AddValidatorIf(({ parent }) => QBFilterUtils.isDoubleInput(parent.operation), Validators.required)\n    public secondValue: any;\n}\n\nexport class FilterForm {\n    @Control()\n    @Required()\n    public id: string;\n\n    @Control()\n    @Required()\n    public operation: string;\n\n    @Control()\n    @Required()\n    public condition: Condition;\n\n    @Array(FilterFormValues)\n    public values: FilterFormValues[];\n\n    constructor(value: QueryModel | QueryRuleModel) {\n        if (!value) {\n            return;\n        }\n\n        if ((value as QueryRuleModel).id) {\n            const rule = value as QueryRuleModel;\n            const needsTwoValues = QBFilterUtils.isDoubleInput(rule.operation);\n            Object.assign(this, {\n                id: rule.id,\n                operation: rule.operation as string,\n                condition: \"or\",\n                values: [\n                    {\n                        value: needsTwoValues ? rule.value[0] : rule.value,\n                        secondValue: needsTwoValues ? rule.value[1] : undefined\n                    }\n                ]\n            });\n            return;\n        }\n\n        const query = value as QueryModel;\n        const firstRule = query.rules[0] as QueryRuleModel;\n        if (!query.rules.every((rule) => (rule as QueryRuleModel).id === firstRule.id)) {\n            return;\n        }\n\n        const firstRuleNeedsTwoValues = QBFilterUtils.isDoubleInput(firstRule.operation);\n        Object.assign(this, {\n            id: firstRule.id,\n            operation: firstRule.operation as string,\n            condition: query.condition,\n            values: query.rules.map((rule: QueryRuleModel) => ({\n                value: firstRuleNeedsTwoValues ? rule.value[0] : rule.value,\n                secondValue: firstRuleNeedsTwoValues ? rule.value[1] : undefined\n            }))\n        });\n        return ;\n    }\n\n    public transform(): QueryModel | QueryRuleModel {\n        if (this.values.length === 1) {\n            const value = this.values[0];\n            return {\n                id: this.id,\n                operation: this.operation as FilterOperators,\n                value: QBFilterUtils.isDoubleInput(this.operation as FilterOperators) ? [value.value, value.secondValue] : value.value\n            };\n        }\n\n        return {\n            condition: this.condition,\n            rules: this.values.map((value) => ({\n                id: this.id,\n                operation: this.operation,\n                value: QBFilterUtils.isDoubleInput(this.operation as FilterOperators) ? [value.value, value.secondValue] : value.value\n            }) as QueryRuleModel)\n        };\n    }\n}\n\nexport class AdvancedFiltersForm {\n    @Array(FilterForm)\n    public rules: FilterForm[];\n\n    @Control({ defaultValue: \"and\" })\n    @Required()\n    public condition: Condition;\n\n    constructor(query: QueryModel) {\n        if (!query) {\n            return;\n        }\n\n        if (!query?.rules) {\n            this.rules = [];\n            this.condition = \"and\";\n        }\n\n        this.condition = query.condition;\n        this.rules = query.rules.map(x => new FilterForm(x));\n    }\n\n    public transform(): QueryModel {\n        return {\n            condition: this.condition,\n            rules: this.rules.map((rule) => rule.transform())\n        };\n    }\n}\n"]}
|
|
@@ -3377,7 +3377,7 @@ __decorate([
|
|
|
3377
3377
|
], FilterFormValues.prototype, "value", void 0);
|
|
3378
3378
|
__decorate([
|
|
3379
3379
|
Control(),
|
|
3380
|
-
AddValidatorIf(({ parent }) => parent.
|
|
3380
|
+
AddValidatorIf(({ parent }) => QBFilterUtils.isDoubleInput(parent.operation), Validators.required),
|
|
3381
3381
|
__metadata("design:type", Object)
|
|
3382
3382
|
], FilterFormValues.prototype, "secondValue", void 0);
|
|
3383
3383
|
class FilterForm {
|
|
@@ -3392,7 +3392,6 @@ class FilterForm {
|
|
|
3392
3392
|
id: rule.id,
|
|
3393
3393
|
operation: rule.operation,
|
|
3394
3394
|
condition: "or",
|
|
3395
|
-
needsTwoValues,
|
|
3396
3395
|
values: [
|
|
3397
3396
|
{
|
|
3398
3397
|
value: needsTwoValues ? rule.value[0] : rule.value,
|
|
@@ -3412,7 +3411,6 @@ class FilterForm {
|
|
|
3412
3411
|
id: firstRule.id,
|
|
3413
3412
|
operation: firstRule.operation,
|
|
3414
3413
|
condition: query.condition,
|
|
3415
|
-
needsTwoValues: firstRuleNeedsTwoValues,
|
|
3416
3414
|
values: query.rules.map((rule) => ({
|
|
3417
3415
|
value: firstRuleNeedsTwoValues ? rule.value[0] : rule.value,
|
|
3418
3416
|
secondValue: firstRuleNeedsTwoValues ? rule.value[1] : undefined
|
|
@@ -3426,7 +3424,7 @@ class FilterForm {
|
|
|
3426
3424
|
return {
|
|
3427
3425
|
id: this.id,
|
|
3428
3426
|
operation: this.operation,
|
|
3429
|
-
value: this.
|
|
3427
|
+
value: QBFilterUtils.isDoubleInput(this.operation) ? [value.value, value.secondValue] : value.value
|
|
3430
3428
|
};
|
|
3431
3429
|
}
|
|
3432
3430
|
return {
|
|
@@ -3434,7 +3432,7 @@ class FilterForm {
|
|
|
3434
3432
|
rules: this.values.map((value) => ({
|
|
3435
3433
|
id: this.id,
|
|
3436
3434
|
operation: this.operation,
|
|
3437
|
-
value: this.
|
|
3435
|
+
value: QBFilterUtils.isDoubleInput(this.operation) ? [value.value, value.secondValue] : value.value
|
|
3438
3436
|
}))
|
|
3439
3437
|
};
|
|
3440
3438
|
}
|
|
@@ -3449,10 +3447,6 @@ __decorate([
|
|
|
3449
3447
|
Required(),
|
|
3450
3448
|
__metadata("design:type", String)
|
|
3451
3449
|
], FilterForm.prototype, "operation", void 0);
|
|
3452
|
-
__decorate([
|
|
3453
|
-
Control(),
|
|
3454
|
-
__metadata("design:type", Boolean)
|
|
3455
|
-
], FilterForm.prototype, "needsTwoValues", void 0);
|
|
3456
3450
|
__decorate([
|
|
3457
3451
|
Control(),
|
|
3458
3452
|
Required(),
|