Merge pull request #53 from flutter-news-app-full-source-code/dashboard-content-management-state-sync

fulleni · web-flow · commit 2177cea96c0e · 2025-08-02T17:51:56.000+01:00
Dashboard content management state sync
diff --git a/lib/app/view/app.dart b/lib/app/view/app.dart
@@ -112,9 +112,11 @@ class App extends StatelessWidget {
           ),
           BlocProvider(
             create: (context) => DashboardBloc(
-              dashboardSummaryRepository: context
-                  .read<DataRepository<DashboardSummary>>(),
+              dashboardSummaryRepository:
+                  context.read<DataRepository<DashboardSummary>>(),
               headlinesRepository: context.read<DataRepository<Headline>>(),
+              topicsRepository: context.read<DataRepository<Topic>>(),
+              sourcesRepository: context.read<DataRepository<Source>>(),
             ),
           ),
         ],
diff --git a/lib/content_management/view/archived_sources_page.dart b/lib/content_management/view/archived_sources_page.dart
@@ -45,7 +45,6 @@ class _ArchivedSourcesView extends StatelessWidget {
               context.read<ContentManagementBloc>().add(
                     const LoadSourcesRequested(limit: kDefaultRowsPerPage),
                   );
-              context.read<DashboardBloc>().add(DashboardSummaryLoaded());
             }
           },
           child: BlocBuilder<ArchivedSourcesBloc, ArchivedSourcesState>(
diff --git a/lib/content_management/view/archived_topics_page.dart b/lib/content_management/view/archived_topics_page.dart
@@ -45,7 +45,6 @@ class _ArchivedTopicsView extends StatelessWidget {
               context
                   .read<ContentManagementBloc>()
                   .add(const LoadTopicsRequested(limit: kDefaultRowsPerPage));
-              context.read<DashboardBloc>().add( DashboardSummaryLoaded());
             }
           },
           child: BlocBuilder<ArchivedTopicsBloc, ArchivedTopicsState>(
diff --git a/lib/content_management/view/create_headline_page.dart b/lib/content_management/view/create_headline_page.dart
@@ -89,7 +89,6 @@ class _CreateHeadlineViewState extends State<_CreateHeadlineView> {
               // Refresh the list to show the new headline
               const LoadHeadlinesRequested(limit: kDefaultRowsPerPage),
             );
-            context.read<DashboardBloc>().add(DashboardSummaryLoaded());
             context.pop();
           }
           if (state.status == CreateHeadlineStatus.failure) {
diff --git a/lib/content_management/view/create_source_page.dart b/lib/content_management/view/create_source_page.dart
@@ -89,7 +89,6 @@ class _CreateSourceViewState extends State<_CreateSourceView> {
               // Refresh the list to show the new source
               const LoadSourcesRequested(limit: kDefaultRowsPerPage),
             );
-            context.read<DashboardBloc>().add(DashboardSummaryLoaded());
             context.pop();
           }
           if (state.status == CreateSourceStatus.failure) {
diff --git a/lib/content_management/view/create_topic_page.dart b/lib/content_management/view/create_topic_page.dart
@@ -86,7 +86,6 @@ class _CreateTopicViewState extends State<_CreateTopicView> {
               // Refresh the list to show the new topic
               const LoadTopicsRequested(limit: kDefaultRowsPerPage),
             );
-            context.read<DashboardBloc>().add(DashboardSummaryLoaded());
             context.pop();
           }
           if (state.status == CreateTopicStatus.failure) {
diff --git a/lib/content_management/view/edit_headline_page.dart b/lib/content_management/view/edit_headline_page.dart
@@ -117,7 +117,6 @@ class _EditHeadlineViewState extends State<_EditHeadlineView> {
             context.read<ContentManagementBloc>().add(
               const LoadHeadlinesRequested(limit: kDefaultRowsPerPage),
             );
-            context.read<DashboardBloc>().add(DashboardSummaryLoaded());
             context.pop();
           }
           if (state.status == EditHeadlineStatus.failure) {
diff --git a/lib/content_management/view/edit_source_page.dart b/lib/content_management/view/edit_source_page.dart
@@ -114,7 +114,6 @@ class _EditSourceViewState extends State<_EditSourceView> {
             context.read<ContentManagementBloc>().add(
               const LoadSourcesRequested(limit: kDefaultRowsPerPage),
             );
-            context.read<DashboardBloc>().add(DashboardSummaryLoaded());
             context.pop();
           }
           if (state.status == EditSourceStatus.failure) {
diff --git a/lib/content_management/view/edit_topic_page.dart b/lib/content_management/view/edit_topic_page.dart
@@ -111,7 +111,6 @@ class _EditTopicViewState extends State<_EditTopicView> {
             context.read<ContentManagementBloc>().add(
               const LoadTopicsRequested(limit: kDefaultRowsPerPage),
             );
-            context.read<DashboardBloc>().add(DashboardSummaryLoaded());
             context.pop();
           }
           if (state.status == EditTopicStatus.failure) {
diff --git a/lib/dashboard/bloc/dashboard_bloc.dart b/lib/dashboard/bloc/dashboard_bloc.dart
@@ -1,7 +1,10 @@
+import 'dart:async';
+
 import 'package:bloc/bloc.dart';
 import 'package:core/core.dart';
 import 'package:data_repository/data_repository.dart';
 import 'package:equatable/equatable.dart';
+import 'package:stream_transform/stream_transform.dart';
 
 part 'dashboard_event.dart';
 part 'dashboard_state.dart';
@@ -12,17 +15,39 @@ class DashboardBloc extends Bloc<DashboardEvent, DashboardState> {
   DashboardBloc({
     required DataRepository<DashboardSummary> dashboardSummaryRepository,
     required DataRepository<Headline> headlinesRepository,
+    required DataRepository<Topic> topicsRepository,
+    required DataRepository<Source> sourcesRepository,
   }) : _dashboardSummaryRepository = dashboardSummaryRepository,
        _headlinesRepository = headlinesRepository,
        super(const DashboardState()) {
-    on<DashboardSummaryLoaded>(_onDashboardSummaryLoaded);
+    on<DashboardSummaryRequested>(_onDashboardSummaryRequested);
+    on<_DashboardEntityUpdated>(_onDashboardEntityUpdated);
+
+    _entityUpdatedSubscription = headlinesRepository.entityUpdated
+        .merge(topicsRepository.entityUpdated)
+        .merge(sourcesRepository.entityUpdated)
+        .listen((_) => add(const _DashboardEntityUpdated()));
   }
 
   final DataRepository<DashboardSummary> _dashboardSummaryRepository;
   final DataRepository<Headline> _headlinesRepository;
+  late final StreamSubscription<void> _entityUpdatedSubscription;
+
+  @override
+  Future<void> close() {
+    _entityUpdatedSubscription.cancel();
+    return super.close();
+  }
+
+  void _onDashboardEntityUpdated(
+    _DashboardEntityUpdated event,
+    Emitter<DashboardState> emit,
+  ) {
+    add(DashboardSummaryRequested());
+  }
 
-  Future<void> _onDashboardSummaryLoaded(
-    DashboardSummaryLoaded event,
+  Future<void> _onDashboardSummaryRequested(
+    DashboardSummaryRequested event,
     Emitter<DashboardState> emit,
   ) async {
     emit(state.copyWith(status: DashboardStatus.loading));
diff --git a/lib/dashboard/bloc/dashboard_event.dart b/lib/dashboard/bloc/dashboard_event.dart
@@ -9,4 +9,9 @@ sealed class DashboardEvent extends Equatable {
 }
 
 /// Event to load the dashboard summary data.
-final class DashboardSummaryLoaded extends DashboardEvent {}
+final class DashboardSummaryRequested extends DashboardEvent {}
+
+/// Internal event triggered when a listened-to entity is updated.
+final class _DashboardEntityUpdated extends DashboardEvent {
+  const _DashboardEntityUpdated();
+}
diff --git a/lib/dashboard/view/dashboard_page.dart b/lib/dashboard/view/dashboard_page.dart
@@ -23,7 +23,7 @@ class _DashboardPageState extends State<DashboardPage> {
   void initState() {
     super.initState();
     // Dispatch the event to load dashboard data when the page is initialized.
-    context.read<DashboardBloc>().add(DashboardSummaryLoaded());
+    context.read<DashboardBloc>().add(DashboardSummaryRequested());
   }
 
   @override
@@ -44,7 +44,7 @@ class _DashboardPageState extends State<DashboardPage> {
             return FailureStateWidget(
               exception: state.exception!,
               onRetry: () {
-                context.read<DashboardBloc>().add(DashboardSummaryLoaded());
+                context.read<DashboardBloc>().add(DashboardSummaryRequested());
               },
             );
           }
diff --git a/pubspec.lock b/pubspec.lock
@@ -134,7 +134,7 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: "5a7bd9f597e98209bc7f5ac897cf64552306c02f"
+      resolved-ref: d9fbbf33d8bb53724e2dd29d488a0c8eb9cbf6e8
       url: "https://github.com/flutter-news-app-full-source-code/data-repository.git"
     source: git
     version: "0.0.0"

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ class _ArchivedSourcesView extends StatelessWidget {`
`45`	`45`	`context.read<ContentManagementBloc>().add(`
`46`	`46`	`const LoadSourcesRequested(limit: kDefaultRowsPerPage),`
`47`	`47`	`);`
`48`		`- context.read<DashboardBloc>().add(DashboardSummaryLoaded());`
`49`	`48`	`}`
`50`	`49`	`},`
`51`	`50`	`child: BlocBuilder<ArchivedSourcesBloc, ArchivedSourcesState>(`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ class _ArchivedTopicsView extends StatelessWidget {`
`45`	`45`	`context`
`46`	`46`	`.read<ContentManagementBloc>()`
`47`	`47`	`.add(const LoadTopicsRequested(limit: kDefaultRowsPerPage));`
`48`		`- context.read<DashboardBloc>().add( DashboardSummaryLoaded());`
`49`	`48`	`}`
`50`	`49`	`},`
`51`	`50`	`child: BlocBuilder<ArchivedTopicsBloc, ArchivedTopicsState>(`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ class _CreateHeadlineViewState extends State<_CreateHeadlineView> {`
`89`	`89`	`// Refresh the list to show the new headline`
`90`	`90`	`const LoadHeadlinesRequested(limit: kDefaultRowsPerPage),`
`91`	`91`	`);`
`92`		`- context.read<DashboardBloc>().add(DashboardSummaryLoaded());`
`93`	`92`	`context.pop();`
`94`	`93`	`}`
`95`	`94`	`if (state.status == CreateHeadlineStatus.failure) {`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ class _CreateSourceViewState extends State<_CreateSourceView> {`
`89`	`89`	`// Refresh the list to show the new source`
`90`	`90`	`const LoadSourcesRequested(limit: kDefaultRowsPerPage),`
`91`	`91`	`);`
`92`		`- context.read<DashboardBloc>().add(DashboardSummaryLoaded());`
`93`	`92`	`context.pop();`
`94`	`93`	`}`
`95`	`94`	`if (state.status == CreateSourceStatus.failure) {`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,6 @@ class _CreateTopicViewState extends State<_CreateTopicView> {`
`86`	`86`	`// Refresh the list to show the new topic`
`87`	`87`	`const LoadTopicsRequested(limit: kDefaultRowsPerPage),`
`88`	`88`	`);`
`89`		`- context.read<DashboardBloc>().add(DashboardSummaryLoaded());`
`90`	`89`	`context.pop();`
`91`	`90`	`}`
`92`	`91`	`if (state.status == CreateTopicStatus.failure) {`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,6 @@ class _EditHeadlineViewState extends State<_EditHeadlineView> {`
`117`	`117`	`context.read<ContentManagementBloc>().add(`
`118`	`118`	`const LoadHeadlinesRequested(limit: kDefaultRowsPerPage),`
`119`	`119`	`);`
`120`		`- context.read<DashboardBloc>().add(DashboardSummaryLoaded());`
`121`	`120`	`context.pop();`
`122`	`121`	`}`
`123`	`122`	`if (state.status == EditHeadlineStatus.failure) {`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,6 @@ class _EditSourceViewState extends State<_EditSourceView> {`
`114`	`114`	`context.read<ContentManagementBloc>().add(`
`115`	`115`	`const LoadSourcesRequested(limit: kDefaultRowsPerPage),`
`116`	`116`	`);`
`117`		`- context.read<DashboardBloc>().add(DashboardSummaryLoaded());`
`118`	`117`	`context.pop();`
`119`	`118`	`}`
`120`	`119`	`if (state.status == EditSourceStatus.failure) {`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,6 @@ class _EditTopicViewState extends State<_EditTopicView> {`
`111`	`111`	`context.read<ContentManagementBloc>().add(`
`112`	`112`	`const LoadTopicsRequested(limit: kDefaultRowsPerPage),`
`113`	`113`	`);`
`114`		`- context.read<DashboardBloc>().add(DashboardSummaryLoaded());`
`115`	`114`	`context.pop();`
`116`	`115`	`}`
`117`	`116`	`if (state.status == EditTopicStatus.failure) {`