eduvia/workavia-mail-front
11
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix do not show session expires dialog when enter autocomplete

Browse Source 
Signed-off-by: dab246 <tdvu@linagora.com>
This commit is contained in:
dab246
2025-04-11 15:14:28 +07:00
committed by Dat H. Pham
parent 593806936f
commit c1c3e1b926
10 changed files with 105 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contact/lib/contact_module.dart
-4
View File
@@ -4,10 +4,6 @@ export 'contact/model/contact.dart';
export 'contact/model/contact_filter.dart';
export 'contact/model/tmail_contact.dart';
export 'data/network/contact_api.dart';
export 'data/datasource/auto_complete_datasource.dart';
export 'data/datasource_impl/tmail_contact_datasource_impl.dart';
export 'contact/autocomplete/autocomplete_tmail_contact_method.dart';
export 'contact/autocomplete/autocomplete_tmail_contact_response.dart';
contact/test/datasource/tmail_contact_datasource_impl_test.dart
-54
View File
@@ -1,54 +0,0 @@
import 'package:contact/contact/model/tmail_contact.dart';
import 'package:contact/data/datasource_impl/tmail_contact_datasource_impl.dart';
import 'package:contact/data/network/contact_api.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/id.dart';
import 'package:mockito/mockito.dart';
import 'package:mockito/annotations.dart';
import 'package:model/autocomplete/auto_complete_pattern.dart';
import 'tmail_contact_datasource_impl_test.mocks.dart';
@GenerateMocks([ContactAPI])
void main() {
final contact1 = TMailContact(
'2',
'',
'',
'marie@otherdomain.tld'
);
final contact2 = TMailContact(
'4',
'Marie',
'Dupond',
'mdupond@linagora.com'
);
group('tmail_contact_datasource_impl_test', () {
late ContactAPI contactAPI;
late TMailContactDataSourceImpl tmailContactDataSourceImpl;
setUp(() {
contactAPI = MockContactAPI();
tmailContactDataSourceImpl = TMailContactDataSourceImpl(contactAPI);
});
test('getAutoComplete should return success with valid data', () async {
when(contactAPI.getAutoComplete(
AutoCompletePattern(
word: 'marie',
accountId: AccountId(Id('29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6')))
)).thenAnswer((_) async => [contact1, contact2]);
final result = await tmailContactDataSourceImpl.getAutoComplete(
AutoCompletePattern(
word: 'marie',
accountId: AccountId(Id('29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6')))
);
expect(result, [contact1.toEmailAddress(), contact2.toEmailAddress()]);
});
});
}
lib/features/composer/data/repository/auto_complete_repository_impl.dart
+1 -1
View File
@@ -1,9 +1,9 @@
import 'package:contact/data/datasource/auto_complete_datasource.dart';
import 'package:core/utils/app_logger.dart';
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
import 'package:model/autocomplete/auto_complete_pattern.dart';
import 'package:tmail_ui_user/features/composer/domain/repository/auto_complete_repository.dart';
import 'package:tmail_ui_user/features/contact/data/datasource/auto_complete_datasource.dart';
class AutoCompleteRepositoryImpl extends AutoCompleteRepository {
lib/features/composer/presentation/composer_controller.dart
+27 -11
View File
@@ -1002,11 +1002,19 @@ class ComposerController extends BaseController
if (_getAllAutoCompleteInteractor != null) {
return await _getAllAutoCompleteInteractor!
.execute(autoCompletePattern)
.then((value) => handleAutoCompleteResultState(
resultState: value,
queryString: queryString,
onFailureCallback: (failure) => consumeState(Stream.value(Left(failure))),
)
.then(
(value) => handleAutoCompleteResultState(
resultState: value,
queryString: queryString,
onFailureCallback: (failure) {
logError('ComposerController::getAutoCompleteSuggestion:onFailureCallback: $failure');
consumeState(Stream.value(Left(failure)));
},
),
onError: (error) {
logError('ComposerController::getAutoCompleteSuggestion:onError: $error');
consumeState(Stream.value(Left(error)));
},
);
} else if (_getDeviceContactSuggestionsInteractor != null) {
return await _getDeviceContactSuggestionsInteractor!
@@ -1022,12 +1030,20 @@ class ComposerController extends BaseController
} else {
return await _getAutoCompleteInteractor
?.execute(autoCompletePattern)
.then((value) => handleAutoCompleteResultState(
resultState: value,
queryString: queryString,
onFailureCallback: (failure) => consumeState(Stream.value(Left(failure))),
)
) ?? <EmailAddress>[];
.then(
(value) => handleAutoCompleteResultState(
resultState: value,
queryString: queryString,
onFailureCallback: (failure) {
logError('ComposerController::getAutoCompleteSuggestion:onFailureCallback: $failure');
consumeState(Stream.value(Left(failure)));
},
),
onError: (error) {
logError('ComposerController::getAutoCompleteSuggestion:onError: $error');
consumeState(Stream.value(Left(error)));
},
) ?? <EmailAddress>[];
}
}
contact/lib/data/datasource/auto_complete_datasource.dart → lib/features/contact/data/datasource/auto_complete_datasource.dart
View File
contact/lib/data/datasource_impl/tmail_contact_datasource_impl.dart → lib/features/contact/data/datasource_impl/tmail_contact_datasource_impl.dart
+6 -6
View File
@@ -1,23 +1,23 @@
import 'package:contact/contact/model/tmail_contact.dart';
import 'package:contact/data/datasource/auto_complete_datasource.dart';
import 'package:contact/data/network/contact_api.dart';
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
import 'package:model/autocomplete/auto_complete_pattern.dart';
import 'package:tmail_ui_user/features/contact/data/datasource/auto_complete_datasource.dart';
import 'package:tmail_ui_user/features/contact/data/network/contact_api.dart';
import 'package:tmail_ui_user/main/exceptions/exception_thrower.dart';
class TMailContactDataSourceImpl extends AutoCompleteDataSource {
final ContactAPI _contactAPI;
final ExceptionThrower _exceptionThrower;
TMailContactDataSourceImpl(this._contactAPI);
TMailContactDataSourceImpl(this._contactAPI, this._exceptionThrower);
@override
Future<List<EmailAddress>> getAutoComplete(AutoCompletePattern autoCompletePattern) {
return Future.sync(() async {
final listContacts = await _contactAPI.getAutoComplete(autoCompletePattern);
return listContacts.map((contact) => contact.toEmailAddress()).toList();
}).catchError((error) {
throw error;
});
}).catchError(_exceptionThrower.throwException);
}
}
contact/lib/data/network/contact_api.dart → lib/features/contact/data/network/contact_api.dart
View File
lib/features/mailbox_dashboard/presentation/bindings/tmail_autocomplete_bindings.dart
+12 -11
View File
@@ -1,25 +1,23 @@
import 'package:contact/data/datasource_impl/tmail_contact_datasource_impl.dart';
import 'package:contact/data/network/contact_api.dart';
import 'package:get/get.dart';
import 'package:tmail_ui_user/features/base/base_bindings.dart';
import 'package:tmail_ui_user/features/base/interactors_bindings.dart';
import 'package:tmail_ui_user/features/composer/data/repository/auto_complete_repository_impl.dart';
import 'package:tmail_ui_user/features/composer/domain/repository/auto_complete_repository.dart';
import 'package:tmail_ui_user/features/composer/domain/usecases/get_autocomplete_interactor.dart';
import 'package:tmail_ui_user/features/composer/domain/usecases/get_all_autocomplete_interactor.dart';
import 'package:tmail_ui_user/features/composer/domain/usecases/get_device_contact_suggestions_interactor.dart';
import 'package:tmail_ui_user/features/contact/data/datasource_impl/tmail_contact_datasource_impl.dart';
import 'package:tmail_ui_user/features/contact/data/network/contact_api.dart';
import 'package:tmail_ui_user/main/exceptions/remote_exception_thrower.dart';
class TMailAutoCompleteBindings extends BaseBindings {
@override
void bindingsController() {}
@override
void bindingsDataSource() {}
class TMailAutoCompleteBindings extends InteractorsBindings {
@override
void bindingsDataSourceImpl() {
Get.put(TMailContactDataSourceImpl(Get.find<ContactAPI>()));
Get.put(TMailContactDataSourceImpl(
Get.find<ContactAPI>(),
Get.find<RemoteExceptionThrower>(),
));
}
@override
@@ -40,4 +38,7 @@ class TMailAutoCompleteBindings extends BaseBindings {
void bindingsRepositoryImpl() {
Get.put(AutoCompleteRepositoryImpl({Get.find<TMailContactDataSourceImpl>()}));
}
@override
void bindingsDataSource() {}
}
lib/main/bindings/network/network_bindings.dart
+1 -1
View File
@@ -2,7 +2,6 @@ import 'dart:convert';
import 'dart:io';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:contact/data/network/contact_api.dart';
import 'package:core/core.dart';
import 'package:device_info_plus/device_info_plus.dart';
import 'package:dio/dio.dart';
@@ -10,6 +9,7 @@ import 'package:flutter/foundation.dart';
import 'package:flutter_appauth/flutter_appauth.dart';
import 'package:get/get.dart';
import 'package:jmap_dart_client/http/http_client.dart';
import 'package:tmail_ui_user/features/contact/data/network/contact_api.dart';
import 'package:tmail_ui_user/features/email/data/network/email_api.dart';
import 'package:tmail_ui_user/features/email/data/network/mdn_api.dart';
import 'package:tmail_ui_user/features/home/data/network/session_api.dart';
test/features/contact/data/tmail_contact_datasource_impl_test.dart
+58
View File
@@ -0,0 +1,58 @@
import 'package:contact/contact/model/tmail_contact.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/id.dart';
import 'package:mockito/mockito.dart';
import 'package:mockito/annotations.dart';
import 'package:model/autocomplete/auto_complete_pattern.dart';
import 'package:tmail_ui_user/features/contact/data/datasource_impl/tmail_contact_datasource_impl.dart';
import 'package:tmail_ui_user/features/contact/data/network/contact_api.dart';
import 'package:tmail_ui_user/main/exceptions/remote_exception_thrower.dart';
import 'tmail_contact_datasource_impl_test.mocks.dart';
@GenerateMocks([ContactAPI, RemoteExceptionThrower])
void main() {
final contact1 = TMailContact(
'2',
'',
'',
'marie@otherdomain.tld',
);
final contact2 = TMailContact(
'4',
'Marie',
'Dupond',
'mdupond@linagora.com',
);
group('tmail_contact_datasource_impl_test', () {
late ContactAPI contactAPI;
late RemoteExceptionThrower exceptionThrower;
late TMailContactDataSourceImpl tmailContactDataSourceImpl;
setUp(() {
contactAPI = MockContactAPI();
exceptionThrower = MockRemoteExceptionThrower();
tmailContactDataSourceImpl =
TMailContactDataSourceImpl(contactAPI, exceptionThrower);
});
test('getAutoComplete should return success with valid data', () async {
when(contactAPI.getAutoComplete(AutoCompletePattern(
word: 'marie',
accountId: AccountId(Id(
'29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6')),
))).thenAnswer((_) async => [contact1, contact2]);
final result =
await tmailContactDataSourceImpl.getAutoComplete(AutoCompletePattern(
word: 'marie',
accountId: AccountId(Id(
'29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6')),
));
expect(result, [contact1.toEmailAddress(), contact2.toEmailAddress()]);
});
});
}