TF-2083 Add/remove conditions in UI

core/lib/presentation/extensions/color_extension.dart

@@ -206,6 +206,7 @@ extension AppColor on Color {
   static const colorClosePopupDialogButton = Color(0xFFAEB7C2);
   static const colorEmptyPopupDialogButton = Color(0xFFFFC107);
   static const colorCancelPopupDialogButton = Color(0xFFEBEDF0);
+  static const colorRemoveRuleFilterConditionButton = Color(0xFFE6E8EC);
 
   static const mapGradientColor = [
     [Color(0xFF21D4FD), Color(0xFFB721FF)],

lib/features/rules_filter_creator/presentation/model/rule_filter_condition_type.dart

@@ -0,0 +1,5 @@
+enum RuleFilterConditionScreenType {
+  mobile,
+  tablet,
+  desktop
+}

lib/features/rules_filter_creator/presentation/model/rules_filter_input_field_arguments.dart

@@ -0,0 +1,21 @@
+import 'package:equatable/equatable.dart';
+import 'package:flutter/material.dart';
+
+class RulesFilterInputFieldArguments with EquatableMixin {
+  final FocusNode focusNode;
+  final String errorText;
+  final TextEditingController controller;
+
+  RulesFilterInputFieldArguments({
+    required this.focusNode,
+    required this.errorText,
+    required this.controller,
+  });
+
+  @override
+  List<Object?> get props => [
+    focusNode,
+    errorText,
+    controller,
+  ];
+}

lib/features/rules_filter_creator/presentation/rules_filter_creator_controller.dart

@@ -4,6 +4,7 @@ import 'package:core/presentation/utils/app_toast.dart';
 import 'package:core/presentation/utils/keyboard_utils.dart';
 import 'package:core/utils/app_logger.dart';
 import 'package:core/utils/platform_info.dart';
+import 'package:equatable/equatable.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:get/get.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
@@ -14,6 +15,7 @@ import 'package:model/model.dart';
 import 'package:rule_filter/rule_filter/rule_action.dart';
 import 'package:rule_filter/rule_filter/rule_append_in.dart';
 import 'package:rule_filter/rule_filter/rule_condition.dart' as rule_condition;
+import 'package:rule_filter/rule_filter/rule_condition.dart';
 import 'package:rule_filter/rule_filter/tmail_rule.dart';
 import 'package:tmail_ui_user/features/base/base_mailbox_controller.dart';
 import 'package:tmail_ui_user/features/destination_picker/presentation/model/destination_picker_arguments.dart';
@@ -38,6 +40,8 @@ import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
 import 'package:tmail_ui_user/main/routes/app_routes.dart';
 import 'package:tmail_ui_user/main/routes/dialog_router.dart';
 import 'package:tmail_ui_user/main/routes/route_navigation.dart';
+import 'package:tmail_ui_user/features/rules_filter_creator/presentation/model/rules_filter_input_field_arguments.dart';
+
 
 class RulesFilterCreatorController extends BaseMailboxController {
 
@@ -48,21 +52,17 @@ class RulesFilterCreatorController extends BaseMailboxController {
   GetAllRulesInteractor? _getAllRulesInteractor;
 
   final errorRuleName = Rxn<String>();
-  final errorRuleConditionValue = Rxn<String>();
   final errorRuleActionValue = Rxn<String>();
-  final ruleConditionFieldSelected = Rxn<rule_condition.Field>();
-  final ruleConditionComparatorSelected = Rxn<rule_condition.Comparator>();
   final emailRuleFilterActionSelected = Rxn<EmailRuleFilterAction>();
   final mailboxSelected = Rxn<PresentationMailbox>();
   final actionType = CreatorActionType.create.obs;
+  final listRuleCondition = RxList<RuleCondition>();
 
   final TextEditingController inputRuleNameController = TextEditingController();
-  final TextEditingController inputConditionValueController = TextEditingController();
   final FocusNode inputRuleNameFocusNode = FocusNode();
-  final FocusNode inputRuleConditionFocusNode = FocusNode();
+  final listRuleConditionValueArguments = RxList<RulesFilterInputFieldArguments>();
 
   String? _newRuleName;
-  String? _newRuleConditionValue;
 
   RulesFilterCreatorArguments? arguments;
   AccountId? _accountId;
@@ -111,9 +111,11 @@ class RulesFilterCreatorController extends BaseMailboxController {
   void onClose() {
     log('RulesFilterCreatorController::onClose():');
     inputRuleNameFocusNode.dispose();
-    inputRuleConditionFocusNode.dispose();
     inputRuleNameController.dispose();
-    inputConditionValueController.dispose();
+    for (var ruleConditionValueArguments in listRuleConditionValueArguments) {
+      ruleConditionValueArguments.focusNode.dispose();
+      ruleConditionValueArguments.controller.dispose();
+    }
     super.onClose();
   }
 
@@ -143,24 +145,55 @@ class RulesFilterCreatorController extends BaseMailboxController {
   void _setUpDefaultValueRuleFilter() {
     switch(actionType.value) {
       case CreatorActionType.create:
-        ruleConditionFieldSelected.value = rule_condition.Field.from;
-        ruleConditionComparatorSelected.value = rule_condition.Comparator.contains;
+        RuleCondition newRuleCondition = RuleCondition(
+          field: rule_condition.Field.from,
+          comparator: rule_condition.Comparator.contains,
+          value: ''
+        );
+        listRuleCondition.add(newRuleCondition);
+        RulesFilterInputFieldArguments newRuleConditionValueArguments = RulesFilterInputFieldArguments(
+          focusNode: FocusNode(),
+          errorText: '',
+          controller: TextEditingController(),
+        );
+        listRuleConditionValueArguments.add(newRuleConditionValueArguments);
         emailRuleFilterActionSelected.value = EmailRuleFilterAction.moveMessage;
         if (_emailAddress != null) {
-          _newRuleConditionValue = _emailAddress?.email;
-          _setValueInputField(inputConditionValueController, _newRuleConditionValue ?? '');
+          RuleCondition firstRuleCondition = RuleCondition(
+            field: rule_condition.Field.from,
+            comparator: rule_condition.Comparator.contains,
+            value: _emailAddress!.email!,
+          );
+          listRuleCondition[0] = firstRuleCondition;
+          listRuleCondition.refresh();
+          _setValueInputField(
+            listRuleConditionValueArguments[0].controller,
+            listRuleCondition[0].value
+          );
         }
         if (_mailboxDestination != null) {
           mailboxSelected.value = _mailboxDestination;
         }
         break;
       case CreatorActionType.edit:
         if (_currentTMailRule != null) {
-          ruleConditionFieldSelected.value = _currentTMailRule!.condition.field;
-          ruleConditionComparatorSelected.value = _currentTMailRule!.condition.comparator;
+          RuleCondition currentRule = RuleCondition(
+            field: _currentTMailRule!.condition.field,
+            comparator: _currentTMailRule!.condition.comparator,
+            value: _currentTMailRule!.condition.value
+          );
+          listRuleCondition.add(currentRule);
+          RulesFilterInputFieldArguments newRuleConditionValueArguments = RulesFilterInputFieldArguments(
+          focusNode: FocusNode(),
+          errorText: '',
+          controller: TextEditingController(),
+        );
+        listRuleConditionValueArguments.add(newRuleConditionValueArguments);
           emailRuleFilterActionSelected.value = EmailRuleFilterAction.moveMessage;
-          _newRuleConditionValue = _currentTMailRule!.condition.value;
-          _setValueInputField(inputConditionValueController, _newRuleConditionValue ?? '');
+          _setValueInputField(
+            listRuleConditionValueArguments[0].controller,
+            listRuleCondition[0].value
+          );
           _newRuleName = _currentTMailRule!.name;
           _setValueInputField(inputRuleNameController, _newRuleName ?? '');
           _getAllMailboxAction();
@@ -195,9 +228,26 @@ class RulesFilterCreatorController extends BaseMailboxController {
     errorRuleName.value = _getErrorStringByInputValue(context, _newRuleName);
   }
 
-  void updateConditionValue(BuildContext context, String? value) {
-    _newRuleConditionValue = value;
-    errorRuleConditionValue.value = _getErrorStringByInputValue(context, _newRuleConditionValue);
+  void updateConditionValue(BuildContext context, String? value, int ruleConditionIndex) {
+    RuleCondition newRuleCondition = RuleCondition(
+      field: listRuleCondition[ruleConditionIndex].field,
+      comparator: listRuleCondition[ruleConditionIndex].comparator,
+      value: value!,
+    );
+    listRuleCondition[ruleConditionIndex] = newRuleCondition;
+    listRuleCondition.refresh();
+    String? errorString = _getErrorStringByInputValue(context, listRuleCondition[ruleConditionIndex].value);
+    RulesFilterInputFieldArguments newRuleConditionValueArguments = RulesFilterInputFieldArguments(
+      focusNode: listRuleConditionValueArguments[ruleConditionIndex].focusNode,
+      errorText: errorString ?? '',
+      controller: listRuleConditionValueArguments[ruleConditionIndex].controller,
+    );
+    if (listRuleConditionValueArguments.length > ruleConditionIndex) {
+      listRuleConditionValueArguments[ruleConditionIndex] = newRuleConditionValueArguments;
+    } else {
+      listRuleConditionValueArguments.add(newRuleConditionValueArguments);
+    }
+    listRuleConditionValueArguments.refresh();
   }
 
   String? _getErrorStringByInputValue(BuildContext context, String? inputValue) {
@@ -213,12 +263,28 @@ class RulesFilterCreatorController extends BaseMailboxController {
     );
   }
 
-  void selectRuleConditionField(rule_condition.Field? newField) {
-    ruleConditionFieldSelected.value = newField;
+  void selectRuleConditionField(rule_condition.Field? newField, int? ruleConditionIndex) {
+    if (newField != null && ruleConditionIndex != null) {
+      RuleCondition newRuleCondition = RuleCondition(
+        field: newField,
+        comparator: listRuleCondition[ruleConditionIndex].comparator,
+        value: listRuleCondition[ruleConditionIndex].value,
+      );
+      listRuleCondition[ruleConditionIndex] = newRuleCondition;
+      listRuleCondition.refresh();
+    }
   }
 
-  void selectRuleConditionComparator(rule_condition.Comparator? newComparator) {
-    ruleConditionComparatorSelected.value = newComparator;
+  void selectRuleConditionComparator(rule_condition.Comparator? newComparator, int? ruleConditionIndex) {
+    if (newComparator != null && ruleConditionIndex != null) {
+      RuleCondition newRuleCondition = RuleCondition(
+        field: listRuleCondition[ruleConditionIndex].field,
+        comparator: newComparator,
+        value: listRuleCondition[ruleConditionIndex].value,
+      );
+      listRuleCondition[ruleConditionIndex] = newRuleCondition;
+      listRuleCondition.refresh();
+    }
   }
 
   void selectEmailRuleFilterAction(EmailRuleFilterAction? newAction) {
@@ -255,10 +321,20 @@ class RulesFilterCreatorController extends BaseMailboxController {
       return;
     }
 
-    final errorCondition = _getErrorStringByInputValue(context, _newRuleConditionValue);
-    if (errorCondition?.isNotEmpty == true) {
-      errorRuleConditionValue.value = errorCondition;
-      inputRuleConditionFocusNode.requestFocus();
+    if (listRuleCondition.isNotEmpty) {
+      for (var ruleCondition in listRuleCondition) {
+        String? errorString = _getErrorStringByInputValue(context, ruleCondition.value);
+        if (errorString != null) {
+          int ruleConditionIndex = listRuleCondition.indexOf(ruleCondition);
+          RulesFilterInputFieldArguments newRuleConditionValueArguments = RulesFilterInputFieldArguments(
+            focusNode: listRuleConditionValueArguments[ruleConditionIndex].focusNode,
+            errorText: errorString,
+            controller: listRuleConditionValueArguments[ruleConditionIndex].controller,
+          );
+          listRuleConditionValueArguments[ruleConditionIndex] = newRuleConditionValueArguments;
+          listRuleConditionValueArguments[listRuleCondition.indexOf(ruleCondition)].focusNode.requestFocus();
+        }
+      }
       return;
     }
 
@@ -273,9 +349,7 @@ class RulesFilterCreatorController extends BaseMailboxController {
       return;
     }
 
-    if (ruleConditionFieldSelected.value == null ||
-        ruleConditionComparatorSelected.value == null ||
-        emailRuleFilterActionSelected.value == null) {
+    if (listRuleCondition.isEmpty || emailRuleFilterActionSelected.value == null) {
       if (currentOverlayContext != null && currentContext != null) {
         _appToast.showToastErrorMessage(
           currentOverlayContext!,
@@ -284,7 +358,11 @@ class RulesFilterCreatorController extends BaseMailboxController {
       return;
     }
 
-    final newTMailRule = TMailRule(
+    late EquatableMixin ruleFilterRequest;
+
+    if (actionType.value == CreatorActionType.create) {
+      for (var ruleCondition in listRuleCondition) {
+        final newTMailRule = TMailRule(
         id: _currentTMailRule?.id,
         name: _newRuleName!,
         action: RuleAction(
@@ -293,20 +371,52 @@ class RulesFilterCreatorController extends BaseMailboxController {
           )
         ),
         condition: rule_condition.RuleCondition(
-          field: ruleConditionFieldSelected.value!,
-          comparator: ruleConditionComparatorSelected.value!,
-          value: _newRuleConditionValue!
+          field: ruleCondition.field,
+          comparator: ruleCondition.comparator,
+          value: ruleCondition.value
         ));
-
-    final ruleFilterRequest =
-    actionType.value == CreatorActionType.create
-      ? CreateNewEmailRuleFilterRequest(_listEmailRule ?? [], newTMailRule)
-      : EditEmailRuleFilterRequest(_listEmailRule?.withIds ?? [], newTMailRule);
+        ruleFilterRequest = CreateNewEmailRuleFilterRequest(_listEmailRule ?? [], newTMailRule);
+      }
+    } else {
+      final newTMailRule = TMailRule(
+        id: _currentTMailRule?.id,
+        name: _newRuleName!,
+        action: RuleAction(
+          appendIn: RuleAppendIn(
+            mailboxIds: [mailboxSelected.value!.id]
+          )
+        ),
+        condition: rule_condition.RuleCondition(
+          field: listRuleCondition[0].field,
+          comparator: listRuleCondition[0].comparator,
+          value: listRuleCondition[0].value
+        ));
+      ruleFilterRequest = EditEmailRuleFilterRequest(_listEmailRule?.withIds ?? [], newTMailRule);
+    }
     popBack(result: ruleFilterRequest);
   }
 
   void closeView(BuildContext context) {
     KeyboardUtils.hideKeyboard(context);
     popBack();
   }
+
+  void tapAddCondition() {
+    RuleCondition newRuleCondition = RuleCondition(
+      field: rule_condition.Field.from,
+      comparator: rule_condition.Comparator.contains,
+      value: ''
+    );
+    listRuleCondition.add(newRuleCondition);
+    listRuleConditionValueArguments.add(RulesFilterInputFieldArguments(
+      focusNode: FocusNode(),
+      errorText: '',
+      controller: TextEditingController(),
+    ));
+  }
+
+  void tapRemoveCondition(int ruleConditionIndex) {
+    listRuleCondition.removeAt(ruleConditionIndex);
+    listRuleConditionValueArguments.removeAt(ruleConditionIndex);
+  }
 }