TF-2667 Use Username replace UserProfile
This commit is contained in:
@@ -16,7 +16,6 @@ import 'package:server_settings/server_settings/capability_server_settings.dart'
|
||||
import 'package:tmail_ui_user/features/base/action/ui_action.dart';
|
||||
import 'package:tmail_ui_user/features/base/reloadable/reloadable_controller.dart';
|
||||
import 'package:tmail_ui_user/features/base/state/banner_state.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/domain/state/get_user_profile_state.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/domain/state/get_all_vacation_state.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/domain/state/update_vacation_state.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/domain/usecases/get_all_vacation_interactor.dart';
|
||||
@@ -46,7 +45,6 @@ class ManageAccountDashBoardController extends ReloadableController {
|
||||
UpdateVacationInteractor? _updateVacationInteractor;
|
||||
|
||||
final appInformation = Rxn<PackageInfo>();
|
||||
final userProfile = Rxn<UserProfile>();
|
||||
final accountId = Rxn<AccountId>();
|
||||
final accountMenuItemSelected = AccountMenuItem.profiles.obs;
|
||||
final settingsPageLevel = SettingsPageLevel.universal.obs;
|
||||
@@ -74,9 +72,7 @@ class ManageAccountDashBoardController extends ReloadableController {
|
||||
|
||||
@override
|
||||
void handleSuccessViewState(Success success) {
|
||||
if (success is GetUserProfileSuccess) {
|
||||
userProfile.value = success.userProfile;
|
||||
} else if (success is GetAllVacationSuccess) {
|
||||
if (success is GetAllVacationSuccess) {
|
||||
if (success.listVacationResponse.isNotEmpty) {
|
||||
vacationResponse.value = success.listVacationResponse.first;
|
||||
}
|
||||
@@ -92,7 +88,6 @@ class ManageAccountDashBoardController extends ReloadableController {
|
||||
log('ManageAccountDashBoardController::handleReloaded:');
|
||||
sessionCurrent = session;
|
||||
accountId.value = session.personalAccount.accountId;
|
||||
_getUserProfile();
|
||||
_bindingInteractorForMenuItemView(sessionCurrent, accountId.value);
|
||||
_getVacationResponse();
|
||||
_getParametersRouter();
|
||||
@@ -104,7 +99,6 @@ class ManageAccountDashBoardController extends ReloadableController {
|
||||
sessionCurrent = arguments.session;
|
||||
accountId.value = arguments.session?.personalAccount.accountId;
|
||||
previousUri = arguments.previousUri;
|
||||
_getUserProfile();
|
||||
_bindingInteractorForMenuItemView(sessionCurrent, accountId.value);
|
||||
_getVacationResponse();
|
||||
if (arguments.menuSettingCurrent != null) {
|
||||
@@ -163,11 +157,6 @@ class ManageAccountDashBoardController extends ReloadableController {
|
||||
appInformation.value = info;
|
||||
}
|
||||
|
||||
void _getUserProfile() async {
|
||||
log('ManageAccountDashBoardController::_getUserProfile(): $sessionCurrent');
|
||||
userProfile.value = sessionCurrent != null ? UserProfile(sessionCurrent!.username.value) : null;
|
||||
}
|
||||
|
||||
void _getVacationResponse() {
|
||||
if (accountId.value != null && _getAllVacationInteractor != null) {
|
||||
consumeState(_getAllVacationInteractor!.execute(accountId.value!));
|
||||
|
||||
@@ -7,6 +7,7 @@ import 'package:core/presentation/views/text/slogan_builder.dart';
|
||||
import 'package:core/utils/platform_info.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:model/model.dart';
|
||||
import 'package:tmail_ui_user/features/base/state/banner_state.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/mixin/user_setting_popup_menu_mixin.dart';
|
||||
import 'package:tmail_ui_user/features/manage_account/presentation/always_read_receipt/always_read_receipt_view.dart';
|
||||
@@ -139,7 +140,7 @@ class ManageAccountDashBoardView extends GetWidget<ManageAccountDashBoardControl
|
||||
const Spacer(),
|
||||
const SizedBox(width: 16),
|
||||
Obx(() => (AvatarBuilder()
|
||||
..text(controller.userProfile.value?.getAvatarText() ?? '')
|
||||
..text(controller.sessionCurrent?.username.firstCharacter ?? '')
|
||||
..backgroundColor(Colors.white)
|
||||
..textColor(Colors.black)
|
||||
..context(context)
|
||||
@@ -149,7 +150,7 @@ class ManageAccountDashBoardView extends GetWidget<ManageAccountDashBoardControl
|
||||
position,
|
||||
popupMenuUserSettingActionTile(
|
||||
context,
|
||||
controller.userProfile.value,
|
||||
controller.sessionCurrent?.username,
|
||||
onLogoutAction: () {
|
||||
popBack();
|
||||
controller.logout(controller.sessionCurrent, controller.accountId.value);
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@ class SettingsFirstLevelView extends GetWidget<SettingsController> {
|
||||
controller: PlatformInfo.isMobile ? null : controller.settingScrollController,
|
||||
child: Column(children: [
|
||||
Obx(() => UserInformationWidget(
|
||||
userProfile: controller.manageAccountDashboardController.userProfile.value,
|
||||
userName: controller.manageAccountDashboardController.sessionCurrent?.username,
|
||||
padding: SettingsUtils.getPaddingInFirstLevel(context, controller.responsiveUtils),
|
||||
titlePadding: const EdgeInsetsDirectional.only(start: 16))),
|
||||
Divider(
|
||||
|
||||
+3
-6
@@ -142,10 +142,9 @@ class IdentitiesController extends BaseController {
|
||||
|
||||
void goToCreateNewIdentity(BuildContext context) async {
|
||||
final accountId = _accountDashBoardController.accountId.value;
|
||||
final userProfile = _accountDashBoardController.userProfile.value;
|
||||
final session = _accountDashBoardController.sessionCurrent;
|
||||
if (accountId != null && session != null && userProfile != null) {
|
||||
final arguments = IdentityCreatorArguments(accountId, session, userProfile);
|
||||
if (accountId != null && session != null) {
|
||||
final arguments = IdentityCreatorArguments(accountId, session);
|
||||
|
||||
final newIdentityArguments = PlatformInfo.isWeb
|
||||
? await DialogRouter.pushGeneralDialog(routeName: AppRoutes.identityCreator, arguments: arguments)
|
||||
@@ -249,13 +248,11 @@ class IdentitiesController extends BaseController {
|
||||
|
||||
void goToEditIdentity(BuildContext context, Identity identity) async {
|
||||
final accountId = _accountDashBoardController.accountId.value;
|
||||
final userProfile = _accountDashBoardController.userProfile.value;
|
||||
final session = _accountDashBoardController.sessionCurrent;
|
||||
if (accountId != null && session != null && userProfile != null) {
|
||||
if (accountId != null && session != null) {
|
||||
final arguments = IdentityCreatorArguments(
|
||||
accountId,
|
||||
session,
|
||||
userProfile,
|
||||
identity: identity,
|
||||
actionType: IdentityActionType.edit);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user