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-132626 / 25.04 / Fix styles for contract mentions on sys-info widgets on the dashboard #11272

Merged
merged 13 commits into from
Jan 20, 2025

Conversation

RehanY147
Copy link
Contributor

Changes:

Fix styles for contract mentions on sys-info widgets on the dashboard

Testing:

Change the license to "Silver International" and see that the styles look good for system info widgets.

@RehanY147 RehanY147 requested a review from a team as a code owner January 2, 2025 03:40
@RehanY147 RehanY147 requested review from bvasilenko and removed request for a team January 2, 2025 03:40
@bugclerk bugclerk changed the title NAS-132626: Fix styles for contract mentions on sys-info widgets on the dashboard NAS-132626 / 25.04 / Fix styles for contract mentions on sys-info widgets on the dashboard Jan 2, 2025
@bugclerk
Copy link
Contributor

bugclerk commented Jan 2, 2025

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.

So two things:

  1. Text is not aligned for me:
Снимок экрана 2025-01-02 в 09 13 55
  1. I don't know how silver international is going to be represented on MW, but if it's going to be SILVER_INTERNATIONAL like other enums, this is going to result in Silver_international Contract on main dashboard and Contract Type: SILVER_INTERNATIONAL on Support card in settings.
    Please check with MW on what value we should expect in contract_type.

Copy link

codecov bot commented Jan 3, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 82.84%. Comparing base (62bbc27) to head (bb7e53f).
Report is 1 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #11272   +/-   ##
=======================================
  Coverage   82.83%   82.84%           
=======================================
  Files        1659     1660    +1     
  Lines       59360    59376   +16     
  Branches     6232     6234    +2     
=======================================
+ Hits        49170    49189   +19     
+ Misses      10190    10187    -3     

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

@RehanY147 RehanY147 requested a review from undsoft January 5, 2025 22:40
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.

First point was addressed, second point – wasn't.
You can find a link to MW PR with a list of all licenses in the ticket. It's my understanding that they'll be changed to UPPERCASE when being sent to UI.

@RehanY147 RehanY147 closed this Jan 14, 2025
@RehanY147 RehanY147 reopened this Jan 14, 2025
@RehanY147 RehanY147 enabled auto-merge (squash) January 18, 2025 01:02
@RehanY147 RehanY147 requested review from undsoft and removed request for bvasilenko January 18, 2025 06:25
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.

Tested with mocks, as there is some issue with webui.main.dashboard.sys_info endpoint.
This is good to merge after enum is updated.

@@ -33,7 +33,7 @@ describe('WidgetSysInfoActiveComponent', () => {
version: 'TrueNAS-SCALE-24.10.0-MASTER-20240301-233006',
codename: Codename.ElectricEel,
license: {
contract_type: 'BEST',
contract_type: ContractType.Best,
Copy link
Collaborator

Choose a reason for hiding this comment

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

I presume BEST was added here as a mock data and is not an actual name of the contract type.
If so, it's better to replace it here with something else instead of adding a fake value to the enum.

@RehanY147 RehanY147 merged commit ddd0812 into master Jan 20, 2025
11 checks passed
@RehanY147 RehanY147 deleted the NAS-132626-alt branch January 20, 2025 06:41
@bugclerk
Copy link
Contributor

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

Successfully merging this pull request may close these issues.

3 participants