TF-2085 Add Dropdown select condition group

(cherry picked from commit ec96c105814346e5c9c18efa1643aaadeb1ca77e)
This commit is contained in:
hieubt
2023-09-20 12:35:09 +07:00
committed by Dat Vu
parent 675259a813
commit ebb72f3a6f
15 changed files with 423 additions and 153 deletions
@@ -24,9 +24,9 @@ class RuleConditionGroup extends FilterCondition {
@override
List<Object?> get props => [
conditionCombiner,
conditions,
];
conditionCombiner,
conditions,
];
factory RuleConditionGroup.fromJson(Map<String, dynamic> json) =>
_$RuleConditionGroupFromJson(json);
+3 -11
View File
@@ -15,7 +15,9 @@ part 'tmail_rule.g.dart';
class TMailRule extends Rule {
final RuleId? id;
final String name;
@JsonKey(includeIfNull: false)
final RuleCondition? condition;
@JsonKey(includeIfNull: false)
final RuleConditionGroup? conditionGroup;
final RuleAction action;
@@ -30,17 +32,7 @@ class TMailRule extends Rule {
factory TMailRule.fromJson(Map<String, dynamic> json) =>
_$TMailRuleFromJson(json);
Map<String, dynamic> toJson() {
final result = _$TMailRuleToJson(this);
if (result['condition'] != null) {
result.remove('conditionGroup');
} else {
result.remove('condition');
}
return result;
}
Map<String, dynamic> toJson() => _$TMailRuleToJson(this);
@override
List<Object?> get props => [