feat: refactor announcement title retrieval and improve error handlin…

…g in create announcement dialog
nmshd · Feb 25, 2025 · d4e92da · d4e92da
1 parent 4e659d9
commit d4e92da
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/...cations/AdminUi/apps/admin_ui/lib/home/announcements_overview/announcements_overview.dart b/...cations/AdminUi/apps/admin_ui/lib/home/announcements_overview/announcements_overview.dart
@@ -66,7 +66,7 @@ class _AnnouncementsOverviewState extends State<AnnouncementsOverview> {
                         (announcement) => DataRow2(
                           onTap: () => context.go('/announcements/${announcement.id}'),
                           cells: [
-                            DataCell(Text(announcement.texts.firstWhere((t) => t.language == 'en').title)), // TODO: find a better way
+                            DataCell(Text(_getAnnouncementTitle(announcement, 'en'))),
                             DataCell(
                               Tooltip(
                                 message:
@@ -100,6 +100,10 @@ class _AnnouncementsOverviewState extends State<AnnouncementsOverview> {
     );
   }
 
+  String _getAnnouncementTitle(AnnouncementOverview announcement, String language) {
+    return announcement.texts.firstWhere((t) => t.language == language).title;
+  }
+
   Future<void> _reloadAnnouncements() async {
     final response = await GetIt.I.get<AdminApiClient>().announcements.getAnnouncements();
     final announcements = response.data..sort((a, b) => a.createdAt.compareTo(b.createdAt));

diff --git a/...inUi/apps/admin_ui/lib/home/announcements_overview/modals/create_announcement_dialog.dart b/...inUi/apps/admin_ui/lib/home/announcements_overview/modals/create_announcement_dialog.dart
@@ -1,4 +1,3 @@
-// ignore_for_file: public_member_api_docs, sort_constructors_first
 import 'package:admin_api_sdk/admin_api_sdk.dart';
 import 'package:admin_api_types/admin_api_types.dart';
 import 'package:flutter/material.dart';
@@ -188,15 +187,16 @@ class _CreateAnnouncementDialogState extends State<_CreateAnnouncementDialog> {
                   announcementTexts: announcementTexts,
                   recipients: [],
                 );
-                if (!mounted) return;
+
+                if (!context.mounted) return;
                 context.pop();
 
-                if (response.hasData) {
-                  widget.onAnnouncementCreated();
-                  _showSuccessSnackbar();
+                if (response.hasError) {
+                  _showErrorSnackbar();
                   return;
                 }
-                _showErrorSnackbar();
+                widget.onAnnouncementCreated();
+                _showSuccessSnackbar();
               }
             },
             child: Text(context.l10n.create),