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

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

guqing
Copy link
Member

@guqing guqing commented Sep 26, 2024

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

Does this PR introduce a user-facing change?

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

@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
Copy link

f2c-ci-robot bot commented Sep 26, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from guqing. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

Copy link

sonarcloud bot commented Sep 26, 2024

Copy link

codecov bot commented Sep 26, 2024

Codecov Report

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

Project coverage is 58.19%. Comparing base (6cd8dc8) to head (27060ee).
Report is 89 commits behind head on main.

Files with missing lines Patch % Lines
...eme/dialect/TemplateFooterElementTagProcessor.java 33.33% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main    #6709      +/-   ##
============================================
+ Coverage     58.18%   58.19%   +0.01%     
- Complexity     3774     3948     +174     
============================================
  Files           651      679      +28     
  Lines         22125    23228    +1103     
  Branches       1538     1584      +46     
============================================
+ Hits          12873    13518     +645     
- Misses         8641     9085     +444     
- Partials        611      625      +14     

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

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
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

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
Development

Successfully merging this pull request may close these issues.

期望 TemplateHeadProcessor 代码注入不会影响到错误页面
3 participants