Skip to content

fix(dashboard): restore studies table pinning #817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mohiuddinshahrukh wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(dashboard): restore studies table pinning #817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions designer_v2/lib/features/dashboard/dashboard_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ class DashboardController extends _$DashboardController
state = state.copyWith(
savedFilters: () => savedFilters,
activeFilter: () => active.filterGroup,
pinnedStudies: () => _userRepository.user.preferences.pinnedStudies,
selectedSavedFilterId: () => active.presetId,
);
} catch (e) {
Expand Down Expand Up @@ -162,11 +163,17 @@ class DashboardController extends _$DashboardController

Future<void> pinStudy(String modelId) async {
await _userRepository.updatePreferences(PreferenceAction.pin, modelId);
state = state.copyWith(
pinnedStudies: () => _userRepository.user.preferences.pinnedStudies,
);
sortStudies();
}

Future<void> pinOffStudy(String modelId) async {
await _userRepository.updatePreferences(PreferenceAction.pinOff, modelId);
state = state.copyWith(
pinnedStudies: () => _userRepository.user.preferences.pinnedStudies,
);
sortStudies();
}

Expand All @@ -182,9 +189,7 @@ class DashboardController extends _$DashboardController
}

Future<void> sortStudies() async {
final studies = state.sort(
pinnedStudies: _userRepository.user.preferences.pinnedStudies,
);
final studies = state.sort(pinnedStudies: state.pinnedStudies);
state = state.copyWith(studies: () => AsyncValue.data(studies));
}

Expand Down
83 changes: 35 additions & 48 deletions designer_v2/lib/features/dashboard/dashboard_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import 'package:studyu_designer_v2/features/dashboard/studies_filter/filter_type
import 'package:studyu_designer_v2/features/dashboard/studies_table.dart';
import 'package:studyu_designer_v2/localization/app_localizations.dart';
import 'package:studyu_designer_v2/localization/app_translation.dart';
import 'package:studyu_designer_v2/repositories/user_repository.dart';
import 'package:studyu_designer_v2/utils/comparator_utils.dart';
import 'package:studyu_designer_v2/utils/performance.dart';

Expand Down Expand Up @@ -516,53 +515,41 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
),
],
const SizedBox(height: 24.0), // spacing between body elements
FutureBuilder<StudyUUser>(
future: ref.read(userRepositoryProvider).fetchUser(),
builder: (context, snapshot) {
if (snapshot.hasData) {
return AsyncValueWidget<List<Study>>(
loading: () =>
const Center(child: CircularProgressIndicator()),
value: state.displayedStudies(
snapshot.data!.preferences.pinnedStudies,
state.query,
),
data: (visibleStudies) => StudiesTable(
studies: visibleStudies,
pinnedStudies: snapshot.data!.preferences.pinnedStudies,
dashboardController: ref.watch(
dashboardControllerProvider.notifier,
),
onSelect: controller.onSelectStudy,
getActions: controller.availableActions,
emptyWidget:
(widget.filter == null ||
widget.filter == StudiesFilter.owned)
? (state.query.isNotEmpty)
? Padding(
padding: const EdgeInsets.only(top: 24.0),
child: EmptyBody(
icon: Icons.content_paste_search_rounded,
title: tr.studies_not_found,
description: tr.modify_query,
),
)
: Padding(
padding: const EdgeInsets.only(top: 24.0),
child: EmptyBody(
icon: Icons.content_paste_search_rounded,
title: tr.studies_empty,
description: tr.studies_empty_description,
// "...or create a new draft copy from an already published study!",
/* button: PrimaryButton(text: "From template",); */
),
)
: const SizedBox.shrink(),
),
);
}
return const Center(child: CircularProgressIndicator());
},
AsyncValueWidget<List<Study>>(
loading: () => const Center(child: CircularProgressIndicator()),
value: state.displayedStudies(state.pinnedStudies, state.query),
data: (visibleStudies) => StudiesTable(
studies: visibleStudies,
pinnedStudies: state.pinnedStudies,
dashboardController: ref.watch(
dashboardControllerProvider.notifier,
),
onSelect: controller.onSelectStudy,
getActions: controller.availableActions,
emptyWidget:
(widget.filter == null ||
widget.filter == StudiesFilter.owned)
? (state.query.isNotEmpty)
? Padding(
padding: const EdgeInsets.only(top: 24.0),
child: EmptyBody(
icon: Icons.content_paste_search_rounded,
title: tr.studies_not_found,
description: tr.modify_query,
),
)
: Padding(
padding: const EdgeInsets.only(top: 24.0),
child: EmptyBody(
icon: Icons.content_paste_search_rounded,
title: tr.studies_empty,
description: tr.studies_empty_description,
// "...or create a new draft copy from an already published study!",
/* button: PrimaryButton(text: "From template",); */
),
)
: const SizedBox.shrink(),
),
),
],
),
Expand Down
9 changes: 8 additions & 1 deletion designer_v2/lib/features/dashboard/dashboard_state.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class DashboardState extends Equatable {
this.sortByColumn = StudiesTableColumn.title,
this.sortAscending = true,
this.savedFilters = const [],
this.pinnedStudies = const {},
this.selectedSavedFilterId,
required this.currentUser,
required this.searchController,
Expand All @@ -44,6 +45,9 @@ class DashboardState extends Equatable {
/// List of saved custom filters
final List<SavedFilter> savedFilters;

/// Pinned study ids from the current user's preferences.
final Set<String> pinnedStudies;

/// Currently selected sort column to be applied to the list of studies
/// in order to determine the [displayedStudies]
final StudiesTableColumn sortByColumn;
Expand Down Expand Up @@ -113,7 +117,7 @@ class DashboardState extends Equatable {
required Set<String> pinnedStudies,
List<Study>? studiesToSort,
}) {
final sortedStudies = studiesToSort ?? studies.value!;
final sortedStudies = List<Study>.from(studiesToSort ?? studies.value!);
switch (sortByColumn) {
case StudiesTableColumn.title:
if (sortAscending) {
Expand Down Expand Up @@ -218,6 +222,7 @@ class DashboardState extends Equatable {
StudiesFilter? Function()? studiesFilter,
FilterGroup? Function()? activeFilter,
List<SavedFilter> Function()? savedFilters,
Set<String> Function()? pinnedStudies,
User Function()? currentUser,
String? query,
StudiesTableColumn? sortByColumn,
Expand All @@ -232,6 +237,7 @@ class DashboardState extends Equatable {
: this.studiesFilter,
activeFilter: activeFilter != null ? activeFilter() : this.activeFilter,
savedFilters: savedFilters != null ? savedFilters() : this.savedFilters,
pinnedStudies: pinnedStudies != null ? pinnedStudies() : this.pinnedStudies,
currentUser: currentUser != null ? currentUser() : this.currentUser,
query: query ?? this.query,
sortByColumn: sortByColumn ?? this.sortByColumn,
Expand All @@ -251,6 +257,7 @@ class DashboardState extends Equatable {
studiesFilter,
activeFilter,
savedFilters,
pinnedStudies,
query,
sortByColumn,
sortAscending,
Expand Down
6 changes: 3 additions & 3 deletions designer_v2/lib/features/dashboard/studies_table.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,9 @@ class StudiesTable extends StatelessWidget {
rowSpacing: rowSpacing,
columnSpacing: columnSpacing,
onPinnedChanged: (study, pinned) {
pinnedStudies.contains(item.id)
? dashboardController.pinOffStudy(item.id)
: dashboardController.pinStudy(item.id);
pinned
? dashboardController.pinStudy(study.id)
: dashboardController.pinOffStudy(study.id);
},
onTap: (study) => onSelect.call(study),
);
Expand Down
Loading