TF-3316 Fix inconsistent vacation message

linagora · Dec 11, 2024 · 0fefb12 · 0fefb12
1 parent b240937
commit 0fefb12
Show file tree

Hide file tree

Showing 19 changed files with 25 additions and 33 deletions.
diff --git a/contact/pubspec.lock b/contact/pubspec.lock
@@ -659,8 +659,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: main
-      resolved-ref: bb4ffba9e3aba2cbb60c1173663abf975b521199
+      ref: "bugfix/allow-vacation-response-textbody-null"
+      resolved-ref: "8da70e459a1b5b8dc7a84b1b84d3bd1400247aee"
       url: "https://github.com/linagora/jmap-dart-client.git"
     source: git
     version: "0.3.0"

diff --git a/contact/pubspec.yaml b/contact/pubspec.yaml
@@ -18,7 +18,7 @@ dependencies:
   jmap_dart_client:
     git:
       url: https://github.com/linagora/jmap-dart-client.git
-      ref: main
+      ref: bugfix/allow-vacation-response-textbody-null
 
   ### Dependencies from pub.dev ###
   equatable: 2.0.5

diff --git a/email_recovery/pubspec.lock b/email_recovery/pubspec.lock
@@ -295,8 +295,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: main
-      resolved-ref: bb4ffba9e3aba2cbb60c1173663abf975b521199
+      ref: "bugfix/allow-vacation-response-textbody-null"
+      resolved-ref: "8da70e459a1b5b8dc7a84b1b84d3bd1400247aee"
       url: "https://github.com/linagora/jmap-dart-client.git"
     source: git
     version: "0.3.0"

diff --git a/email_recovery/pubspec.yaml b/email_recovery/pubspec.yaml
@@ -15,7 +15,7 @@ dependencies:
   jmap_dart_client:
     git:
       url: https://github.com/linagora/jmap-dart-client.git
-      ref: main
+      ref: bugfix/allow-vacation-response-textbody-null
 
   ### Dependencies from pub.dev ###
   equatable: 2.0.5

diff --git a/fcm/pubspec.lock b/fcm/pubspec.lock
@@ -295,8 +295,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: main
-      resolved-ref: bb4ffba9e3aba2cbb60c1173663abf975b521199
+      ref: "bugfix/allow-vacation-response-textbody-null"
+      resolved-ref: "8da70e459a1b5b8dc7a84b1b84d3bd1400247aee"
       url: "https://github.com/linagora/jmap-dart-client.git"
     source: git
     version: "0.3.0"

diff --git a/fcm/pubspec.yaml b/fcm/pubspec.yaml
@@ -15,7 +15,7 @@ dependencies:
   jmap_dart_client:
     git:
       url: https://github.com/linagora/jmap-dart-client.git
-      ref: main
+      ref: bugfix/allow-vacation-response-textbody-null
 
   ### Dependencies from pub.dev ###
   equatable: 2.0.5

diff --git a/forward/pubspec.lock b/forward/pubspec.lock
@@ -295,8 +295,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: main
-      resolved-ref: bb4ffba9e3aba2cbb60c1173663abf975b521199
+      ref: "bugfix/allow-vacation-response-textbody-null"
+      resolved-ref: "8da70e459a1b5b8dc7a84b1b84d3bd1400247aee"
       url: "https://github.com/linagora/jmap-dart-client.git"
     source: git
     version: "0.3.0"

diff --git a/forward/pubspec.yaml b/forward/pubspec.yaml
@@ -15,7 +15,7 @@ dependencies:
   jmap_dart_client:
     git:
       url: https://github.com/linagora/jmap-dart-client.git
-      ref: main
+      ref: bugfix/allow-vacation-response-textbody-null
 
   ### Dependencies from pub.dev ###
   equatable: 2.0.5

diff --git a/lib/features/manage_account/presentation/extensions/vacation_response_extension.dart b/lib/features/manage_account/presentation/extensions/vacation_response_extension.dart
@@ -22,7 +22,6 @@ extension VacationResponseExtension on VacationResponse {
       endTime: toDate?.value != null
           ? TimeOfDay.fromDateTime(toDate!.value.toLocal())
           : null,
-      messagePlainText: textBody,
       messageHtmlText: htmlBody,
       subject: subject,
       vacationStopEnabled: toDate != null
@@ -78,15 +77,13 @@ extension VacationResponseExtension on VacationResponse {
     UTCDate? fromDate,
     UTCDate? toDate,
     String? subject,
-    String? textBody,
     String? htmlBody
   }) {
     return VacationResponse(
       isEnabled: isEnabled ?? this.isEnabled,
       fromDate: fromDate ?? this.fromDate,
       toDate: toDate ?? this.toDate,
       subject: subject ?? this.subject,
-      textBody: textBody ?? this.textBody,
       htmlBody: htmlBody ?? this.htmlBody
     );
   }

diff --git a/lib/features/manage_account/presentation/model/vacation/vacation_presentation.dart b/lib/features/manage_account/presentation/model/vacation/vacation_presentation.dart
@@ -14,7 +14,6 @@ class VacationPresentation with EquatableMixin, OptionParamMixin {
   final TimeOfDay? startTime;
   final DateTime? endDate;
   final TimeOfDay? endTime;
-  final String? messagePlainText;
   final String? messageHtmlText;
   final String? subject;
   final bool vacationStopEnabled;
@@ -25,7 +24,6 @@ class VacationPresentation with EquatableMixin, OptionParamMixin {
     this.startTime,
     this.endDate,
     this.endTime,
-    this.messagePlainText,
     this.messageHtmlText,
     this.subject,
     this.vacationStopEnabled = false,
@@ -52,7 +50,6 @@ class VacationPresentation with EquatableMixin, OptionParamMixin {
       startTime: getOptionParam(startTimeOption, startTime),
       endDate: getOptionParam(endDateOption, endDate),
       endTime: getOptionParam(endTimeOption, endTime),
-      messagePlainText: getOptionParam(messagePlainTextOption, messagePlainText),
       messageHtmlText: getOptionParam(messageHtmlTextOption, messageHtmlText),
       subject: getOptionParam(subjectOption, subject),
       vacationStopEnabled: vacationStopEnabled ?? this.vacationStopEnabled
@@ -81,7 +78,6 @@ class VacationPresentation with EquatableMixin, OptionParamMixin {
     endDate,
     endTime,
     vacationStopEnabled,
-    messagePlainText,
     messageHtmlText,
     subject,
   ];
@@ -93,7 +89,6 @@ extension VacationPresentationExtension on VacationPresentation {
       isEnabled: isEnabled,
       fromDate: fromDate != null ? UTCDate(fromDate!.toUtc()) : null,
       toDate: toDate != null ? UTCDate(toDate!.toUtc()) : null,
-      textBody: messagePlainText,
       htmlBody: messageHtmlText,
       subject: subject,
     );

diff --git a/lib/features/manage_account/presentation/vacation/vacation_controller.dart b/lib/features/manage_account/presentation/vacation/vacation_controller.dart
@@ -120,7 +120,7 @@ class VacationController extends BaseController {
   void _initializeValueForVacation(VacationPresentation newVacation) {
     vacationPresentation.value = newVacation;
     subjectTextController.text = newVacation.subject ?? '';
-    updateMessageHtmlText(newVacation.messageHtmlText ?? newVacation.messagePlainText ?? '');
+    updateMessageHtmlText(newVacation.messageHtmlText ?? '');
     if (PlatformInfo.isWeb) {
       _richTextControllerForWeb.editorController.setText(newVacation.messageHtmlText ?? '');
     } else {

diff --git a/model/pubspec.lock b/model/pubspec.lock
@@ -651,8 +651,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: main
-      resolved-ref: bb4ffba9e3aba2cbb60c1173663abf975b521199
+      ref: "bugfix/allow-vacation-response-textbody-null"
+      resolved-ref: "8da70e459a1b5b8dc7a84b1b84d3bd1400247aee"
       url: "https://github.com/linagora/jmap-dart-client.git"
     source: git
     version: "0.3.0"

diff --git a/model/pubspec.yaml b/model/pubspec.yaml
@@ -33,7 +33,7 @@ dependencies:
   jmap_dart_client:
     git:
       url: https://github.com/linagora/jmap-dart-client.git
-      ref: main
+      ref: bugfix/allow-vacation-response-textbody-null
 
   ### Dependencies from pub.dev ###
   cupertino_icons: 1.0.6

diff --git a/pubspec.lock b/pubspec.lock
@@ -1315,8 +1315,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: main
-      resolved-ref: bb4ffba9e3aba2cbb60c1173663abf975b521199
+      ref: "bugfix/allow-vacation-response-textbody-null"
+      resolved-ref: "8da70e459a1b5b8dc7a84b1b84d3bd1400247aee"
       url: "https://github.com/linagora/jmap-dart-client.git"
     source: git
     version: "0.3.0"

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -65,7 +65,7 @@ dependencies:
   jmap_dart_client:
     git:
       url: https://github.com/linagora/jmap-dart-client.git
-      ref: main
+      ref: bugfix/allow-vacation-response-textbody-null
 
   contacts_service:
     git:

diff --git a/rule_filter/pubspec.lock b/rule_filter/pubspec.lock
@@ -295,8 +295,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: main
-      resolved-ref: bb4ffba9e3aba2cbb60c1173663abf975b521199
+      ref: "bugfix/allow-vacation-response-textbody-null"
+      resolved-ref: "8da70e459a1b5b8dc7a84b1b84d3bd1400247aee"
       url: "https://github.com/linagora/jmap-dart-client.git"
     source: git
     version: "0.3.0"

diff --git a/rule_filter/pubspec.yaml b/rule_filter/pubspec.yaml
@@ -15,7 +15,7 @@ dependencies:
   jmap_dart_client:
     git:
       url: https://github.com/linagora/jmap-dart-client.git
-      ref: main
+      ref: bugfix/allow-vacation-response-textbody-null
 
   ### Dependencies from pub.dev ###
   equatable: 2.0.5

diff --git a/server_settings/pubspec.lock b/server_settings/pubspec.lock
@@ -287,8 +287,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: main
-      resolved-ref: bb4ffba9e3aba2cbb60c1173663abf975b521199
+      ref: "bugfix/allow-vacation-response-textbody-null"
+      resolved-ref: "1702db4bc855e7e66c6e1d6b1f2cd0d09c4f1149"
       url: "https://github.com/linagora/jmap-dart-client.git"
     source: git
     version: "0.3.0"

diff --git a/server_settings/pubspec.yaml b/server_settings/pubspec.yaml
@@ -14,7 +14,7 @@ dependencies:
   jmap_dart_client:
     git:
       url: https://github.com/linagora/jmap-dart-client.git
-      ref: main
+      ref: bugfix/allow-vacation-response-textbody-null
 
   ### Dependencies from pub.dev ###
   equatable: 2.0.5