TF-189 Refactor destination picker components: observe only Tree variable

lib/features/destination_picker/presentation/destination_picker_controller.dart

@@ -1,35 +1,27 @@
 
 import 'package:core/core.dart';
 import 'package:dartz/dartz.dart';
+import 'package:get/get.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:model/model.dart';
-import 'package:tmail_ui_user/features/base/base_controller.dart';
+import 'package:tmail_ui_user/features/base/base_mailbox_controller.dart';
 import 'package:tmail_ui_user/features/destination_picker/presentation/model/destination_picker_arguments.dart';
 import 'package:tmail_ui_user/features/mailbox/domain/state/get_all_mailboxes_state.dart';
 import 'package:tmail_ui_user/features/mailbox/domain/usecases/get_all_mailbox_interactor.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_actions.dart';
-import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.dart';
-import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_tree.dart';
-import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_tree_builder.dart';
-import 'package:tmail_ui_user/features/mailbox/presentation/extensions/list_mailbox_node_extension.dart';
-import 'package:get/get.dart';
 import 'package:tmail_ui_user/main/routes/route_navigation.dart';
 
-class DestinationPickerController extends BaseController {
+class DestinationPickerController extends BaseMailboxController {
 
   final GetAllMailboxInteractor _getAllMailboxInteractor;
-  final TreeBuilder _treeBuilder;
 
-  MailboxTree folderMailboxTree = MailboxTree(MailboxNode.root());
-  final defaultMailboxList = <PresentationMailbox>[].obs;
-  final folderMailboxNodeList = <MailboxNode>[].obs;
   final mailboxAction = Rxn<MailboxActions>();
   AccountId? accountId;
 
   DestinationPickerController(
     this._getAllMailboxInteractor,
-    this._treeBuilder,
+    treeBuilder,
-  );
+  ) : super(treeBuilder);
 
   @override
   void onReady() {
@@ -47,18 +39,13 @@ class DestinationPickerController extends BaseController {
     super.onData(newState);
     newState.map((success) {
       if (success is GetAllMailboxSuccess) {
-        _buildTree(success.folderMailboxList);
+        buildTree(success.mailboxList);
       }
     });
   }
 
   @override
   void onDone() {
-    viewState.value.map((success) {
-      if (success is GetAllMailboxSuccess) {
-        defaultMailboxList.value = success.defaultMailboxList;
-      }
-    });
   }
 
   @override
@@ -70,23 +57,6 @@ class DestinationPickerController extends BaseController {
     }
   }
 
-  void _buildTree(List<PresentationMailbox> folderMailboxList) async {
-    folderMailboxTree = await _treeBuilder.generateMailboxTree(folderMailboxList);
-    folderMailboxNodeList.value = folderMailboxTree.root.childrenItems ?? [];
-  }
-
-  void toggleMailboxFolder(MailboxNode selectedMailboxNode) {
-    final newExpandMode = selectedMailboxNode.expandMode == ExpandMode.COLLAPSE
-      ? ExpandMode.EXPAND
-      : ExpandMode.COLLAPSE;
-
-    final newMailboxNodeList = folderMailboxNodeList.updateNode(
-        selectedMailboxNode.item.id,
-        selectedMailboxNode.copyWith(newExpandMode: newExpandMode));
-
-    folderMailboxNodeList.value = newMailboxNodeList;
-  }
-
   void selectMailboxAction(PresentationMailbox? destinationMailbox) {
     popBack(result: destinationMailbox);
   }

lib/features/destination_picker/presentation/destination_picker_view.dart

@@ -6,12 +6,10 @@ import 'package:model/model.dart';
 import 'package:tmail_ui_user/features/destination_picker/presentation/destination_picker_controller.dart';
 import 'package:tmail_ui_user/features/destination_picker/presentation/model/destination_picker_arguments.dart';
 import 'package:tmail_ui_user/features/destination_picker/presentation/widgets/app_bar_destination_picker_builder.dart';
-import 'package:tmail_ui_user/features/mailbox/domain/state/get_all_mailboxes_state.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_actions.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_displayed.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.dart';
 import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart';
-import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_tile_builder.dart';
 import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
 
 class DestinationPickerView extends GetWidget<DestinationPickerController> {
@@ -224,47 +222,37 @@ class DestinationPickerView extends GetWidget<DestinationPickerController> {
   }
 
   Widget _buildDefaultMailbox(BuildContext context) {
-    return Obx(() => controller.viewState.value.fold(
+    return Obx(() => controller.defaultMailboxTree.value.root.childrenItems?.isNotEmpty ?? false
-      (failure) => SizedBox.shrink(),
+        ? Transform(
-      (success) {
+            transform: Matrix4.translationValues(-4.0, 0.0, 0.0),
-        if (success is GetAllMailboxSuccess) {
+            child: Padding(
-          final defaultMailboxList = success.defaultMailboxList;
+                padding: EdgeInsets.only(top: 10, bottom: 10),
-          return ListView.builder(
+                child: TreeView(
-            padding: EdgeInsets.only(top: 8, left: 8, right: 10, bottom: 8),
+                  startExpanded: false,
-            key: Key('default_mailbox_list'),
+                  key: Key('default_mailbox_list'),
-            itemCount: defaultMailboxList.length,
+                  children: _buildListChildTileWidget(context, controller.defaultMailboxTree.value.root)
-            shrinkWrap: true,
+                )
-            primary: false,
+            )
-            itemBuilder: (context, index) => (MailboxTileBuilder(
+        )
-                    _imagePaths,
+        : SizedBox.shrink()
-                    defaultMailboxList[index],
-                    mailboxDisplayed: MailboxDisplayed.destinationPicker,
-                    isLastElement: index == defaultMailboxList.length - 1)
-                ..addOnOpenMailboxAction((mailbox) =>
-                    controller.selectMailboxAction(mailbox.toPresentationMailboxWithMailboxPath(mailbox.name?.name ?? ''))))
-              .build());
-        } else {
-          return SizedBox.shrink();
-        }
-      })
     );
   }
 
   Widget _buildFolderMailbox(BuildContext context) {
-    return Obx(() => controller.folderMailboxNodeList.isNotEmpty
+    return Obx(() => controller.folderMailboxTree.value.root.childrenItems?.isNotEmpty ?? false
       ? Padding(
           padding: EdgeInsets.only(top: 8, bottom: 8),
           child: TreeView(
               startExpanded: false,
               key: Key('folder_mailbox_list'),
-              children: _buildListChildTileWidget(context, controller.folderMailboxNodeList)))
+              children: _buildListChildTileWidget(context, controller.folderMailboxTree.value.root)))
       : SizedBox.shrink()
     );
   }
 
-  List<Widget> _buildListChildTileWidget(BuildContext context, List<MailboxNode> listMailboxNode) {
+  List<Widget> _buildListChildTileWidget(BuildContext context, MailboxNode parentNode) {
-    return listMailboxNode
+    return parentNode.childrenItems
-      .map((mailboxNode) => mailboxNode.hasChildren()
+        ?.map((mailboxNode) => mailboxNode.hasChildren()
           ? Padding(
               padding: EdgeInsets.only(left: 20),
               child:  TreeViewChild(
@@ -276,14 +264,10 @@ class DestinationPickerView extends GetWidget<DestinationPickerController> {
                             _imagePaths,
                             mailboxNode,
                             mailboxDisplayed: MailboxDisplayed.destinationPicker)
-                        ..addOnOpenMailboxFolderClick((mailboxNode) => controller.selectMailboxAction(mailboxNode.item.toPresentationMailboxWithMailboxPath(
+                        ..addOnOpenMailboxFolderClick(_handleOpenMailboxClick)
-                            mailboxNode.getPathMailboxNode(
-                              controller.folderMailboxTree,
-                              controller.defaultMailboxList,
-                            ))))
                         ..addOnExpandFolderActionClick((mailboxNode) => controller.toggleMailboxFolder(mailboxNode)))
                       .build(),
-                  children: _buildListChildTileWidget(context, mailboxNode.childrenItems!)
+                  children: _buildListChildTileWidget(context, mailboxNode)
               ).build())
           : Padding(
               padding: EdgeInsets.only(left: 20),
@@ -292,14 +276,10 @@ class DestinationPickerView extends GetWidget<DestinationPickerController> {
                       _imagePaths,
                       mailboxNode,
                       mailboxDisplayed: MailboxDisplayed.destinationPicker)
-                  ..addOnOpenMailboxFolderClick((mailboxNode) => controller.selectMailboxAction(mailboxNode.item.toPresentationMailboxWithMailboxPath(
+                  ..addOnOpenMailboxFolderClick(_handleOpenMailboxClick))
-                      mailboxNode.getPathMailboxNode(
-                        controller.folderMailboxTree,
-                        controller.defaultMailboxList,
-                      )))))
                 .build(),
               ))
-      .toList();
+      .toList() ?? <Widget>[];
   }
 
   EdgeInsets _getMarginDestinationPicker(BuildContext context) {
@@ -375,4 +355,17 @@ class DestinationPickerView extends GetWidget<DestinationPickerController> {
       )
     );
   }
+
+  void _handleOpenMailboxClick(MailboxNode mailboxNode) {
+    var presentationMailbox;
+    final path = controller.findNodePath(mailboxNode.item.id)
+        ?? mailboxNode.item.name?.name;
+    if (path != null) {
+      presentationMailbox = mailboxNode.item
+          .toPresentationMailboxWithMailboxPath(path);
+    } else {
+      presentationMailbox = mailboxNode.item;
+    }
+    controller.selectMailboxAction(presentationMailbox);
+  }
 }