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

Ensure errors are displayed as first entries in tray window activity list, add testing for SortedActivityListModel #5408

Merged
merged 22 commits into from
Jul 25, 2023

Conversation

claucambra
Copy link
Collaborator

At the moment they are often pushed way down the list below less important entries such as notifications due to their activity type

With this PR we ensure they are first on the list

With this PR:

Screenshot 2023-02-06 at 17 50 38

Master:

Screen.Recording.2023-02-06.at.15.25.39.mov

@claucambra
Copy link
Collaborator Author

/backport to stable-3.7

@codecov
Copy link

codecov bot commented Feb 6, 2023

Codecov Report

Merging #5408 (74bdbb4) into master (9727440) will increase coverage by 0.02%.
The diff coverage is n/a.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #5408      +/-   ##
==========================================
+ Coverage   60.05%   60.08%   +0.02%     
==========================================
  Files         145      145              
  Lines       18762    18762              
==========================================
+ Hits        11268    11273       +5     
+ Misses       7494     7489       -5     

see 1 file with indirect coverage changes

Copy link
Collaborator

@mgallien mgallien left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is missing automated tests

@claucambra claucambra force-pushed the bugfix/errors-in-activity-list-sort branch 4 times, most recently from 5923cff to ed56fd1 Compare March 1, 2023 13:32
@claucambra
Copy link
Collaborator Author

this is missing automated tests

Took a lot of changes to not duplicate masses of code, but the sort order is now fully tested (and the sortedactivitylistmodel in general)

@claucambra claucambra requested a review from mgallien March 1, 2023 15:35
@claucambra claucambra changed the title Ensure errors are displayed as first entries in tray window activity list Ensure errors are displayed as first entries in tray window activity list, add testing for SortedActivityListModel Mar 1, 2023
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ clang-tidy found issue(s) with the introduced code (1/1)

test/activitylistmodeltestutils.h Outdated Show resolved Hide resolved
test/activitylistmodeltestutils.h Outdated Show resolved Hide resolved
@sonarcloud
Copy link

sonarcloud bot commented Mar 1, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

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

94.4% 94.4% Coverage
0.0% 0.0% Duplication

@claucambra claucambra force-pushed the bugfix/errors-in-activity-list-sort branch from f1a01de to 3f3c9ed Compare July 20, 2023 11:37
@claucambra claucambra force-pushed the bugfix/errors-in-activity-list-sort branch from 3f3c9ed to 6b4bf71 Compare July 25, 2023 00:20
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-5408-6b4bf71a5ee68cff7bdc1bc5842407f8bc1c750d-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.

…ated when the sourcemodel does

Signed-off-by: Claudio Cambra <[email protected]>
Signed-off-by: Claudio Cambra <[email protected]>
…ities to be displayed in activitylistmodel

Signed-off-by: Claudio Cambra <[email protected]>
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra claucambra force-pushed the bugfix/errors-in-activity-list-sort branch from 6b4bf71 to 74bdbb4 Compare July 25, 2023 00:43
@github-actions github-actions bot dismissed their stale review July 25, 2023 00:54

No clang-tidy warnings found so I assume my comments were addressed

@sonarcloud
Copy link

sonarcloud bot commented Jul 25, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

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

94.4% 94.4% Coverage
0.0% 0.0% Duplication

idea Catch issues before they fail your Quality Gate with our IDE extension sonarlint SonarLint

@claucambra claucambra disabled auto-merge July 25, 2023 01:58
@claucambra claucambra merged commit 415acaf into master Jul 25, 2023
11 of 12 checks passed
@claucambra claucambra deleted the bugfix/errors-in-activity-list-sort branch July 25, 2023 01:59
@backportbot-nextcloud
Copy link

The backport to stable-3.7 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable-3.7
git pull origin stable-3.7

# Create the new backport branch
git checkout -b fix/foo-stable-3.7

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable-3.7

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-5408-74bdbb4aa13bf92bff05e82b3a4605d6a224f9f7-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.

@mgallien mgallien added this to the 3.10.0 milestone Sep 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants