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-133818 / 25.04-BETA.1 / Update system version utils for new naming (by denysbutenko) #11432

Merged
merged 8 commits into from
Feb 7, 2025

Conversation

bugclerk
Copy link
Contributor

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

git reset --hard HEAD~1
git cherry-pick -x 3c0ee40260e941f18e30a7f760738321e7f9670d

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 d5f37b2258f9e50d56504399bd43db9abdaf64ff

Changes:

Adapt utils to naming changes in system version.

Testing:

Check system info widgets.

Original PR: #11419
Jira URL: https://ixsystems.atlassian.net/browse/NAS-133818

@denysbutenko denysbutenko force-pushed the NAS-133818-25.04-BETA.1 branch from 0a61dd9 to d2c844b Compare January 29, 2025 06:28
@denysbutenko denysbutenko marked this pull request as ready for review January 29, 2025 06:28
@denysbutenko denysbutenko requested a review from a team as a code owner January 29, 2025 06:28
@denysbutenko denysbutenko requested review from undsoft and removed request for a team January 29, 2025 06:28
Copy link

codecov bot commented Jan 29, 2025

Codecov Report

Attention: Patch coverage is 95.45455% with 1 line in your changes missing coverage. Please review.

Please upload report for BASE (release/25.04-BETA.1@3cbb48c). Learn more about missing BASE report.

✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
...board/widgets/system/common/system-version.pipe.ts 92.85% 1 Missing ⚠️
Additional details and impacted files
@@                   Coverage Diff                   @@
##             release/25.04-BETA.1   #11432   +/-   ##
=======================================================
  Coverage                        ?   82.86%           
=======================================================
  Files                           ?     1644           
  Lines                           ?    58608           
  Branches                        ?     6183           
=======================================================
  Hits                            ?    48566           
  Misses                          ?    10042           
  Partials                        ?        0           

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

Copy link
Contributor

@AlexKarpov98 AlexKarpov98 left a comment

Choose a reason for hiding this comment

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

ported.

@undsoft
Copy link
Collaborator

undsoft commented Jan 29, 2025

Hold off on merging this for now.

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.

Let's try to have the changes we discussed where:

  • We remove overview header
  • Add Edition row that says Community or Enterprise.
  • Show something simple like 25.10.0 – Fangtooth in the Version string.

@undsoft
Copy link
Collaborator

undsoft commented Feb 3, 2025

Caleb has also informed me that they want to change version key in webui.main.dashboard.sys_info to remove Community/Enterprise and TrueNAS. The version string is going to look like this: 25.04-BETA.1-INTERNAL.1.
This doesn't negate my comment above.

@denysbutenko
Copy link
Member

Let's try to have the changes we discussed where:

  • We remove overview header
  • Add Edition row that says Community or Enterprise.
  • Show something simple like 25.10.0 – Fangtooth in the Version string.

Aha! I did it in TrueNAS Brand PR. System Version was fixed to how it works before. There is also About dialog that display system version. Since they are both targeted BETA.1 - I will merge new logo first and then fix remaining things here.

@denysbutenko
Copy link
Member

image

@denysbutenko denysbutenko requested a review from undsoft February 4, 2025 17:11
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.

Looks okay, but let's update tests to actual string returned by middleware - something similar to 25.10.0-MASTER-20250205-024806.

@undsoft undsoft merged commit 92c2339 into release/25.04-BETA.1 Feb 7, 2025
9 checks passed
@undsoft undsoft deleted the NAS-133818-25.04-BETA.1 branch February 7, 2025 21:25
@bugclerk
Copy link
Contributor Author

bugclerk commented Feb 7, 2025

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 Feb 7, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants