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-133676 / 25.04-RC.1 / Check/add search elements for new pages (by AlexKarpov98) #11424

Merged
merged 4 commits into from
Feb 1, 2025

Conversation

bugclerk
Copy link
Contributor

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

git reset --hard HEAD~1
git cherry-pick -x 609b89bc2a72f91237599be78787947ea90e7414
git cherry-pick -x 371296b4927ad40d804fbdd4d09179b25d219c77
git cherry-pick -x a2565cfbb243bd17f4a286f214bf437c8b98cd62

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 b14caa9d1d4da51fba01f5a18e8e643b0ff3b450

Testing: see ticket.
New search elements should be available now.

Original PR: #11415
Jira URL: https://ixsystems.atlassian.net/browse/NAS-133676

@AlexKarpov98 AlexKarpov98 marked this pull request as ready for review January 29, 2025 14:23
@AlexKarpov98 AlexKarpov98 requested a review from a team as a code owner January 29, 2025 14:23
@AlexKarpov98 AlexKarpov98 requested review from denysbutenko and removed request for a team January 29, 2025 14:23
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.

Copy link

codecov bot commented Jan 29, 2025

Codecov Report

Attention: Patch coverage is 72.41379% with 8 lines in your changes missing coverage. Please review.

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

✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
...instances/instance-list/instance-list.component.ts 50.00% 5 Missing ⚠️
src/app/directives/ui-search.directive.ts 0.00% 3 Missing ⚠️

❌ Your patch status has failed because the patch coverage (72.41%) 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   #11424   +/-   ##
===================================================
  Coverage                    ?   83.00%           
===================================================
  Files                       ?     1676           
  Lines                       ?    60150           
  Branches                    ?     6325           
===================================================
  Hits                        ?    49930           
  Misses                      ?    10220           
  Partials                    ?        0           

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

Copy link
Member

@denysbutenko denysbutenko left a comment

Choose a reason for hiding this comment

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

backported

…133676-25.04-RC.1

# Conflicts:
#	src/app/pages/virtualization/components/all-instances/instance-details/instance-details.component.html
#	src/app/pages/virtualization/components/all-instances/instance-details/instance-details.component.ts
#	src/assets/i18n/es-ar.json
#	src/assets/i18n/ko.json
#	src/assets/i18n/nl.json
#	src/assets/i18n/zh-hans.json
…133676-25.04-RC.1

# Conflicts:
#	src/assets/i18n/es-ar.json
#	src/assets/i18n/ko.json
#	src/assets/i18n/nl.json
#	src/assets/i18n/zh-hans.json
@undsoft undsoft merged commit c612081 into stable/fangtooth Feb 1, 2025
10 of 11 checks passed
@undsoft undsoft deleted the NAS-133676-25.04-RC.1 branch February 1, 2025 14:22
@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.

4 participants