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

TF-597 Fix cannot update null value for identity bcc and replyTo address

Browse Source
This commit is contained in:
dab246
2022-05-27 19:44:54 +07:00
committed by Dat H. Pham
parent de51425510
commit ccb0112bea
3 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/identity_creator/presentation/identity_creator_controller.dart
+23 -21
View File
@@ -176,22 +176,16 @@ class IdentityCreatorController extends BaseController {
replyToOfIdentity.value = listEmailAddressOfReplyTo
.firstWhere((emailAddress) => emailAddress == identity?.replyTo!.first);
} catch(e) {
replyToOfIdentity.value = null;
replyToOfIdentity.value = noneEmailAddress;
}
} else {
replyToOfIdentity.value = null;
replyToOfIdentity.value = noneEmailAddress;
}
log('IdentityCreatorController::_setUpAllFieldEmailAddress(): replyToOfIdentity: ${replyToOfIdentity.value}');
if (identity?.bcc?.isNotEmpty == true) {
try {
bccOfIdentity.value = listEmailAddressOfReplyTo
.firstWhere((emailAddress) => emailAddress == identity?.bcc!.first);
inputBccIdentityController.text = bccOfIdentity.value?.email ?? '';
} catch(e) {
bccOfIdentity.value = null;
}
bccOfIdentity.value = identity?.bcc!.first;
inputBccIdentityController.text = identity?.bcc!.first.emailAddress ?? '';
} else {
bccOfIdentity.value = null;
}
@@ -220,7 +214,7 @@ class IdentityCreatorController extends BaseController {
}
void selectSignatureType(BuildContext context, SignatureType newSignatureType) async {
if (newSignatureType == SignatureType.plainText) {
if (newSignatureType == SignatureType.plainText && !BuildUtils.isWeb) {
final signatureText = await _getSignatureHtmlText();
log('IdentityCreatorController::selectSignatureType(): signatureText: $signatureText');
updateContentHtmlEditor(signatureText);
@@ -243,9 +237,9 @@ class IdentityCreatorController extends BaseController {
Future<String?> _getSignatureHtmlText() async {
if (BuildUtils.isWeb) {
return await signatureHtmlEditorController.getText();
return signatureHtmlEditorController.getText();
} else {
return await signatureHtmlEditorMobileController?.getText();
return signatureHtmlEditorMobileController?.getText();
}
}
@@ -266,20 +260,28 @@ class IdentityCreatorController extends BaseController {
return;
}
final signatureHtmlText = await _getSignatureHtmlText();
final signaturePlainText = signaturePlainEditorController.text;
final signatureHtmlText = BuildUtils.isWeb
? contentHtmlEditor
: await _getSignatureHtmlText();
final bccAddress = bccOfIdentity.value != null && bccOfIdentity.value != noneEmailAddress
? {bccOfIdentity.value!}
: <EmailAddress>{};
final replyToAddress = replyToOfIdentity.value != null && replyToOfIdentity.value != noneEmailAddress
? {replyToOfIdentity.value!}
: <EmailAddress>{};
log('IdentityCreatorController::createNewIdentity(): bccAddress: $bccAddress');
log('IdentityCreatorController::createNewIdentity(): replyToAddress: $replyToAddress');
log('IdentityCreatorController::createNewIdentity(): signaturePlainText: $signaturePlainText');
log('IdentityCreatorController::createNewIdentity(): signatureHtmlText: $signatureHtmlText');
final newIdentity = Identity(
name: _nameIdentity,
email: emailOfIdentity.value?.email,
replyTo: replyToOfIdentity.value != null && replyToOfIdentity.value != noneEmailAddress
? {replyToOfIdentity.value!}
: null,
bcc: bccOfIdentity.value != null && bccOfIdentity.value != noneEmailAddress
? {bccOfIdentity.value!}
: null,
textSignature: Signature(signaturePlainEditorController.text),
replyTo: replyToAddress,
bcc: bccAddress,
textSignature: Signature(signaturePlainText),
htmlSignature: Signature(signatureHtmlText ?? ''));
log('IdentityCreatorController::createNewIdentity(): $newIdentity');
lib/features/identity_creator/presentation/identity_creator_view.dart
+10 -2
View File
@@ -187,7 +187,11 @@ class IdentityCreatorView extends GetWidget<IdentityCreatorController> {
})
..addOnChangeInputSuggestionAction((pattern) {
controller.validateInputBccAddress(context, pattern);
controller.updateBccOfIdentity(EmailAddress(null, pattern));
if (pattern == null || pattern.trim().isEmpty) {
controller.updateBccOfIdentity(null);
} else {
controller.updateBccOfIdentity(EmailAddress(null, pattern));
}
})
..addOnSuggestionCallbackAction((pattern) =>
controller.getSuggestionEmailAddress(pattern)))
@@ -328,7 +332,11 @@ class IdentityCreatorView extends GetWidget<IdentityCreatorController> {
})
..addOnChangeInputSuggestionAction((pattern) {
controller.validateInputBccAddress(context, pattern);
controller.updateBccOfIdentity(EmailAddress(null, pattern));
if (pattern == null || pattern.trim().isEmpty) {
controller.updateBccOfIdentity(null);
} else {
controller.updateBccOfIdentity(EmailAddress(null, pattern));
}
})
..addOnSuggestionCallbackAction((pattern) =>
controller.getSuggestionEmailAddress(pattern)))
model/lib/identity/identity_request_dto.dart
-9
View File
@@ -13,19 +13,10 @@ part 'identity_request_dto.g.dart';
@JsonSerializable()
class IdentityRequestDto with EquatableMixin {
@JsonKey(includeIfNull: false)
final String? name;
@JsonKey(includeIfNull: false)
final Set<EmailAddress>? bcc;
@JsonKey(includeIfNull: false)
final Set<EmailAddress>? replyTo;
@JsonKey(includeIfNull: false)
final Signature? textSignature;
@JsonKey(includeIfNull: false)
final Signature? htmlSignature;
IdentityRequestDto({