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-133494 / 25.04-RC.1 / WIP: Enclosure Colors (by dszidi) #11454

Merged
merged 2 commits into from
Feb 1, 2025

Conversation

bugclerk
Copy link
Contributor

@bugclerk bugclerk commented Feb 1, 2025

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

git reset --hard HEAD~1
git cherry-pick -x 84f10df17fe825773204f8c902316fd0f1a4097a
git cherry-pick -x 10a36ec59df6e631e6a831f825ae67cfe16b5f4b
git cherry-pick -x 118f506d261e6a0da9a2cbcf4bd089014818b536
git cherry-pick -x e2a096857eabeac9931ca6e8c360748d485dd039
git cherry-pick -x 48e4acdad3fe23d4cd8efa1466369548b9eb2771
git cherry-pick -x e31b980d6ed37acfd2aea1e6d8d385d320cd3233
git cherry-pick -x 0458b9d7189e71ae3e018a882ab09ba03915a028
git cherry-pick -x 9adfc441fecf4df4e290e7d4279290993ff5ec0d
git cherry-pick -x 1057679cf57d7b67fc5f95526a2c8b5926eaf30f
git cherry-pick -x 0c29bc9c317546bce737cb8d5dac83eac8737716
git cherry-pick -x b2571b06713998995e64f2706f2c27a72f7ee75f
git cherry-pick -x 3c347b601b88975c103b00c9fab5002f5f7de725
git cherry-pick -x fbfe4207bcd3ad976e866acf550113683d93e338
git cherry-pick -x f185ff0c125867d0383916c820df70b05f869b02
git cherry-pick -x 52f3717b2a8105ff810c44c20bd865511ec27e5e
git cherry-pick -x af80298359765c619790b6051b5d30f999a2aa00
git cherry-pick -x 212ad9379196733b852a728cb91575886b6f2b51
git cherry-pick -x 493a81e57262e7ebd68922ce191d6d2840672a50
git cherry-pick -x 2db21133d6ccb030b02e93478d350076b4548d68
git cherry-pick -x a903c2fb1647b783acdf03d92a0120b1e400335e
git cherry-pick -x abf4f7c34d97ae1dbe48b834d625f81f046e3eb6
git cherry-pick -x 03135097f56bd394b858384097fa462182019da3
git cherry-pick -x b8d6d77a46e3379e94fb70dbb4e8947e224d3520
git cherry-pick -x 4fbbb2b143b0279573c7840c2d74c4e13377d677
git cherry-pick -x 71541516800790be2d7e6e8957f26935cc3a28eb
git cherry-pick -x 0c888a741ff20c906e7f11adf63d94a3067339be
git cherry-pick -x 110c8e7a432c1a16b82a8b10b3294d4d70a3cba6
git cherry-pick -x 8ea09b3fb46ddf81af73896ab5f219a87cbdfbfd
git cherry-pick -x bfcea807f1813fcec52577486ee5c7b5146cbfed
git cherry-pick -x 28935e11386dc6f1b2a3ca5f326ba966587eca2a

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 a7568583b1e09084404bae7368198a811d8d750c

Changes:

Changes how we apply color coding to

Testing:

Use mock enclosure utility and test for models M60, ES24, ES24F, MINI-R, H-Series, X-Series, ES12, ES102G2. These models were chosen to show a variety of different layouts and drive tray types. Once this PR is approved the other models will be updated.

Downstream

This only touches the enclosure-svg component files and the SVG assets themselves. Assets are updated with some class selectors and CSS. Nothing else should be affected.

This will affect documentation as screen shots of the enclosure visualization will look different now.

Original PR: #11345
Jira URL: https://ixsystems.atlassian.net/browse/NAS-133494

@undsoft undsoft marked this pull request as ready for review February 1, 2025 13:07
@undsoft undsoft requested a review from a team as a code owner February 1, 2025 13:07
@undsoft undsoft requested review from AlexKarpov98 and removed request for a team February 1, 2025 13:07
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

Copy link

codecov bot commented Feb 1, 2025

Codecov Report

Attention: Patch coverage is 62.50000% with 15 lines in your changes missing coverage. Please review.

Please upload report for BASE (stable/fangtooth@3df373a). Learn more about missing BASE report.

✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
...sure-side/enclosure-svg/enclosure-svg.component.ts 62.50% 15 Missing ⚠️

❌ Your patch status has failed because the patch coverage (62.50%) is below the target coverage (75.00%). You can increase the patch coverage or adjust the target coverage.

Additional details and impacted files
@@                 Coverage Diff                 @@
##             stable/fangtooth   #11454   +/-   ##
===================================================
  Coverage                    ?   82.94%           
===================================================
  Files                       ?     1670           
  Lines                       ?    59988           
  Branches                    ?     6305           
===================================================
  Hits                        ?    49760           
  Misses                      ?    10228           
  Partials                    ?        0           

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

@undsoft undsoft merged commit 1f3dca6 into stable/fangtooth Feb 1, 2025
8 of 9 checks passed
@undsoft undsoft deleted the NAS-133494-25.04-RC.1 branch February 1, 2025 13:40
@bugclerk
Copy link
Contributor Author

bugclerk commented Feb 1, 2025

JIRA ticket https://ixsystems.atlassian.net/browse/NAS-133494 is targeted to the following versions which have not received their corresponding PRs: 25.10

@bugclerk
Copy link
Contributor Author

bugclerk commented Feb 1, 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 1, 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.

3 participants