Merge pull request #46 from flutter-news-app-full-source-code/content-management-ui-enhancement

Content management UI enhancement

Author: fulleni

lib/content_management/bloc/create_headline/create_headline_bloc.dart

@@ -35,10 +35,6 @@ class CreateHeadlineBloc
     on<CreateHeadlineCountryChanged>(_onCountryChanged);
     on<CreateHeadlineStatusChanged>(_onStatusChanged);
     on<CreateHeadlineSubmitted>(_onSubmitted);
-    on<CreateHeadlineCountrySearchChanged>(
-      _onCountrySearchChanged,
-      transformer: droppable(),
-    );
     on<CreateHeadlineLoadMoreCountriesRequested>(_onLoadMoreCountriesRequested);
   }
 
@@ -195,37 +191,6 @@ class CreateHeadlineBloc
     }
   }
 
-  Future<void> _onCountrySearchChanged(
-    CreateHeadlineCountrySearchChanged event,
-    Emitter<CreateHeadlineState> emit,
-  ) async {
-    await Future<void>.delayed(_searchDebounceDuration);
-    emit(state.copyWith(countrySearchTerm: event.searchTerm));
-    try {
-      final countriesResponse = await _countriesRepository.readAll(
-        filter: event.searchTerm.isNotEmpty ? {'name': event.searchTerm} : null,
-        sort: [const SortOption('name', SortOrder.asc)],
-      );
-
-      emit(
-        state.copyWith(
-          countries: countriesResponse.items,
-          countriesCursor: countriesResponse.cursor,
-          countriesHasMore: countriesResponse.hasMore,
-        ),
-      );
-    } on HttpException catch (e) {
-      emit(state.copyWith(status: CreateHeadlineStatus.failure, exception: e));
-    } catch (e) {
-      emit(
-        state.copyWith(
-          status: CreateHeadlineStatus.failure,
-          exception: UnknownException('An unexpected error occurred: $e'),
-        ),
-      );
-    }
-  }
-
   Future<void> _onLoadMoreCountriesRequested(
     CreateHeadlineLoadMoreCountriesRequested event,
     Emitter<CreateHeadlineState> emit,
@@ -239,9 +204,6 @@ class CreateHeadlineBloc
         pagination: state.countriesCursor != null
             ? PaginationOptions(cursor: state.countriesCursor)
             : null,
-        filter: state.countrySearchTerm.isNotEmpty
-            ? {'name': state.countrySearchTerm}
-            : null,
         sort: [const SortOption('name', SortOrder.asc)],
       );
 

lib/content_management/bloc/create_headline/create_headline_event.dart

@@ -84,14 +84,6 @@ final class CreateHeadlineSubmitted extends CreateHeadlineEvent {
   const CreateHeadlineSubmitted();
 }
 
-/// Event for when the country search term is changed.
-final class CreateHeadlineCountrySearchChanged extends CreateHeadlineEvent {
-  const CreateHeadlineCountrySearchChanged(this.searchTerm);
-  final String searchTerm;
-  @override
-  List<Object?> get props => [searchTerm];
-}
-
 /// Event to request loading more countries.
 final class CreateHeadlineLoadMoreCountriesRequested
     extends CreateHeadlineEvent {

lib/content_management/bloc/create_headline/create_headline_state.dart

@@ -35,7 +35,6 @@ final class CreateHeadlineState extends Equatable {
     this.countriesHasMore = true,
     this.countriesIsLoadingMore = false,
     this.countriesCursor,
-    this.countrySearchTerm = '',
     this.contentStatus = ContentStatus.active,
     this.exception,
     this.createdHeadline,
@@ -55,7 +54,6 @@ final class CreateHeadlineState extends Equatable {
   final bool countriesHasMore;
   final bool countriesIsLoadingMore;
   final String? countriesCursor;
-  final String countrySearchTerm;
   final ContentStatus contentStatus;
   final HttpException? exception;
   final Headline? createdHeadline;
@@ -85,7 +83,6 @@ final class CreateHeadlineState extends Equatable {
     bool? countriesHasMore,
     bool? countriesIsLoadingMore,
     String? countriesCursor,
-    String? countrySearchTerm,
     ContentStatus? contentStatus,
     HttpException? exception,
     Headline? createdHeadline,
@@ -106,7 +103,6 @@ final class CreateHeadlineState extends Equatable {
       countriesIsLoadingMore:
           countriesIsLoadingMore ?? this.countriesIsLoadingMore,
       countriesCursor: countriesCursor ?? this.countriesCursor,
-      countrySearchTerm: countrySearchTerm ?? this.countrySearchTerm,
       contentStatus: contentStatus ?? this.contentStatus,
       exception: exception,
       createdHeadline: createdHeadline ?? this.createdHeadline,
@@ -129,7 +125,6 @@ final class CreateHeadlineState extends Equatable {
     countriesHasMore,
     countriesIsLoadingMore,
     countriesCursor,
-    countrySearchTerm,
     contentStatus,
     exception,
     createdHeadline,

lib/content_management/bloc/create_source/create_source_bloc.dart

@@ -31,17 +31,9 @@ class CreateSourceBloc extends Bloc<CreateSourceEvent, CreateSourceState> {
     on<CreateSourceHeadquartersChanged>(_onHeadquartersChanged);
     on<CreateSourceStatusChanged>(_onStatusChanged);
     on<CreateSourceSubmitted>(_onSubmitted);
-    on<CreateSourceCountrySearchChanged>(
-      _onCountrySearchChanged,
-      transformer: droppable(),
-    );
     on<CreateSourceLoadMoreCountriesRequested>(
       _onLoadMoreCountriesRequested,
     );
-    on<CreateSourceLanguageSearchChanged>(
-      _onLanguageSearchChanged,
-      transformer: droppable(),
-    );
     on<CreateSourceLoadMoreLanguagesRequested>(
       _onLoadMoreLanguagesRequested,
     );
@@ -186,37 +178,6 @@ class CreateSourceBloc extends Bloc<CreateSourceEvent, CreateSourceState> {
     }
   }
 
-  Future<void> _onCountrySearchChanged(
-    CreateSourceCountrySearchChanged event,
-    Emitter<CreateSourceState> emit,
-  ) async {
-    await Future<void>.delayed(_searchDebounceDuration);
-    emit(state.copyWith(countrySearchTerm: event.searchTerm));
-    try {
-      final countriesResponse = await _countriesRepository.readAll(
-        filter: event.searchTerm.isNotEmpty ? {'name': event.searchTerm} : null,
-        sort: [const SortOption('name', SortOrder.asc)],
-      );
-
-      emit(
-        state.copyWith(
-          countries: countriesResponse.items,
-          countriesCursor: countriesResponse.cursor,
-          countriesHasMore: countriesResponse.hasMore,
-        ),
-      );
-    } on HttpException catch (e) {
-      emit(state.copyWith(status: CreateSourceStatus.failure, exception: e));
-    } catch (e) {
-      emit(
-        state.copyWith(
-          status: CreateSourceStatus.failure,
-          exception: UnknownException('An unexpected error occurred: $e'),
-        ),
-      );
-    }
-  }
-
   Future<void> _onLoadMoreCountriesRequested(
     CreateSourceLoadMoreCountriesRequested event,
     Emitter<CreateSourceState> emit,
@@ -230,9 +191,6 @@ class CreateSourceBloc extends Bloc<CreateSourceEvent, CreateSourceState> {
         pagination: state.countriesCursor != null
             ? PaginationOptions(cursor: state.countriesCursor)
             : null,
-        filter: state.countrySearchTerm.isNotEmpty
-            ? {'name': state.countrySearchTerm}
-            : null,
         sort: [const SortOption('name', SortOrder.asc)],
       );
 
@@ -263,37 +221,6 @@ class CreateSourceBloc extends Bloc<CreateSourceEvent, CreateSourceState> {
     }
   }
 
-  Future<void> _onLanguageSearchChanged(
-    CreateSourceLanguageSearchChanged event,
-    Emitter<CreateSourceState> emit,
-  ) async {
-    await Future<void>.delayed(_searchDebounceDuration);
-    emit(state.copyWith(languageSearchTerm: event.searchTerm));
-    try {
-      final languagesResponse = await _languagesRepository.readAll(
-        filter: event.searchTerm.isNotEmpty ? {'name': event.searchTerm} : null,
-        sort: [const SortOption('name', SortOrder.asc)],
-      );
-
-      emit(
-        state.copyWith(
-          languages: languagesResponse.items,
-          languagesCursor: languagesResponse.cursor,
-          languagesHasMore: languagesResponse.hasMore,
-        ),
-      );
-    } on HttpException catch (e) {
-      emit(state.copyWith(status: CreateSourceStatus.failure, exception: e));
-    } catch (e) {
-      emit(
-        state.copyWith(
-          status: CreateSourceStatus.failure,
-          exception: UnknownException('An unexpected error occurred: $e'),
-        ),
-      );
-    }
-  }
-
   Future<void> _onLoadMoreLanguagesRequested(
     CreateSourceLoadMoreLanguagesRequested event,
     Emitter<CreateSourceState> emit,
@@ -307,9 +234,6 @@ class CreateSourceBloc extends Bloc<CreateSourceEvent, CreateSourceState> {
         pagination: state.languagesCursor != null
             ? PaginationOptions(cursor: state.languagesCursor)
             : null,
-        filter: state.languageSearchTerm.isNotEmpty
-            ? {'name': state.languageSearchTerm}
-            : null,
         sort: [const SortOption('name', SortOrder.asc)],
       );
 

lib/content_management/bloc/create_source/create_source_event.dart

@@ -76,27 +76,11 @@ final class CreateSourceSubmitted extends CreateSourceEvent {
   const CreateSourceSubmitted();
 }
 
-/// Event for when the country search term is changed.
-final class CreateSourceCountrySearchChanged extends CreateSourceEvent {
-  const CreateSourceCountrySearchChanged(this.searchTerm);
-  final String searchTerm;
-  @override
-  List<Object?> get props => [searchTerm];
-}
-
 /// Event to request loading more countries.
 final class CreateSourceLoadMoreCountriesRequested extends CreateSourceEvent {
   const CreateSourceLoadMoreCountriesRequested();
 }
 
-/// Event for when the language search term is changed.
-final class CreateSourceLanguageSearchChanged extends CreateSourceEvent {
-  const CreateSourceLanguageSearchChanged(this.searchTerm);
-  final String searchTerm;
-  @override
-  List<Object?> get props => [searchTerm];
-}
-
 /// Event to request loading more languages.
 final class CreateSourceLoadMoreLanguagesRequested extends CreateSourceEvent {
   const CreateSourceLoadMoreLanguagesRequested();

lib/content_management/bloc/create_source/create_source_state.dart

@@ -33,12 +33,10 @@ final class CreateSourceState extends Equatable {
     this.countriesHasMore = true,
     this.countriesIsLoadingMore = false,
     this.countriesCursor,
-    this.countrySearchTerm = '',
     this.languages = const [],
     this.languagesHasMore = true,
     this.languagesIsLoadingMore = false,
     this.languagesCursor,
-    this.languageSearchTerm = '',
     this.contentStatus = ContentStatus.active,
     this.exception,
     this.createdSource,
@@ -55,12 +53,10 @@ final class CreateSourceState extends Equatable {
   final bool countriesHasMore;
   final bool countriesIsLoadingMore;
   final String? countriesCursor;
-  final String countrySearchTerm;
   final List<Language> languages;
   final bool languagesHasMore;
   final bool languagesIsLoadingMore;
   final String? languagesCursor;
-  final String languageSearchTerm;
   final ContentStatus contentStatus;
   final HttpException? exception;
   final Source? createdSource;
@@ -86,12 +82,10 @@ final class CreateSourceState extends Equatable {
     bool? countriesHasMore,
     bool? countriesIsLoadingMore,
     String? countriesCursor,
-    String? countrySearchTerm,
     List<Language>? languages,
     bool? languagesHasMore,
     bool? languagesIsLoadingMore,
     String? languagesCursor,
-    String? languageSearchTerm,
     ContentStatus? contentStatus,
     HttpException? exception,
     Source? createdSource,
@@ -109,13 +103,11 @@ final class CreateSourceState extends Equatable {
       countriesIsLoadingMore:
           countriesIsLoadingMore ?? this.countriesIsLoadingMore,
       countriesCursor: countriesCursor ?? this.countriesCursor,
-      countrySearchTerm: countrySearchTerm ?? this.countrySearchTerm,
       languages: languages ?? this.languages,
       languagesHasMore: languagesHasMore ?? this.languagesHasMore,
       languagesIsLoadingMore:
           languagesIsLoadingMore ?? this.languagesIsLoadingMore,
       languagesCursor: languagesCursor ?? this.languagesCursor,
-      languageSearchTerm: languageSearchTerm ?? this.languageSearchTerm,
       contentStatus: contentStatus ?? this.contentStatus,
       exception: exception,
       createdSource: createdSource ?? this.createdSource,
@@ -133,16 +125,14 @@ final class CreateSourceState extends Equatable {
     headquarters,
     countries,
     countriesHasMore,
-    countriesIsLoadingMore,
-    countriesCursor,
-    countrySearchTerm,
-    languages,
-    languagesHasMore,
-    languagesIsLoadingMore,
-    languagesCursor,
-    languageSearchTerm,
-    contentStatus,
-    exception,
+        countriesIsLoadingMore,
+        countriesCursor,
+        languages,
+        languagesHasMore,
+        languagesIsLoadingMore,
+        languagesCursor,
+        contentStatus,
+        exception,
     createdSource,
   ];
 }

lib/content_management/bloc/edit_headline/edit_headline_bloc.dart

@@ -35,10 +35,6 @@ class EditHeadlineBloc extends Bloc<EditHeadlineEvent, EditHeadlineState> {
     on<EditHeadlineCountryChanged>(_onCountryChanged);
     on<EditHeadlineStatusChanged>(_onStatusChanged);
     on<EditHeadlineSubmitted>(_onSubmitted);
-    on<EditHeadlineCountrySearchChanged>(
-      _onCountrySearchChanged,
-      transformer: droppable(),
-    );
     on<EditHeadlineLoadMoreCountriesRequested>(
       _onLoadMoreCountriesRequested,
     );
@@ -245,37 +241,6 @@ class EditHeadlineBloc extends Bloc<EditHeadlineEvent, EditHeadlineState> {
     }
   }
 
-  Future<void> _onCountrySearchChanged(
-    EditHeadlineCountrySearchChanged event,
-    Emitter<EditHeadlineState> emit,
-  ) async {
-    await Future<void>.delayed(_searchDebounceDuration);
-    emit(state.copyWith(countrySearchTerm: event.searchTerm));
-    try {
-      final countriesResponse = await _countriesRepository.readAll(
-        filter: event.searchTerm.isNotEmpty ? {'name': event.searchTerm} : null,
-        sort: [const SortOption('name', SortOrder.asc)],
-      );
-
-      emit(
-        state.copyWith(
-          countries: countriesResponse.items,
-          countriesCursor: countriesResponse.cursor,
-          countriesHasMore: countriesResponse.hasMore,
-        ),
-      );
-    } on HttpException catch (e) {
-      emit(state.copyWith(status: EditHeadlineStatus.failure, exception: e));
-    } catch (e) {
-      emit(
-        state.copyWith(
-          status: EditHeadlineStatus.failure,
-          exception: UnknownException('An unexpected error occurred: $e'),
-        ),
-      );
-    }
-  }
-
   Future<void> _onLoadMoreCountriesRequested(
     EditHeadlineLoadMoreCountriesRequested event,
     Emitter<EditHeadlineState> emit,
@@ -289,9 +254,6 @@ class EditHeadlineBloc extends Bloc<EditHeadlineEvent, EditHeadlineState> {
         pagination: state.countriesCursor != null
             ? PaginationOptions(cursor: state.countriesCursor)
             : null,
-        filter: state.countrySearchTerm.isNotEmpty
-            ? {'name': state.countrySearchTerm}
-            : null,
         sort: [const SortOption('name', SortOrder.asc)],
       );