From 38a1b6e6427dcdd855fff2ead2056f6d99e31619 Mon Sep 17 00:00:00 2001
From: Dat PHAM HOANG <dphamhoang@linagora.com>
Date: Wed, 24 Aug 2022 12:18:00 +0700
Subject: [PATCH] TF-788 In the case of SettingsView, accountIdWorker is not
 triggered, so refresh

---
 .../settings/settings_first_level_view.dart   | 52 +++++++++++++++++--
 .../identities/identities_controller.dart     |  6 +++
 2 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/lib/features/manage_account/presentation/menu/settings/settings_first_level_view.dart b/lib/features/manage_account/presentation/menu/settings/settings_first_level_view.dart
index 091a3f1b6..048a3cab2 100644
--- a/lib/features/manage_account/presentation/menu/settings/settings_first_level_view.dart
+++ b/lib/features/manage_account/presentation/menu/settings/settings_first_level_view.dart
@@ -45,11 +45,49 @@ class SettingsFirstLevelView extends GetWidget<SettingsController> {
         indent: SettingsUtils.getHorizontalPadding(context, _responsiveUtils),
         endIndent: SettingsUtils.getHorizontalPadding(context, _responsiveUtils)
       ),
+      Obx(() {
+        if (controller.manageAccountDashboardController.checkAvailableRuleFilterInSession()) {
+          return Column(children: [
+            SettingFirstLevelTileBuilder(
+              AccountMenuItem.emailRules.getName(context),
+              AccountMenuItem.emailRules.getIcon(_imagePaths),
+              subtitle: AppLocalizations.of(context).emailRuleSettingExplanation,
+              () => controller.selectSettings(AccountMenuItem.emailRules)
+            ),
+            Divider(
+              color: AppColor.colorDividerComposer,
+              height: 1,
+              indent: SettingsUtils.getHorizontalPadding(context, _responsiveUtils),
+              endIndent: SettingsUtils.getHorizontalPadding(context, _responsiveUtils)
+            ),
+          ]);
+        } else {
+          return const SizedBox.shrink();
+        }
+      }),
+      Obx(() {
+        if (controller.manageAccountDashboardController.checkAvailableForwardInSession()) {
+          return Column(children: [
+            SettingFirstLevelTileBuilder(
+              AccountMenuItem.forward.getName(context),
+              AccountMenuItem.forward.getIcon(_imagePaths),
+              () => controller.selectSettings(AccountMenuItem.forward)
+            ),
+            Divider(
+              color: AppColor.colorDividerComposer,
+              height: 1,
+              indent: SettingsUtils.getHorizontalPadding(context, _responsiveUtils),
+              endIndent: SettingsUtils.getHorizontalPadding(context, _responsiveUtils)
+            ),
+          ]);
+        } else {
+          return const SizedBox.shrink();
+        }
+      }),
       SettingFirstLevelTileBuilder(
-        AccountMenuItem.emailRules.getName(context),
-        AccountMenuItem.emailRules.getIcon(_imagePaths),
-        subtitle: AppLocalizations.of(context).emailRuleSettingExplanation,
-        () => controller.selectSettings(AccountMenuItem.emailRules)
+        AccountMenuItem.vacation.getName(context),
+        AccountMenuItem.vacation.getIcon(_imagePaths),
+        () => controller.selectSettings(AccountMenuItem.vacation)
       ),
       Divider(
         color: AppColor.colorDividerComposer,
@@ -62,6 +100,12 @@ class SettingsFirstLevelView extends GetWidget<SettingsController> {
         AccountMenuItem.languageAndRegion.getIcon(_imagePaths),
         () => controller.selectSettings(AccountMenuItem.languageAndRegion)
       ),
+      Divider(
+        color: AppColor.colorDividerComposer,
+        height: 1,
+        indent: SettingsUtils.getHorizontalPadding(context, _responsiveUtils),
+        endIndent: SettingsUtils.getHorizontalPadding(context, _responsiveUtils)
+      ),
     ]);
   }
 }
diff --git a/lib/features/manage_account/presentation/profiles/identities/identities_controller.dart b/lib/features/manage_account/presentation/profiles/identities/identities_controller.dart
index 820b8bc4d..f458dd38a 100644
--- a/lib/features/manage_account/presentation/profiles/identities/identities_controller.dart
+++ b/lib/features/manage_account/presentation/profiles/identities/identities_controller.dart
@@ -21,6 +21,7 @@ import 'package:tmail_ui_user/features/manage_account/domain/usecases/edit_ident
 import 'package:tmail_ui_user/features/manage_account/domain/usecases/get_all_identities_interactor.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/manage_account_dashboard_controller.dart';
 import 'package:tmail_ui_user/features/manage_account/presentation/model/identity_action_type.dart';
+import 'package:tmail_ui_user/features/manage_account/presentation/model/settings_page_level.dart';
 import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
 import 'package:tmail_ui_user/main/routes/app_routes.dart';
 import 'package:tmail_ui_user/main/routes/route_navigation.dart';
@@ -105,6 +106,10 @@ class IdentitiesController extends BaseController {
         _getAllIdentities(accountId);
       }
     });
+
+    if (_accountDashBoardController.settingsPageLevel.value == SettingsPageLevel.level1) {
+      _accountDashBoardController.accountId.refresh();
+    }
   }
 
   void _clearWorker() {
@@ -112,6 +117,7 @@ class IdentitiesController extends BaseController {
   }
 
   void _getAllIdentities(AccountId accountId) {
+    log('IdentitiesController::_getAllIdentities(): $accountId');
     consumeState(_getAllIdentitiesInteractor.execute(accountId));
   }