fix: use latest user for dashboard study table

hpi-studyu · Jul 11, 2024 · 60a2876 · 60a2876
1 parent 61b80c4
commit 60a2876
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/designer_v2/lib/features/dashboard/dashboard_page.dart b/designer_v2/lib/features/dashboard/dashboard_page.dart
@@ -24,14 +24,11 @@ class DashboardScreen extends ConsumerStatefulWidget {
 }
 
 class _DashboardScreenState extends ConsumerState<DashboardScreen> {
-  late Future<StudyUUser> user;
-
   @override
   void initState() {
     super.initState();
     final controller = ref.read(dashboardControllerProvider.notifier);
     runAsync(() => controller.setStudiesFilter(widget.filter));
-    user = runAsync(() => ref.watch(userRepositoryProvider).fetchUser());
   }
 
   @override
@@ -86,7 +83,7 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
           ),
           const SizedBox(height: 24.0), // spacing between body elements
           FutureBuilder<StudyUUser>(
-            future: user,
+            future: ref.read(userRepositoryProvider).fetchUser(),
             builder: (context, snapshot) {
               if (snapshot.hasData) {
                 return AsyncValueWidget<List<Study>>(

diff --git a/designer_v2/lib/features/dashboard/dashboard_state.dart b/designer_v2/lib/features/dashboard/dashboard_state.dart
@@ -52,9 +52,10 @@ class DashboardState extends Equatable {
       data: (studies) {
         List<Study> updatedStudies =
             studiesFilter.apply(studies: studies, user: currentUser).toList();
-        updatedStudies = filter(studiesToFilter: updatedStudies);
-        updatedStudies =
-            sort(pinnedStudies: pinnedStudies, studiesToSort: updatedStudies);
+        updatedStudies = sort(
+          pinnedStudies: pinnedStudies,
+          studiesToSort: filter(studiesToFilter: updatedStudies),
+        );
         return AsyncValue.data(updatedStudies);
       },
       error: (error, _) => AsyncValue.error(error, StackTrace.current),