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.

Sign up for GitHub

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

Jump to bottom

refactor: head and footer tag injection to skip error pages #6709

Merged
merged 2 commits into from
Oct 10, 2024
Merged

refactor: head and footer tag injection to skip error pages #6709

merged 2 commits into from
Oct 10, 2024

Conversation

guqing
Copy link
Member

@guqing guqing commented Sep 26, 2024 •
edited by JohnNiang
Loading

What type of PR is this?

/kind improvement
/area core
/milestone 2.20.x

What this PR does / why we need it:

模板 head 和 footer 标签注入功能忽略错误页面避免当扩展发生错误时导致错误页面无法显示

Which issue(s) this PR fixes:

Fixes #6500
Fixes #6750

Does this PR introduce a user-facing change?

代码注入功能忽略对错误页面和登录注册等页面的注入

@f2c-ci-robot f2c-ci-robot bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/improvement Categorizes issue or PR as related to a improvement. labels Sep 26, 2024
@f2c-ci-robot f2c-ci-robot bot added this to the 2.20.x milestone Sep 26, 2024
@f2c-ci-robot f2c-ci-robot bot added the area/core Issues or PRs related to the Halo Core label Sep 26, 2024
@codecov Codecov
Copy link

codecov bot commented Sep 26, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 93.33333% with 2 lines in your changes missing coverage. Please review.

Project coverage is 57.05%. Comparing base (d7aba83) to head (4dbbee9).
Report is 15 commits behind head on main.

Files with missing lines Patch % Lines
...eme/dialect/TemplateFooterElementTagProcessor.java 0.00% 1 Missing and 1 partial ⚠️
Additional details and impacted files 
@@             Coverage Diff              @@
##               main    #6709      +/-   ##
============================================
+ Coverage     57.03%   57.05%   +0.01%     
- Complexity     3978     3985       +7     
============================================
  Files           713      714       +1     
  Lines         23992    24039      +47     
  Branches       1570     1575       +5     
============================================
+ Hits          13685    13715      +30     
- Misses         9696     9711      +15     
- Partials        611      613       +2

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

ruibaby
ruibaby reviewed Sep 27, 2024
View reviewed changes
Copy link
Member

@ruibaby ruibaby left a comment

Choose a reason for hiding this comment

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

/lgtm

@f2c-ci-robot f2c-ci-robot bot added the lgtm Indicates that a PR is ready to be merged. label Sep 27, 2024
JohnNiang
JohnNiang reviewed Sep 27, 2024
View reviewed changes
Copy link
Member

@JohnNiang JohnNiang left a comment

Choose a reason for hiding this comment

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

Issue 描述的问题是：当因为 TemplateFooterElementTagProcessor 或者 GlobaleadInjectionProcessor 发生错误时，才忽略这些错误直接渲染。而不是发生错误渲染错误页面的时候就忽略这两个 Processor 了。

@guqing
Copy link
Member Author

guqing commented Sep 27, 2024 •
edited
Loading

Issue 描述的问题是：当因为 TemplateFooterElementTagProcessor 或者 GlobaleadInjectionProcessor 发生错误时，才忽略这些错误直接渲染。而不是发生错误渲染错误页面的时候就忽略这两个 Processor 了。

错误页面本身也就不需要注入,况且如果只是 GlobaleadInjectionProcessor 发生错误时如果要忽略那应该是扩展自己通过 onErrorResume 忽略,而不是由 GlobaleadInjectionProcessor 来忽略错误,参考 #6479

@f2c-ci-robot f2c-ci-robot bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 9, 2024
@guqing guqing requested a review from JohnNiang October 9, 2024 06:48
@guqing guqing requested a review from JohnNiang October 10, 2024 07:40
@guqing guqing requested a review from JohnNiang October 10, 2024 09:34
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Oct 10, 2024

Quality Gate Passed Quality Gate passed

Issues
1 New issue
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

JohnNiang
JohnNiang approved these changes Oct 10, 2024
View reviewed changes
Copy link
Member

@JohnNiang JohnNiang left a comment

Choose a reason for hiding this comment

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

/lgtm

@f2c-ci-robot f2c-ci-robot bot added the lgtm Indicates that a PR is ready to be merged. label Oct 10, 2024
@f2c-ci-robot f2c-ci-robot
Copy link

f2c-ci-robot bot commented Oct 10, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JohnNiang

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@f2c-ci-robot f2c-ci-robot bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 10, 2024
@f2c-ci-robot f2c-ci-robot bot merged commit 02c5484 into halo-dev:main Oct 10, 2024
8 checks passed
@JohnNiang JohnNiang mentioned this pull request Oct 10, 2024
Closed
@ruibaby ruibaby modified the milestones: 2.20.x, 2.20.0 LTS Oct 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruibaby ruibaby ruibaby left review comments

@JohnNiang JohnNiang JohnNiang approved these changes

@LIlGG LIlGG Awaiting requested review from LIlGG

@wan92hen wan92hen Awaiting requested review from wan92hen

Assignees

@JohnNiang JohnNiang

@ruibaby ruibaby

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/core Issues or PRs related to the Halo Core kind/improvement Categorizes issue or PR as related to a improvement. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Milestone
2.20.0 LTS
3 participants
@guqing @JohnNiang @ruibaby