@@ -58,15 +58,16 @@ class CreateSourceBloc extends Bloc<CreateSourceEvent, CreateSourceState> {
58
58
) async {
59
59
emit (state.copyWith (status: CreateSourceStatus .loading));
60
60
try {
61
- final [countriesPaginated, languagesPaginated] = await Future .wait ([
61
+ final responses = await Future .wait ([
62
62
_countriesRepository.readAll (
63
63
sort: [const SortOption ('name' , SortOrder .asc)],
64
- ) as Future < PaginatedResponse < Country >> ,
64
+ ),
65
65
_languagesRepository.readAll (
66
66
sort: [const SortOption ('name' , SortOrder .asc)],
67
- ) as Future < PaginatedResponse < Language >> ,
67
+ ),
68
68
]);
69
-
69
+ final countriesPaginated = responses[0 ] as PaginatedResponse <Country >;
70
+ final languagesPaginated = responses[1 ] as PaginatedResponse <Language >;
70
71
emit (
71
72
state.copyWith (
72
73
status: CreateSourceStatus .initial,
@@ -193,9 +194,10 @@ class CreateSourceBloc extends Bloc<CreateSourceEvent, CreateSourceState> {
193
194
emit (state.copyWith (countrySearchTerm: event.searchTerm));
194
195
try {
195
196
final countriesResponse = await _countriesRepository.readAll (
196
- filter: {'name' : event.searchTerm},
197
+ filter:
198
+ event.searchTerm.isNotEmpty ? {'name' : event.searchTerm} : null ,
197
199
sort: [const SortOption ('name' , SortOrder .asc)],
198
- ) as PaginatedResponse < Country > ;
200
+ );
199
201
200
202
emit (
201
203
state.copyWith (
@@ -224,10 +226,14 @@ class CreateSourceBloc extends Bloc<CreateSourceEvent, CreateSourceState> {
224
226
225
227
try {
226
228
final countriesResponse = await _countriesRepository.readAll (
227
- cursor: state.countriesCursor,
228
- filter: {'name' : state.countrySearchTerm},
229
+ pagination: state.countriesCursor != null
230
+ ? PaginationOptions (cursor: state.countriesCursor)
231
+ : null ,
232
+ filter: state.countrySearchTerm.isNotEmpty
233
+ ? {'name' : state.countrySearchTerm}
234
+ : null ,
229
235
sort: [const SortOption ('name' , SortOrder .asc)],
230
- ) as PaginatedResponse < Country > ;
236
+ );
231
237
232
238
emit (
233
239
state.copyWith (
@@ -256,9 +262,10 @@ class CreateSourceBloc extends Bloc<CreateSourceEvent, CreateSourceState> {
256
262
emit (state.copyWith (languageSearchTerm: event.searchTerm));
257
263
try {
258
264
final languagesResponse = await _languagesRepository.readAll (
259
- filter: {'name' : event.searchTerm},
265
+ filter:
266
+ event.searchTerm.isNotEmpty ? {'name' : event.searchTerm} : null ,
260
267
sort: [const SortOption ('name' , SortOrder .asc)],
261
- ) as PaginatedResponse < Language > ;
268
+ );
262
269
263
270
emit (
264
271
state.copyWith (
@@ -287,10 +294,14 @@ class CreateSourceBloc extends Bloc<CreateSourceEvent, CreateSourceState> {
287
294
288
295
try {
289
296
final languagesResponse = await _languagesRepository.readAll (
290
- cursor: state.languagesCursor,
291
- filter: {'name' : state.languageSearchTerm},
297
+ pagination: state.languagesCursor != null
298
+ ? PaginationOptions (cursor: state.languagesCursor)
299
+ : null ,
300
+ filter: state.languageSearchTerm.isNotEmpty
301
+ ? {'name' : state.languageSearchTerm}
302
+ : null ,
292
303
sort: [const SortOption ('name' , SortOrder .asc)],
293
- ) as PaginatedResponse < Language > ;
304
+ );
294
305
295
306
emit (
296
307
state.copyWith (
0 commit comments