TF-3478 Use ComposerManager to open & close single composer

Signed-off-by: dab246 <tdvu@linagora.com>
2025-02-12 02:30:21 +07:00
parent 9a25d3c258
commit 49fe89a949
13 changed files with 435 additions and 170 deletions
@@ -221,7 +221,7 @@ abstract class BaseController extends GetxController

  void _handleBadCredentialsException() {
    log('$runtimeType::_handleBadCredentialsException:');
-    if (!twakeAppManager.isComposerOpened) {
+    if (!twakeAppManager.hasComposer) {
      _performReconnection();
      return;
    }
@@ -36,6 +36,7 @@ import 'package:tmail_ui_user/features/email/domain/repository/email_repository.
 import 'package:tmail_ui_user/features/email/domain/usecases/get_email_content_interactor.dart';
 import 'package:tmail_ui_user/features/email/domain/usecases/print_email_interactor.dart';
 import 'package:tmail_ui_user/features/email/domain/usecases/transform_html_email_content_interactor.dart';
+import 'package:tmail_ui_user/features/email/presentation/model/composer_arguments.dart';
 import 'package:tmail_ui_user/features/mailbox/data/datasource/mailbox_datasource.dart';
 import 'package:tmail_ui_user/features/mailbox/data/datasource/state_datasource.dart';
 import 'package:tmail_ui_user/features/mailbox/data/datasource_impl/mailbox_cache_datasource_impl.dart';
@@ -47,6 +48,9 @@ import 'package:tmail_ui_user/features/mailbox/data/network/mailbox_api.dart';
 import 'package:tmail_ui_user/features/mailbox/data/network/mailbox_isolate_worker.dart';
 import 'package:tmail_ui_user/features/mailbox/data/repository/mailbox_repository_impl.dart';
 import 'package:tmail_ui_user/features/mailbox/domain/repository/mailbox_repository.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/session_storage_composer_datasource.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource_impl/session_storage_composer_datasoure_impl.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/data/repository/composer_cache_repository_impl.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/repository/composer_cache_repository.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/remove_composer_cache_on_web_interactor.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/usecases/get_all_identities_interactor.dart';
@@ -73,8 +77,9 @@ import 'package:uuid/uuid.dart';
 class ComposerBindings extends BaseBindings {

  final String? composerId;
+  final ComposerArguments? composerArguments;

-  ComposerBindings({this.composerId});
+  ComposerBindings({this.composerId, this.composerArguments});

  @override
  void bindingsDataSourceImpl() {
@@ -184,6 +189,10 @@ class ComposerBindings extends BaseBindings {
      Get.find<ApplicationManager>(),
      Get.find<Uuid>(),
    ), tag: composerId);
+    Get.lazyPut(
+      () => ComposerCacheRepositoryImpl(Get.find<SessionStorageComposerDatasource>(tag: composerId)),
+      tag: composerId,
+    );
    Get.lazyPut(
      () => ContactRepositoryImpl(Get.find<ContactDataSource>(tag: composerId)),
      tag: composerId,
@@ -214,6 +223,10 @@ class ComposerBindings extends BaseBindings {
      () => Get.find<ComposerRepositoryImpl>(tag: composerId),
      tag: composerId,
    );
+    Get.lazyPut<ComposerCacheRepository>(
+      () => Get.find<ComposerCacheRepositoryImpl>(tag: composerId),
+      tag: composerId,
+    );
    Get.lazyPut<ContactRepository>(
      () => Get.find<ContactRepositoryImpl>(tag: composerId),
      tag: composerId,
@@ -308,6 +321,8 @@ class ComposerBindings extends BaseBindings {
      Get.find<CreateNewAndSendEmailInteractor>(tag: composerId),
      Get.find<CreateNewAndSaveEmailToDraftsInteractor>(tag: composerId),
      Get.find<PrintEmailInteractor>(tag: composerId),
+      composerId: composerId,
+      composerArgs: composerArguments,
    ), tag: composerId);
  }

@@ -155,6 +155,8 @@ class ComposerController extends BaseController
  final CreateNewAndSendEmailInteractor _createNewAndSendEmailInteractor;
  final CreateNewAndSaveEmailToDraftsInteractor _createNewAndSaveEmailToDraftsInteractor;
  final PrintEmailInteractor printEmailInteractor;
+  final String? composerId;
+  final ComposerArguments? composerArgs;

  GetAllAutoCompleteInteractor? _getAllAutoCompleteInteractor;
  GetAutoCompleteInteractor? _getAutoCompleteInteractor;
@@ -222,7 +224,7 @@ class ComposerController extends BaseController
  int? _savedEmailDraftHash;
  bool _restoringSignatureButton = false;
  GlobalKey? responsiveContainerKey;
-  
+
  @visibleForTesting
  bool get restoringSignatureButton => _restoringSignatureButton;

@@ -247,6 +249,10 @@ class ComposerController extends BaseController
    this._createNewAndSendEmailInteractor,
    this._createNewAndSaveEmailToDraftsInteractor,
    this.printEmailInteractor,
+    {
+      this.composerId,
+      this.composerArgs,
+    }
  );

  @override
@@ -254,11 +260,11 @@ class ComposerController extends BaseController
    super.onInit();
    if (PlatformInfo.isWeb) {
      responsiveContainerKey = GlobalKey();
-      richTextWebController = getBinding<RichTextWebController>();
+      richTextWebController = getBinding<RichTextWebController>(tag: composerId);
      responsiveContainerKey = GlobalKey();
      menuMoreOptionController = CustomPopupMenuController();
    } else {
-      richTextMobileTabletController = getBinding<RichTextMobileTabletController>();
+      richTextMobileTabletController = getBinding<RichTextMobileTabletController>(tag: composerId);
    }
    createFocusNodeInput();
    scrollControllerEmailAddress.addListener(_scrollControllerEmailAddressListener);
@@ -609,7 +615,7 @@ class ComposerController extends BaseController
  void _initEmail() {
    _isEmailBodyLoaded = false;
    final arguments = PlatformInfo.isWeb
-      ? mailboxDashBoardController.composerArguments
+      ? composerArgs
      : Get.arguments;
    if (arguments is ComposerArguments) {
      composerArguments.value = arguments;
@@ -1599,7 +1605,10 @@ class ComposerController extends BaseController
      if (closeOverlays) {
        popBack();
      }
-      mailboxDashBoardController.closeComposerOverlay(result: result);
+      mailboxDashBoardController.closeComposerOnWeb(
+        composerId: composerId,
+        result: result,
+      );
    } else {
      popBack(result: result, closeOverlays: closeOverlays);
    }
@@ -0,0 +1,26 @@
+
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:tmail_ui_user/features/composer/presentation/composer_view_web.dart';
+import 'package:tmail_ui_user/features/composer/presentation/manager/composer_manager.dart';
+
+class ComposerOverlayView extends StatefulWidget {
+  const ComposerOverlayView({super.key});
+
+  @override
+  State<ComposerOverlayView> createState() => _ComposerOverlayViewState();
+}
+
+class _ComposerOverlayViewState extends State<ComposerOverlayView> {
+
+  final ComposerManager _composerManager = Get.find<ComposerManager>();
+
+  @override
+  Widget build(BuildContext context) {
+    return Obx(() {
+      if (!_composerManager.hasComposer) return const SizedBox.shrink();
+
+      return ComposerView(composerId: _composerManager.singleComposerId);
+    });
+  }
+}
@@ -2,27 +2,34 @@ import 'package:core/utils/app_logger.dart';
 import 'package:get/get.dart';
 import 'package:tmail_ui_user/features/composer/presentation/composer_bindings.dart';
 import 'package:tmail_ui_user/features/composer/presentation/composer_controller.dart';
+import 'package:tmail_ui_user/features/email/presentation/model/composer_arguments.dart';

 class ComposerManager extends GetxController {
  final RxMap<String, ComposerController> composers = <String, ComposerController>{}.obs;

-  String addComposer() {
+  void addComposer(ComposerArguments composerArguments) {
    final String id = DateTime.now().millisecondsSinceEpoch.toString();
    log('ComposerManager::addComposer:ID = $id');
-    ComposerBindings(composerId: id).dependencies();
-    final ComposerController controller = Get.find<ComposerController>(tag: id);
-    composers[id] = controller;
-    return id;
+    ComposerBindings(
+      composerId: id,
+      composerArguments: composerArguments,
+    ).dependencies();
+    composers[id] = Get.find<ComposerController>(tag: id);
+    log('ComposerManager::addComposer:Success');
  }

  void removeComposer(String id) {
+    log('ComposerManager::removeComposer:ID = $id');
    if (composers.containsKey(id)) {
      ComposerBindings(composerId: id).dispose();
      composers.remove(id);
+      log('ComposerManager::removeComposer:Success');
    }
  }

+  bool get hasComposer => composers.isNotEmpty;
+
  List<String> get composerIds => composers.keys.toList();

-  ComposerController? getComposer(String id) => composers[id];
+  String get singleComposerId => composerIds.first;
 }
@@ -12,6 +12,7 @@ import 'package:tmail_ui_user/features/caching/utils/session_storage_manager.dar
 import 'package:tmail_ui_user/features/composer/data/repository/contact_repository_impl.dart';
 import 'package:tmail_ui_user/features/composer/domain/repository/contact_repository.dart';
 import 'package:tmail_ui_user/features/composer/domain/usecases/send_email_interactor.dart';
+import 'package:tmail_ui_user/features/composer/presentation/manager/composer_manager.dart';
 import 'package:tmail_ui_user/features/email/data/datasource/email_datasource.dart';
 import 'package:tmail_ui_user/features/email/data/datasource/html_datasource.dart';
 import 'package:tmail_ui_user/features/email/data/datasource/print_file_datasource.dart';
@@ -167,6 +168,8 @@ class MailboxDashBoardBindings extends BaseBindings {
      Get.find<GetSpamReportStateInteractor>(),
      Get.find<GetSpamMailboxCachedInteractor>()));

+    Get.lazyPut(() => ComposerManager());
+
    Get.put(MailboxDashBoardController(
      Get.find<MoveToMailboxInteractor>(),
      Get.find<DeleteEmailPermanentlyInteractor>(),
@@ -193,6 +196,7 @@ class MailboxDashBoardBindings extends BaseBindings {
      Get.find<GetRestoredDeletedMessageInterator>(),
      Get.find<RemoveComposerCacheOnWebInteractor>(),
      Get.find<GetAllIdentitiesInteractor>(),
+      Get.find<ComposerManager>(),
    ));
    Get.put(AdvancedFilterController());
  }
@@ -44,6 +44,7 @@ import 'package:tmail_ui_user/features/composer/presentation/composer_bindings.d
 import 'package:tmail_ui_user/features/composer/presentation/composer_view.dart';
 import 'package:tmail_ui_user/features/composer/presentation/extensions/email_action_type_extension.dart';
 import 'package:tmail_ui_user/features/composer/presentation/extensions/list_identities_extension.dart';
+import 'package:tmail_ui_user/features/composer/presentation/manager/composer_manager.dart';
 import 'package:tmail_ui_user/features/composer/presentation/model/compose_action_mode.dart';
 import 'package:tmail_ui_user/features/contact/presentation/model/contact_arguments.dart';
 import 'package:tmail_ui_user/features/destination_picker/presentation/model/destination_picker_arguments.dart';
@@ -106,7 +107,6 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/set_error_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/extensions/update_current_emails_flags_extension.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/mixin/user_setting_popup_menu_mixin.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/composer_overlay_state.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/download/download_task_state.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/draggable_app_state.dart';
@@ -216,6 +216,7 @@ class MailboxDashBoardController extends ReloadableController
  final GetRestoredDeletedMessageInterator _getRestoredDeletedMessageInteractor;
  final RemoveComposerCacheOnWebInteractor _removeComposerCacheOnWebInteractor;
  final GetAllIdentitiesInteractor _getAllIdentitiesInteractor;
+  final ComposerManager _composerManager;

  GetAllVacationInteractor? _getAllVacationInteractor;
  UpdateVacationInteractor? _updateVacationInteractor;
@@ -238,7 +239,6 @@ class MailboxDashBoardController extends ReloadableController
  final currentSelectMode = SelectMode.INACTIVE.obs;
  final filterMessageOption = FilterMessageOption.all.obs;
  final listEmailSelected = <PresentationEmail>[].obs;
-  final composerOverlayState = ComposerOverlayState.inActive.obs;
  final viewStateMailboxActionProgress = Rx<Either<Failure, Success>>(Right(UIState.idle));
  final vacationResponse = Rxn<VacationResponse>();
  final routerParameters = Rxn<Map<String, dynamic>>();
@@ -258,7 +258,6 @@ class MailboxDashBoardController extends ReloadableController
  final emailsInCurrentMailbox = <PresentationEmail>[].obs;
  final listResultSearch = RxList<PresentationEmail>();
  PresentationMailbox? outboxMailbox;
-  ComposerArguments? composerArguments;
  List<Identity>? _identities;
  jmap.State? _currentEmailState;
  ScrollController? listSearchFilterScrollController;
@@ -309,6 +308,7 @@ class MailboxDashBoardController extends ReloadableController
    this._getRestoredDeletedMessageInteractor,
    this._removeComposerCacheOnWebInteractor,
    this._getAllIdentitiesInteractor,
+    this._composerManager,
  );

  @override
@@ -497,8 +497,7 @@ class MailboxDashBoardController extends ReloadableController

  @override
  Future<void> onBeforeUnloadBrowserListener(html.Event event) async {
-    if (event is html.BeforeUnloadEvent
-        && composerOverlayState.value == ComposerOverlayState.active) {
+    if (event is html.BeforeUnloadEvent && twakeAppManager.hasComposer) {
      event.preventDefault();
    }
  }
@@ -1685,18 +1684,16 @@ class MailboxDashBoardController extends ReloadableController
    emailUIAction.value = newAction;
  }

-  void openComposerOverlay(ComposerArguments? arguments) {
-    composerArguments = arguments;
-    ComposerBindings().dependencies();
-    composerOverlayState.value = ComposerOverlayState.active;
-    twakeAppManager.openComposerOnWeb();
-  }
-
-  void closeComposerOverlay({dynamic result}) async {
-    composerArguments = null;
-    ComposerBindings().dispose();
-    composerOverlayState.value = ComposerOverlayState.inActive;
-    twakeAppManager.closeComposerOnWeb();
+  Future<void> closeComposerOnWeb({
+    required String? composerId,
+    dynamic result,
+  }) async {
+    if (composerId != null) {
+      _composerManager.removeComposer(composerId);
+    }
+    if (!_composerManager.hasComposer) {
+      twakeAppManager.setHasComposer(false);
+    }
    if (result is SendingEmailArguments) {
      handleSendEmailAction(result);
    } else if (result is SendEmailSuccess ||
@@ -1824,55 +1821,64 @@ class MailboxDashBoardController extends ReloadableController
    }
  }

-  void goToComposer(ComposerArguments arguments) async {
+  void goToComposer(ComposerArguments arguments) {
    final argumentsWithIdentity = arguments.withIdentity(
      identities: List.from(_identities ?? []),
      selectedIdentityId: arguments.selectedIdentityId);

    if (PlatformInfo.isWeb) {
-      if (composerOverlayState.value == ComposerOverlayState.inActive) {
-        openComposerOverlay(argumentsWithIdentity);
+      _openComposerOnWeb(argumentsWithIdentity);
+    } else {
+      _openComposerOnMobile(argumentsWithIdentity);
+    }
+  }
+
+  void _openComposerOnWeb(ComposerArguments composerArguments) {
+    if (_composerManager.composers.isNotEmpty) return;
+
+    _composerManager.addComposer(composerArguments);
+    twakeAppManager.setHasComposer(true);
+  }
+
+  Future<void> _openComposerOnMobile(ComposerArguments arguments) async {
+    BackButtonInterceptor.removeByName(AppRoutes.dashboard);
+
+    bool isTabletPlatform = currentContext != null
+        && !responsiveUtils.isScreenWithShortestSide(currentContext!);
+    dynamic result;
+
+    if (isTabletPlatform) {
+      if (PlatformInfo.isIOS) {
+        dispatchEmailUIAction(HideEmailContentViewAction());
+      }
+
+      result = await Get.to(
+        () => const ComposerView(),
+        binding: ComposerBindings(),
+        opaque: false,
+        arguments: arguments,
+      );
+
+      if (PlatformInfo.isIOS) {
+        await Future.delayed(
+          const Duration(milliseconds: 200),
+          () => dispatchEmailUIAction(ShowEmailContentViewAction()),
+        );
      }
    } else {
-      BackButtonInterceptor.removeByName(AppRoutes.dashboard);
+      result = await push(AppRoutes.composer, arguments: arguments);
+    }

-      bool isTabletPlatform = currentContext != null
-        && !responsiveUtils.isScreenWithShortestSide(currentContext!);
-      dynamic result;
+    BackButtonInterceptor.add(_onBackButtonInterceptor, name: AppRoutes.dashboard);

-      if (isTabletPlatform) {
-        if (PlatformInfo.isIOS) {
-          dispatchEmailUIAction(HideEmailContentViewAction());
-        }
-
-        result = await Get.to(
-          () => const ComposerView(),
-          binding: ComposerBindings(),
-          opaque: false,
-          arguments: argumentsWithIdentity);
-
-        if (PlatformInfo.isIOS) {
-          await Future.delayed(
-            const Duration(milliseconds: 200),
-            () => dispatchEmailUIAction(ShowEmailContentViewAction()));
-        }
-      } else {
-        result = await push(
-          AppRoutes.composer,
-          arguments: argumentsWithIdentity);
-      }
-
-      BackButtonInterceptor.add(_onBackButtonInterceptor, name: AppRoutes.dashboard);
-
-      if (result is SendingEmailArguments) {
-        handleSendEmailAction(result);
-      } else if (result is SendEmailSuccess ||
-          result is SaveEmailAsDraftsSuccess ||
-          result is UpdateEmailDraftsSuccess) {
-        consumeState(Stream.value(Right<Failure, Success>(result)));
-      } else if (validateSendingEmailFailedWhenNetworkIsLostOnMobile(result)) {
-        _storeSendingEmailInCaseOfSendingFailureInMobile(result);
-      }
+    if (result is SendingEmailArguments) {
+      handleSendEmailAction(result);
+    } else if (result is SendEmailSuccess ||
+        result is SaveEmailAsDraftsSuccess ||
+        result is UpdateEmailDraftsSuccess) {
+      consumeState(Stream.value(Right<Failure, Success>(result)));
+    } else if (validateSendingEmailFailedWhenNetworkIsLostOnMobile(result)) {
+      _storeSendingEmailInCaseOfSendingFailureInMobile(result);
    }
  }

@@ -3271,7 +3277,6 @@ class MailboxDashBoardController extends ReloadableController
    applicationManager.releaseUserAgent();
    BackButtonInterceptor.removeByName(AppRoutes.dashboard);
    _identities = null;
-    composerArguments = null;
    outboxMailbox = null;
    sessionCurrent = null;
    mapMailboxById = {};
@@ -3279,7 +3284,7 @@ class MailboxDashBoardController extends ReloadableController
    WebSocketController.instance.onClose();
    _currentEmailState = null;
    _isFirstSessionLoad = false;
-    twakeAppManager.closeComposerOnWeb();
+    twakeAppManager.setHasComposer(false);
    super.onClose();
  }
 }
@@ -8,14 +8,13 @@ import 'package:model/extensions/presentation_mailbox_extension.dart';
 import 'package:model/extensions/session_extension.dart';
 import 'package:tmail_ui_user/features/base/widget/popup_item_no_icon_widget.dart';
 import 'package:tmail_ui_user/features/base/widget/scrollbar_list_view.dart';
-import 'package:tmail_ui_user/features/composer/presentation/composer_view_web.dart';
+import 'package:tmail_ui_user/features/composer/presentation/composer_overlay_view.dart';
 import 'package:tmail_ui_user/features/email/presentation/email_view.dart';
 import 'package:tmail_ui_user/features/email/presentation/model/composer_arguments.dart';
 import 'package:tmail_ui_user/features/home/domain/extensions/session_extensions.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/mailbox_view_web.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/action/dashboard_action.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/base_mailbox_dashboard_view.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/composer_overlay_state.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_receive_time_type.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_sort_order_type.dart';
@@ -198,10 +197,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
              }
            }),
        ),
-        Obx(() => controller.composerOverlayState.value == ComposerOverlayState.active
-            ? const ComposerView()
-            : const SizedBox.shrink()
-        ),
+        const ComposerOverlayView(),
        Obx(() => controller.searchMailboxActivated.value == true && !controller.responsiveUtils.isWebDesktop(context)
          ? const SearchMailboxView()
          : const SizedBox.shrink()
@@ -16,7 +16,6 @@ import 'package:tmail_ui_user/main/pages/app_pages.dart';
 import 'package:tmail_ui_user/main/routes/app_routes.dart';
 import 'package:tmail_ui_user/main/routes/route_navigation.dart';
 import 'package:tmail_ui_user/main/utils/app_utils.dart';
-import 'package:tmail_ui_user/main/utils/twake_app_manager.dart';
 import 'package:url_strategy/url_strategy.dart';
 import 'package:worker_manager/worker_manager.dart';

@@ -53,7 +52,6 @@ class TMailApp extends StatefulWidget {
 class _TMailAppState extends State<TMailApp> {

  DeepLinksManager? _deepLinksManager;
-  final TwakeAppManager _twakeAppManager = Get.find<TwakeAppManager>();

  @override
  void initState() {
@@ -107,7 +105,6 @@ class _TMailAppState extends State<TMailApp> {
    if (PlatformInfo.isMobile) {
      _deepLinksManager?.dispose();
    }
-    _twakeAppManager.dispose();
    super.dispose();
  }
 }
@@ -1,20 +1,8 @@
-import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/composer_overlay_state.dart';

 class TwakeAppManager {
-  ComposerOverlayState? _composerOverlayState;
+  bool _hasComposer = false;

-  void openComposerOnWeb() =>
-      _composerOverlayState = ComposerOverlayState.active;
+  void setHasComposer(bool value) => _hasComposer = value;

-  void closeComposerOnWeb() {
-    _composerOverlayState = ComposerOverlayState.inActive;
-    _composerOverlayState = null;
-  }
-
-  bool get isComposerOpened =>
-      _composerOverlayState == ComposerOverlayState.active;
-
-  void dispose() {
-    _composerOverlayState = null;
-  }
+  bool get hasComposer => _hasComposer;
 }