TF-4236 Fix guard delete UI when no handler is provided.
This commit is contained in:
@@ -88,6 +88,11 @@ class EmailRobot extends CoreRobot {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Future<void> tapRemoveLabelButton(String labelDisplayName) async {
|
Future<void> tapRemoveLabelButton(String labelDisplayName) async {
|
||||||
await $(EmailSubjectWidget).$(LabelWidget).$(TagWidget).$(InkWell).tap();
|
await $(EmailSubjectWidget)
|
||||||
|
.$(LabelWidget)
|
||||||
|
.$(TagWidget)
|
||||||
|
.which<TagWidget>((widget) => widget.text == labelDisplayName)
|
||||||
|
.$(InkWell)
|
||||||
|
.tap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -42,6 +42,7 @@ class ThreadRobot extends CoreRobot {
|
|||||||
);
|
);
|
||||||
await $.waitUntilVisible(email);
|
await $.waitUntilVisible(email);
|
||||||
await email.tap();
|
await email.tap();
|
||||||
|
await $.pump(const Duration(seconds: 2));
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> openMailbox() async {
|
Future<void> openMailbox() async {
|
||||||
|
|||||||
@@ -48,7 +48,6 @@ class RemoveALabelFromEmailScenario extends BaseTestScenario
|
|||||||
await _expectEmailListDisplayedCorrectByTag(labelDisplayName);
|
await _expectEmailListDisplayedCorrectByTag(labelDisplayName);
|
||||||
|
|
||||||
await threadRobot.openEmailWithLabel(labelDisplayName);
|
await threadRobot.openEmailWithLabel(labelDisplayName);
|
||||||
await $.pumpAndSettle(duration: const Duration(seconds: 1));
|
|
||||||
await _expectLabelDisplayedOnEmailSubject(labelDisplayName);
|
await _expectLabelDisplayedOnEmailSubject(labelDisplayName);
|
||||||
|
|
||||||
await emailRobot.tapRemoveLabelButton(labelDisplayName);
|
await emailRobot.tapRemoveLabelButton(labelDisplayName);
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import '../../scenarios/labels/remove_a_label_from_email_scenario.dart';
|
|||||||
void main() {
|
void main() {
|
||||||
TestBase().runPatrolTest(
|
TestBase().runPatrolTest(
|
||||||
description:
|
description:
|
||||||
'Should remove tag on email subject when click click on the cross on a tag in the opened mail',
|
'Should remove tag on email subject when clicking on the cross on a tag in the opened mail',
|
||||||
scenarioBuilder: ($) => RemoveALabelFromEmailScenario($),
|
scenarioBuilder: ($) => RemoveALabelFromEmailScenario($),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -991,9 +991,7 @@ class EmailAPI with HandleSetErrorMixin, MailAPIMixin {
|
|||||||
final isUpdated = emailIdsUpdated.every(ids.contains);
|
final isUpdated = emailIdsUpdated.every(ids.contains);
|
||||||
|
|
||||||
if (emailIdsUpdated.isEmpty || !isUpdated) {
|
if (emailIdsUpdated.isEmpty || !isUpdated) {
|
||||||
for (var id in emailIds) {
|
throw parseErrorForSetResponse(response, emailIds.first.id);
|
||||||
throw parseErrorForSetResponse(response, id.id);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -6,7 +6,7 @@ import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
|||||||
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
|
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
|
||||||
import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
|
import 'package:jmap_dart_client/jmap/mail/email/keyword_identifier.dart';
|
||||||
import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
|
import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
|
||||||
import 'package:tmail_ui_user/features/email/domain/state/labels/remove_a_label_from_an_thread_state.dart';
|
import 'package:tmail_ui_user/features/email/domain/state/labels/remove_a_label_from_a_thread_state.dart';
|
||||||
|
|
||||||
class RemoveALabelFromAThreadInteractor {
|
class RemoveALabelFromAThreadInteractor {
|
||||||
final EmailRepository _emailRepository;
|
final EmailRepository _emailRepository;
|
||||||
|
|||||||
@@ -103,11 +103,15 @@ class _EmailSubjectWidgetState extends State<EmailSubjectWidget> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
List<Widget> _buildLabelWidgets() {
|
List<Widget> _buildLabelWidgets() {
|
||||||
|
final canRemove = widget.onDeleteLabelAction != null;
|
||||||
return _currentLabels
|
return _currentLabels
|
||||||
?.map((label) => LabelWidget.create(
|
?.map((label) => LabelWidget(
|
||||||
label: label,
|
label: label,
|
||||||
removeLabelAction: _buildRemoveLabelWidget(label),
|
actionWidget:
|
||||||
padding: const EdgeInsetsDirectional.only(start: 4, end: 2),
|
canRemove ? _buildRemoveLabelWidget(label) : null,
|
||||||
|
padding: canRemove
|
||||||
|
? const EdgeInsetsDirectional.only(start: 4, end: 2)
|
||||||
|
: null,
|
||||||
))
|
))
|
||||||
.toList() ??
|
.toList() ??
|
||||||
const [];
|
const [];
|
||||||
@@ -125,13 +129,12 @@ class _EmailSubjectWidgetState extends State<EmailSubjectWidget> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void _onDeleteLabelAction(Label labelRemoved) {
|
void _onDeleteLabelAction(Label labelRemoved) {
|
||||||
if (mounted) {
|
if (!mounted || widget.onDeleteLabelAction == null) return;
|
||||||
setState(() {
|
setState(() {
|
||||||
_currentLabels = _currentLabels
|
_currentLabels = _currentLabels
|
||||||
?.where((label) => label.id != labelRemoved.id)
|
?.where((label) => label.id != labelRemoved.id)
|
||||||
.toList();
|
.toList();
|
||||||
});
|
});
|
||||||
widget.onDeleteLabelAction?.call(labelRemoved);
|
widget.onDeleteLabelAction!.call(labelRemoved);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@ import 'package:jmap_dart_client/jmap/account_id.dart';
|
|||||||
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||||
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
|
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
|
||||||
import 'package:labels/labels.dart';
|
import 'package:labels/labels.dart';
|
||||||
import 'package:tmail_ui_user/features/email/domain/state/labels/remove_a_label_from_an_thread_state.dart';
|
import 'package:tmail_ui_user/features/email/domain/state/labels/remove_a_label_from_a_thread_state.dart';
|
||||||
import 'package:tmail_ui_user/features/home/data/exceptions/session_exceptions.dart';
|
import 'package:tmail_ui_user/features/home/data/exceptions/session_exceptions.dart';
|
||||||
import 'package:tmail_ui_user/features/labels/domain/exceptions/label_exceptions.dart';
|
import 'package:tmail_ui_user/features/labels/domain/exceptions/label_exceptions.dart';
|
||||||
import 'package:tmail_ui_user/features/thread_detail/presentation/extension/labels/add_label_to_thread_extension.dart';
|
import 'package:tmail_ui_user/features/thread_detail/presentation/extension/labels/add_label_to_thread_extension.dart';
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ import 'package:model/extensions/keyword_identifier_extension.dart';
|
|||||||
import 'package:model/mailbox/presentation_mailbox.dart';
|
import 'package:model/mailbox/presentation_mailbox.dart';
|
||||||
import 'package:tmail_ui_user/features/base/base_controller.dart';
|
import 'package:tmail_ui_user/features/base/base_controller.dart';
|
||||||
import 'package:tmail_ui_user/features/email/domain/state/add_a_label_to_an_thread_state.dart';
|
import 'package:tmail_ui_user/features/email/domain/state/add_a_label_to_an_thread_state.dart';
|
||||||
import 'package:tmail_ui_user/features/email/domain/state/labels/remove_a_label_from_an_thread_state.dart';
|
import 'package:tmail_ui_user/features/email/domain/state/labels/remove_a_label_from_a_thread_state.dart';
|
||||||
import 'package:tmail_ui_user/features/email/domain/state/mark_as_email_read_state.dart';
|
import 'package:tmail_ui_user/features/email/domain/state/mark_as_email_read_state.dart';
|
||||||
import 'package:tmail_ui_user/features/email/domain/state/print_email_state.dart';
|
import 'package:tmail_ui_user/features/email/domain/state/print_email_state.dart';
|
||||||
import 'package:tmail_ui_user/features/email/domain/usecases/add_a_label_to_a_thread_interactor.dart';
|
import 'package:tmail_ui_user/features/email/domain/usecases/add_a_label_to_a_thread_interactor.dart';
|
||||||
|
|||||||
@@ -5412,7 +5412,7 @@
|
|||||||
"labelName": {}
|
"labelName": {}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"removeLabelFromThreadFailureMessage": "Cannot remove all emails from thread to the \"{labelName}\" label",
|
"removeLabelFromThreadFailureMessage": "Cannot remove all emails in thread from the \"{labelName}\" label",
|
||||||
"@removeLabelFromThreadFailureMessage": {
|
"@removeLabelFromThreadFailureMessage": {
|
||||||
"type": "text",
|
"type": "text",
|
||||||
"placeholders_order": [
|
"placeholders_order": [
|
||||||
|
|||||||
@@ -5735,7 +5735,7 @@ class AppLocalizations {
|
|||||||
|
|
||||||
String removeLabelFromThreadFailureMessage(String labelName) {
|
String removeLabelFromThreadFailureMessage(String labelName) {
|
||||||
return Intl.message(
|
return Intl.message(
|
||||||
'Cannot remove all emails from thread to the "$labelName" label',
|
'Cannot remove all emails in thread from the "$labelName" label',
|
||||||
name: 'removeLabelFromThreadFailureMessage',
|
name: 'removeLabelFromThreadFailureMessage',
|
||||||
args: [labelName],
|
args: [labelName],
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ import 'package:tmail_ui_user/features/email/domain/model/move_action.dart';
|
|||||||
import 'package:tmail_ui_user/features/email/domain/state/add_a_label_to_an_email_state.dart';
|
import 'package:tmail_ui_user/features/email/domain/state/add_a_label_to_an_email_state.dart';
|
||||||
import 'package:tmail_ui_user/features/email/domain/state/add_a_label_to_an_thread_state.dart';
|
import 'package:tmail_ui_user/features/email/domain/state/add_a_label_to_an_thread_state.dart';
|
||||||
import 'package:tmail_ui_user/features/email/domain/state/calendar_event_reply_state.dart';
|
import 'package:tmail_ui_user/features/email/domain/state/calendar_event_reply_state.dart';
|
||||||
import 'package:tmail_ui_user/features/email/domain/state/labels/remove_a_label_from_an_thread_state.dart';
|
import 'package:tmail_ui_user/features/email/domain/state/labels/remove_a_label_from_a_thread_state.dart';
|
||||||
import 'package:tmail_ui_user/features/email/domain/state/mark_as_email_star_state.dart';
|
import 'package:tmail_ui_user/features/email/domain/state/mark_as_email_star_state.dart';
|
||||||
import 'package:tmail_ui_user/features/download/domain/state/parse_email_by_blob_id_state.dart';
|
import 'package:tmail_ui_user/features/download/domain/state/parse_email_by_blob_id_state.dart';
|
||||||
import 'package:tmail_ui_user/features/download/domain/state/preview_email_from_eml_file_state.dart';
|
import 'package:tmail_ui_user/features/download/domain/state/preview_email_from_eml_file_state.dart';
|
||||||
|
|||||||
Reference in New Issue
Block a user