eduvia/workavia-mail-front
11
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Hotfix: Temporarily hide Add condition in filter rule for release new version

Browse Source 
(cherry picked from commit 0f2fed32245e1140d0b957dcc4b850d8970bd04b)
This commit is contained in:
dab246
2023-09-14 15:45:48 +07:00
committed by Dat Vu
parent df8cd10760
commit 68240970f6
4 changed files with 103 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/rules_filter_creator/presentation/rules_filter_creator_controller.dart
+16 -10
View File
@@ -184,11 +184,11 @@ class RulesFilterCreatorController extends BaseMailboxController {
); );
listRuleCondition.add(currentRule); listRuleCondition.add(currentRule);
RulesFilterInputFieldArguments newRuleConditionValueArguments = RulesFilterInputFieldArguments( RulesFilterInputFieldArguments newRuleConditionValueArguments = RulesFilterInputFieldArguments(
focusNode: FocusNode(), focusNode: FocusNode(),
errorText: '', errorText: '',
controller: TextEditingController(), controller: TextEditingController(),
); );
listRuleConditionValueArguments.add(newRuleConditionValueArguments); listRuleConditionValueArguments.add(newRuleConditionValueArguments);
emailRuleFilterActionSelected.value = EmailRuleFilterAction.moveMessage; emailRuleFilterActionSelected.value = EmailRuleFilterAction.moveMessage;
_setValueInputField( _setValueInputField(
listRuleConditionValueArguments[0].controller, listRuleConditionValueArguments[0].controller,
@@ -311,10 +311,11 @@ class RulesFilterCreatorController extends BaseMailboxController {
} }
} }
void createNewRuleFilter(BuildContext context) async { void createNewRuleFilter(BuildContext context) {
KeyboardUtils.hideKeyboard(context); KeyboardUtils.hideKeyboard(context);
final errorName = _getErrorStringByInputValue(context, _newRuleName); final errorName = _getErrorStringByInputValue(context, _newRuleName);
log('RulesFilterCreatorController::createNewRuleFilter:errorName: $errorName');
if (errorName?.isNotEmpty == true) { if (errorName?.isNotEmpty == true) {
errorRuleName.value = errorName; errorRuleName.value = errorName;
inputRuleNameFocusNode.requestFocus(); inputRuleNameFocusNode.requestFocus();
@@ -322,23 +323,28 @@ class RulesFilterCreatorController extends BaseMailboxController {
} }
if (listRuleCondition.isNotEmpty) { if (listRuleCondition.isNotEmpty) {
String? errorConditionString;
for (var ruleCondition in listRuleCondition) { for (var ruleCondition in listRuleCondition) {
String? errorString = _getErrorStringByInputValue(context, ruleCondition.value); errorConditionString = _getErrorStringByInputValue(context, ruleCondition.value);
if (errorString != null) { log('RulesFilterCreatorController::createNewRuleFilter:errorConditionString: $errorConditionString');
if (errorConditionString != null) {
int ruleConditionIndex = listRuleCondition.indexOf(ruleCondition); int ruleConditionIndex = listRuleCondition.indexOf(ruleCondition);
RulesFilterInputFieldArguments newRuleConditionValueArguments = RulesFilterInputFieldArguments( RulesFilterInputFieldArguments newRuleConditionValueArguments = RulesFilterInputFieldArguments(
focusNode: listRuleConditionValueArguments[ruleConditionIndex].focusNode, focusNode: listRuleConditionValueArguments[ruleConditionIndex].focusNode,
errorText: errorString, errorText: errorConditionString,
controller: listRuleConditionValueArguments[ruleConditionIndex].controller, controller: listRuleConditionValueArguments[ruleConditionIndex].controller,
); );
listRuleConditionValueArguments[ruleConditionIndex] = newRuleConditionValueArguments; listRuleConditionValueArguments[ruleConditionIndex] = newRuleConditionValueArguments;
listRuleConditionValueArguments[listRuleCondition.indexOf(ruleCondition)].focusNode.requestFocus(); listRuleConditionValueArguments[listRuleCondition.indexOf(ruleCondition)].focusNode.requestFocus();
} }
} }
return; if (errorConditionString?.isNotEmpty == true) {
return;
}
} }
final errorAction = _getErrorStringByInputValue(context, mailboxSelected.value?.getDisplayName(context)); final errorAction = _getErrorStringByInputValue(context, mailboxSelected.value?.getDisplayName(context));
log('RulesFilterCreatorController::createNewRuleFilter:errorAction: $errorAction');
if (errorAction?.isNotEmpty == true) { if (errorAction?.isNotEmpty == true) {
errorRuleActionValue.value = errorAction; errorRuleActionValue.value = errorAction;
if (currentOverlayContext != null && currentContext != null) { if (currentOverlayContext != null && currentContext != null) {
lib/features/rules_filter_creator/presentation/rules_filter_creator_view.dart
+76 -76
View File
@@ -147,31 +147,31 @@ class RuleFilterCreatorView extends GetWidget<RulesFilterCreatorController> {
color: Colors.black)), color: Colors.black)),
const SizedBox(height: 24), const SizedBox(height: 24),
_buildListRuleFilterConditionList(context, RuleFilterConditionScreenType.desktop), _buildListRuleFilterConditionList(context, RuleFilterConditionScreenType.desktop),
Container( // Container(
padding: const EdgeInsets.only(top: 8), // padding: const EdgeInsets.only(top: 8),
child: InkWell( // child: InkWell(
onTap: controller.tapAddCondition, // onTap: controller.tapAddCondition,
child: Row( // child: Row(
crossAxisAlignment: CrossAxisAlignment.center, // crossAxisAlignment: CrossAxisAlignment.center,
children: [ // children: [
SvgPicture.asset( // SvgPicture.asset(
_imagePaths.icAddNewFolder, // _imagePaths.icAddNewFolder,
fit: BoxFit.fill, // fit: BoxFit.fill,
), // ),
const SizedBox(width: 15,), // const SizedBox(width: 15,),
Text( // Text(
AppLocalizations.of(context).addCondition, // AppLocalizations.of(context).addCondition,
maxLines: 1, // maxLines: 1,
style: const TextStyle( // style: const TextStyle(
fontWeight: FontWeight.w500, // fontWeight: FontWeight.w500,
fontSize: 17, // fontSize: 17,
color: AppColor.primaryColor // color: AppColor.primaryColor
) // )
) // )
], // ],
), // ),
), // ),
), // ),
const SizedBox(height: 24), const SizedBox(height: 24),
Text(AppLocalizations.of(context).actionTitleRulesFilter, Text(AppLocalizations.of(context).actionTitleRulesFilter,
overflow: CommonTextStyle.defaultTextOverFlow, overflow: CommonTextStyle.defaultTextOverFlow,
@@ -298,31 +298,31 @@ class RuleFilterCreatorView extends GetWidget<RulesFilterCreatorController> {
color: Colors.black)), color: Colors.black)),
const SizedBox(height: 24), const SizedBox(height: 24),
_buildListRuleFilterConditionList(context, RuleFilterConditionScreenType.tablet), _buildListRuleFilterConditionList(context, RuleFilterConditionScreenType.tablet),
Container( // Container(
padding: const EdgeInsets.only(top: 8), // padding: const EdgeInsets.only(top: 8),
child: InkWell( // child: InkWell(
onTap: controller.tapAddCondition, // onTap: controller.tapAddCondition,
child: Row( // child: Row(
crossAxisAlignment: CrossAxisAlignment.center, // crossAxisAlignment: CrossAxisAlignment.center,
children: [ // children: [
SvgPicture.asset( // SvgPicture.asset(
_imagePaths.icAddNewFolder, // _imagePaths.icAddNewFolder,
fit: BoxFit.fill, // fit: BoxFit.fill,
), // ),
const SizedBox(width: 15,), // const SizedBox(width: 15,),
Text( // Text(
AppLocalizations.of(context).addCondition, // AppLocalizations.of(context).addCondition,
maxLines: 1, // maxLines: 1,
style: const TextStyle( // style: const TextStyle(
fontWeight: FontWeight.w500, // fontWeight: FontWeight.w500,
fontSize: 17, // fontSize: 17,
color: AppColor.primaryColor // color: AppColor.primaryColor
) // )
) // )
], // ],
), // ),
), // ),
), // ),
const SizedBox(height: 24), const SizedBox(height: 24),
Text(AppLocalizations.of(context).actionTitleRulesFilter, Text(AppLocalizations.of(context).actionTitleRulesFilter,
overflow: CommonTextStyle.defaultTextOverFlow, overflow: CommonTextStyle.defaultTextOverFlow,
@@ -455,32 +455,32 @@ class RuleFilterCreatorView extends GetWidget<RulesFilterCreatorController> {
color: Colors.black)), color: Colors.black)),
const SizedBox(height: 24), const SizedBox(height: 24),
_buildListRuleFilterConditionList(context, RuleFilterConditionScreenType.mobile), _buildListRuleFilterConditionList(context, RuleFilterConditionScreenType.mobile),
Container( // Container(
padding: const EdgeInsets.only(top: 12), // padding: const EdgeInsets.only(top: 12),
child: InkWell( // child: InkWell(
onTap: controller.tapAddCondition, // onTap: controller.tapAddCondition,
child: Row( // child: Row(
crossAxisAlignment: CrossAxisAlignment.center, // crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center, // mainAxisAlignment: MainAxisAlignment.center,
children: [ // children: [
SvgPicture.asset( // SvgPicture.asset(
_imagePaths.icAddNewFolder, // _imagePaths.icAddNewFolder,
fit: BoxFit.fill, // fit: BoxFit.fill,
), // ),
const SizedBox(width: 15,), // const SizedBox(width: 15,),
Text( // Text(
AppLocalizations.of(context).addCondition, // AppLocalizations.of(context).addCondition,
maxLines: 1, // maxLines: 1,
style: const TextStyle( // style: const TextStyle(
fontWeight: FontWeight.w500, // fontWeight: FontWeight.w500,
fontSize: 17, // fontSize: 17,
color: AppColor.primaryColor // color: AppColor.primaryColor
) // )
) // )
], // ],
), // ),
), // ),
), // ),
const Padding( const Padding(
padding: EdgeInsets.symmetric(vertical: 12), padding: EdgeInsets.symmetric(vertical: 12),
child: Divider( child: Divider(
lib/features/rules_filter_creator/presentation/widgets/rule_filter_condition_row_builder.dart
+8 -9
View File
@@ -6,7 +6,6 @@ import 'package:rule_filter/rule_filter/rule_condition.dart' as rule_condition;
import 'package:tmail_ui_user/features/base/widget/drop_down_button_widget.dart'; import 'package:tmail_ui_user/features/base/widget/drop_down_button_widget.dart';
import 'package:tmail_ui_user/features/rules_filter_creator/presentation/model/rule_filter_condition_type.dart'; import 'package:tmail_ui_user/features/rules_filter_creator/presentation/model/rule_filter_condition_type.dart';
import 'package:tmail_ui_user/features/rules_filter_creator/presentation/widgets/rule_filter_button_field.dart'; import 'package:tmail_ui_user/features/rules_filter_creator/presentation/widgets/rule_filter_button_field.dart';
import 'package:tmail_ui_user/features/rules_filter_creator/presentation/widgets/rule_filter_condition_remove_button_builder.dart';
import 'package:tmail_ui_user/features/rules_filter_creator/presentation/widgets/rules_filter_input_field_builder.dart'; import 'package:tmail_ui_user/features/rules_filter_creator/presentation/widgets/rules_filter_input_field_builder.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart'; import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
@@ -106,14 +105,14 @@ class RuleFilterConditionRow extends StatelessWidget {
editingController: conditionValueEditingController, editingController: conditionValueEditingController,
) )
), ),
Container( // Container(
padding: const EdgeInsets.only(left: 12), // padding: const EdgeInsets.only(left: 12),
alignment: Alignment.center, // alignment: Alignment.center,
child: RuleFilterConditionRemoveButton( // child: RuleFilterConditionRemoveButton(
tapRemoveRuleFilterConditionCallback: tapRemoveRuleFilterConditionCallback, // tapRemoveRuleFilterConditionCallback: tapRemoveRuleFilterConditionCallback,
imagePath: imagePaths, // imagePath: imagePaths,
) // )
), // ),
], ],
); );
default: default:
lib/features/rules_filter_creator/presentation/widgets/rule_filter_condition_widget.dart
+3 -2
View File
@@ -37,9 +37,10 @@ class RuleFilterConditionWidget extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Slidable( return Slidable(
enabled: ruleFilterConditionScreenType == RuleFilterConditionScreenType.mobile ? true : false, // enabled: ruleFilterConditionScreenType == RuleFilterConditionScreenType.mobile ? true : false,
enabled: false,
endActionPane: ActionPane( endActionPane: ActionPane(
extentRatio: 0.1, extentRatio: 0.1,
motion: const BehindMotion(), motion: const BehindMotion(),
children: [ children: [
CustomSlidableAction( CustomSlidableAction(