From ebbca0ee20fee62aa7eb8b8ceaf5c7f7a9ba83a6 Mon Sep 17 00:00:00 2001 From: dab246 Date: Tue, 24 Dec 2024 11:06:14 +0700 Subject: [PATCH] TF-3337 Fix open the setting page (Vacation method was call twice) --- .../vacation/vacation_controller.dart | 36 ++----------------- .../vacation_controller_bindings.dart | 2 -- 2 files changed, 3 insertions(+), 35 deletions(-) diff --git a/lib/features/manage_account/presentation/vacation/vacation_controller.dart b/lib/features/manage_account/presentation/vacation/vacation_controller.dart index 88f4f8e77..59d3f627c 100644 --- a/lib/features/manage_account/presentation/vacation/vacation_controller.dart +++ b/lib/features/manage_account/presentation/vacation/vacation_controller.dart @@ -8,9 +8,7 @@ import 'package:rich_text_composer/rich_text_composer.dart'; import 'package:rich_text_composer/views/commons/constants.dart'; import 'package:tmail_ui_user/features/base/base_controller.dart'; import 'package:tmail_ui_user/features/composer/presentation/controller/rich_text_web_controller.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'; import 'package:tmail_ui_user/features/manage_account/domain/usecases/update_vacation_interactor.dart'; import 'package:tmail_ui_user/features/manage_account/presentation/extensions/vacation_response_extension.dart'; import 'package:tmail_ui_user/features/manage_account/presentation/manage_account_dashboard_controller.dart'; @@ -26,7 +24,6 @@ class VacationController extends BaseController { final _accountDashBoardController = Get.find(); final _settingController = Get.find(); - final GetAllVacationInteractor _getAllVacationInteractor; final UpdateVacationInteractor _updateVacationInteractor; final RichTextWebController _richTextControllerForWeb; @@ -46,7 +43,6 @@ class VacationController extends BaseController { final ScrollController scrollController = ScrollController(); VacationController( - this._getAllVacationInteractor, this._updateVacationInteractor, this._richTextControllerForWeb ); @@ -62,19 +58,12 @@ class VacationController extends BaseController { super.onInit(); } - @override - void onReady() { - _getAllVacation(); - super.onReady(); - } - @override void handleSuccessViewState(Success success) { - super.handleSuccessViewState(success); - if (success is GetAllVacationSuccess) { - _handleGetAllVacationSuccess(success); - } else if (success is UpdateVacationSuccess) { + if (success is UpdateVacationSuccess) { _handleUpdateVacationSuccess(success); + } else { + super.handleSuccessViewState(success); } } @@ -98,25 +87,6 @@ class VacationController extends BaseController { } } - void _getAllVacation() { - final accountId = _accountDashBoardController.accountId.value; - if (accountId != null) { - consumeState(_getAllVacationInteractor.execute(accountId)); - } - } - - void _handleGetAllVacationSuccess(GetAllVacationSuccess success) { - if (success.listVacationResponse.isNotEmpty) { - currentVacation = success.listVacationResponse.first; - log('VacationController::_handleGetAllVacationSuccess(): $currentVacation'); - - if (currentVacation != null) { - final newVacationPresentation = currentVacation!.toVacationPresentation(); - _initializeValueForVacation(newVacationPresentation); - } - } - } - void _initializeValueForVacation(VacationPresentation newVacation) { vacationPresentation.value = newVacation; subjectTextController.text = newVacation.subject ?? ''; diff --git a/lib/features/manage_account/presentation/vacation/vacation_controller_bindings.dart b/lib/features/manage_account/presentation/vacation/vacation_controller_bindings.dart index 8bc6661ba..12dae3fa5 100644 --- a/lib/features/manage_account/presentation/vacation/vacation_controller_bindings.dart +++ b/lib/features/manage_account/presentation/vacation/vacation_controller_bindings.dart @@ -1,7 +1,6 @@ import 'package:get/get.dart'; import 'package:tmail_ui_user/features/composer/presentation/controller/rich_text_web_controller.dart'; import 'package:tmail_ui_user/features/mailbox_creator/domain/usecases/verify_name_interactor.dart'; -import 'package:tmail_ui_user/features/manage_account/domain/usecases/get_all_vacation_interactor.dart'; import 'package:tmail_ui_user/features/manage_account/domain/usecases/update_vacation_interactor.dart'; import 'package:tmail_ui_user/features/manage_account/presentation/vacation/utils/vacation_utils.dart'; import 'package:tmail_ui_user/features/manage_account/presentation/vacation/vacation_controller.dart'; @@ -13,7 +12,6 @@ class VacationControllerBindings extends Bindings { Get.lazyPut(() => VerifyNameInteractor()); Get.lazyPut(() => RichTextWebController(), tag: VacationUtils.vacationTagName); Get.put(VacationController( - Get.find(), Get.find(), Get.find(tag: VacationUtils.vacationTagName), ));