Skip to content
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.

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

Add a QSortFilterProxyModel-based SortedActivityListModel #4933

Merged
merged 2 commits into from
Sep 26, 2022

Conversation

claucambra
Copy link
Collaborator

@claucambra claucambra commented Sep 14, 2022

This retains the benefits of #4736 while obviating the need for much of the error-prone sorting currently done in the ActivityListModel.

The results in a far simpler ActivityListModel, and thanks to the QSortFilterProxyModel, a far less complicated and error-prone sorting method. The SortedActivityListModel will also allow us to more easily modify sorting details in the future.

@claucambra claucambra self-assigned this Sep 14, 2022
@claucambra claucambra force-pushed the bugfix/sorted-activity-model branch 2 times, most recently from c88d98b to 17fcce7 Compare September 14, 2022 09:23
@codecov
Copy link

codecov bot commented Sep 14, 2022

Codecov Report

Merging #4933 (e721b03) into master (6a117be) will increase coverage by 0.00%.
The diff coverage is n/a.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #4933   +/-   ##
=======================================
  Coverage   57.12%   57.12%           
=======================================
  Files         138      138           
  Lines       17232    17232           
=======================================
+ Hits         9843     9844    +1     
+ Misses       7389     7388    -1     
Impacted Files Coverage Δ
src/libsync/syncfileitem.h 37.50% <ø> (ø)
src/libsync/vfs/cfapi/cfapiwrapper.cpp 74.65% <0.00%> (+0.22%) ⬆️

src/gui/tray/sortedactivitylistmodel.h Outdated Show resolved Hide resolved
@claucambra claucambra force-pushed the bugfix/sorted-activity-model branch 4 times, most recently from 47f2ef5 to 2691853 Compare September 26, 2022 14:21
…ctivities

Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
…ivitylistmodel

Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
@claucambra claucambra force-pushed the bugfix/sorted-activity-model branch from 2691853 to e721b03 Compare September 26, 2022 16:18
@sonarcloud
Copy link

sonarcloud bot commented Sep 26, 2022

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 8 Code Smells

29.4% 29.4% Coverage
0.0% 0.0% Duplication

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-4933-e721b03106cc606372e657cf45e8fb8eb3e86e84-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@claucambra claucambra merged commit 56fe6a1 into master Sep 26, 2022
@claucambra claucambra deleted the bugfix/sorted-activity-model branch September 26, 2022 17:19
@mgallien mgallien added this to the 3.7.0 milestone Oct 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants