Fix stale filter and list refresh behavior in events, users, calendar, notes, and dashboard views

Author: CodeDoctorDE

app/lib/api/storage/remote/service.dart

@@ -16,7 +16,7 @@ class RequestDatabaseService extends ModelService with TableService {
   Future<void> create(Database db) async {
     await db.execute('''
       CREATE TABLE IF NOT EXISTS request (
-        id BLOB(16) PRIMARY KEY,
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
         created INTEGER NOT NULL,
         data TEXT NOT NULL
       )
@@ -30,7 +30,7 @@ class RequestDatabaseService extends ModelService with TableService {
     });
   }
 
-  Future<List<ConnectedModel<DateTime, APIRequest>>> getRequests({
+  Future<List<ConnectedModel<int, APIRequest>>> getRequests({
     int offset = 0,
     int limit = 50,
   }) async {
@@ -44,7 +44,7 @@ class RequestDatabaseService extends ModelService with TableService {
     return result
         .map(
           (e) => ConnectedModel(
-            DateTime.fromMillisecondsSinceEpoch(e['created'] as int),
+            e['id'] as int,
             APIRequestMapper.fromJson(e['data'] as String),
           ),
         )
@@ -100,7 +100,7 @@ abstract class RemoteService<T extends RemoteStorage> extends SourceService {
     for (final request in requests) {
       try {
         await request.model.send().then(
-          (value) => local.request.deleteRequest(request.model.id),
+          (value) => local.request.deleteRequest(request.source),
         );
       } catch (_) {}
     }

app/lib/api/storage/remote/sia.dart

@@ -7,8 +7,5 @@ class SiaRemoteService extends RemoteService<SiaStorage> {
   SiaRemoteService(super.remoteStorage, super.local, super.password);
 
   @override
-  Future<void> synchronize() {
-    // TODO: implement sync
-    throw UnimplementedError();
-  }
+  Future<void> synchronize() => super.synchronize();
 }

app/lib/pages/calendar/filter.dart

@@ -79,6 +79,17 @@ class _CalendarFilterViewState extends State<CalendarFilterView> {
     super.initState();
   }
 
+  @override
+  void didUpdateWidget(covariant CalendarFilterView oldWidget) {
+    super.didUpdateWidget(oldWidget);
+
+    if (oldWidget.initialFilter != widget.initialFilter) {
+      setState(() {
+        _filter = widget.initialFilter ?? const CalendarFilter();
+      });
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scrollbar(

app/lib/pages/calendar/page.dart

@@ -164,6 +164,10 @@ class _CalendarBodyViewState extends State<CalendarBodyView> {
   void didUpdateWidget(covariant CalendarBodyView oldWidget) {
     super.didUpdateWidget(oldWidget);
 
+    if (oldWidget.filter != widget.filter) {
+      _filter = widget.filter;
+    }
+
     if (oldWidget.view != widget.view) {
       setState(() {});
     }

app/lib/pages/dashboard/events.dart

@@ -97,14 +97,19 @@ class _DashboardEventsViewState extends State<DashboardEventsView> {
                           (e) => ListTile(
                             title: Text(e.main.name),
                             subtitle: MarkdownText(e.main.description),
-                            onTap: () => showDialog(
-                              context: context,
-                              builder: (context) => CalendarItemDialog(
-                                event: e.sub,
-                                item: e.main,
-                                source: e.source,
-                              ),
-                            ).then((value) => setState(() {})),
+                            onTap: () =>
+                                showDialog(
+                                  context: context,
+                                  builder: (context) => CalendarItemDialog(
+                                    event: e.sub,
+                                    item: e.main,
+                                    source: e.source,
+                                  ),
+                                ).then(
+                                  (value) => setState(() {
+                                    _appointmentsFuture = _getAppointments();
+                                  }),
+                                ),
                           ),
                         )
                         .toList(),

app/lib/pages/events/filter.dart

@@ -49,6 +49,17 @@ class _EventFilterViewState extends State<EventFilterView> {
     super.initState();
   }
 
+  @override
+  void didUpdateWidget(covariant EventFilterView oldWidget) {
+    super.didUpdateWidget(oldWidget);
+
+    if (oldWidget.initialFilter != widget.initialFilter) {
+      setState(() {
+        _filter = widget.initialFilter ?? const EventFilter();
+      });
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scrollbar(

app/lib/pages/events/page.dart

@@ -108,6 +108,9 @@ class _EventsBodyViewState extends State<EventsBodyView> {
               offset: offset,
               limit: limit,
               groupId: _filter.source == source ? _filter.group : null,
+              resourceIds: _filter.source == source && _filter.resource != null
+                  ? [_filter.resource!]
+                  : null,
               search: widget.search,
             ),
     );
@@ -125,7 +128,12 @@ class _EventsBodyViewState extends State<EventsBodyView> {
   void didUpdateWidget(covariant EventsBodyView oldWidget) {
     super.didUpdateWidget(oldWidget);
 
-    if (oldWidget.search != widget.search) {
+    final changedFilter = oldWidget.filter != widget.filter;
+    if (changedFilter) {
+      _filter = widget.filter;
+    }
+
+    if (oldWidget.search != widget.search || changedFilter) {
       _bloc.refresh();
     }
   }

app/lib/pages/notes/page.dart

@@ -92,7 +92,7 @@ class NotesBodyView extends StatefulWidget {
 class _NotesBodyViewState extends State<NotesBodyView> {
   late final FlowCubit _flowCubit;
   late final SourcedPagingBloc<Note> _bloc;
-  late final Future<Note?> _parent;
+  late Future<Note?> _parent;
   late NoteFilter _filter;
 
   @override
@@ -156,6 +156,9 @@ class _NotesBodyViewState extends State<NotesBodyView> {
 
     if (oldWidget.search != widget.search ||
         oldWidget.parent != widget.parent) {
+      if (oldWidget.parent != widget.parent) {
+        _parent = _fetchParent();
+      }
       _bloc.refresh();
     }
     if (oldWidget.filter != widget.filter) {

app/lib/pages/users/filter.dart

@@ -41,6 +41,17 @@ class _UserFilterViewState extends State<UserFilterView> {
     super.initState();
   }
 
+  @override
+  void didUpdateWidget(covariant UserFilterView oldWidget) {
+    super.didUpdateWidget(oldWidget);
+
+    if (oldWidget.initialFilter != widget.initialFilter) {
+      setState(() {
+        _filter = widget.initialFilter ?? const UserFilter();
+      });
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scrollbar(

app/lib/pages/users/page.dart

@@ -107,7 +107,7 @@ class _UsersBodyViewState extends State<UsersBodyView> {
           : service.user?.getUsers(
               offset: offset,
               limit: limit,
-              groupId: _filter.group,
+              groupId: _filter.source == source ? _filter.group : null,
               search: widget.search,
             ),
     );
@@ -125,7 +125,12 @@ class _UsersBodyViewState extends State<UsersBodyView> {
   void didUpdateWidget(covariant UsersBodyView oldWidget) {
     super.didUpdateWidget(oldWidget);
 
-    if (oldWidget.search != widget.search) {
+    final changedFilter = oldWidget.filter != widget.filter;
+    if (changedFilter) {
+      _filter = widget.filter;
+    }
+
+    if (oldWidget.search != widget.search || changedFilter) {
       _bloc.refresh();
     }
   }