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

NAS-128515 / 24.10 / Fixes stats logic on Installed apps page (by undsoft) #10023

Merged
merged 2 commits into from
May 3, 2024

Conversation

bugclerk
Copy link
Contributor

@bugclerk bugclerk commented May 3, 2024

Automatic cherry-pick failed. Please resolve conflicts by running:

git reset --hard HEAD~1
git cherry-pick -x 6ca8cf30b01e3e3a7eaec3489180e65a16325914
git cherry-pick -x 995904e37ee1b5d065be46d0bb37abb39425c211

If the original PR was merged via a squash, you can just cherry-pick the squashed commit:

git reset --hard HEAD~1
git cherry-pick -x 0339900595d1c10ed49eafbdf06230de79cdda86

Testing: see https://ixsystems.atlassian.net/browse/NAS-128515 and https://ixsystems.atlassian.net/browse/NAS-127859

Original PR: #10020
Jira URL: https://ixsystems.atlassian.net/browse/NAS-128515

Copy link
Collaborator

@undsoft undsoft left a comment

Choose a reason for hiding this comment

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

backported

@undsoft undsoft marked this pull request as ready for review May 3, 2024 07:38
@undsoft undsoft requested a review from a team as a code owner May 3, 2024 07:38
@undsoft undsoft requested review from RehanY147 and removed request for a team May 3, 2024 07:38
@undsoft undsoft enabled auto-merge (squash) May 3, 2024 07:38
Copy link

codecov bot commented May 3, 2024

Codecov Report

Attention: Patch coverage is 80.76923% with 5 lines in your changes are missing coverage. Please review.

Project coverage is 73.57%. Comparing base (c90ab57) to head (5c0525f).
Report is 2 commits behind head on master.

Files Patch % Lines
...ponents/installed-apps/installed-apps.component.ts 0.00% 4 Missing ⚠️
...es/apps/components/apps-scope-wrapper.component.ts 0.00% 1 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##           master   #10023   +/-   ##
=======================================
  Coverage   73.57%   73.57%           
=======================================
  Files        1504     1505    +1     
  Lines       52660    52672   +12     
  Branches     6292     6288    -4     
=======================================
+ Hits        38745    38754    +9     
- Misses      13915    13918    +3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@undsoft undsoft merged commit ca7f7a8 into master May 3, 2024
9 checks passed
@undsoft undsoft deleted the NAS-128515-24.10 branch May 3, 2024 08:09
@bugclerk
Copy link
Contributor Author

bugclerk commented May 3, 2024

This PR has been merged and conversations have been locked.
If you would like to discuss more about this issue please use our forums or raise a Jira ticket.

@truenas truenas locked as resolved and limited conversation to collaborators May 3, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
2 participants