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

fix: show correct health checker #1784

Merged
merged 7 commits into from
Apr 19, 2021
Merged

Conversation

juzhiyuan
Copy link
Member

@juzhiyuan juzhiyuan commented Apr 17, 2021

Please answer these questions before submitting a pull request, or your PR will get closed.

Why submit this pull request?

  • Bugfix
  • New feature provided
  • Improve performance
  • Backport patches

What changes will this PR take into?

  • We have nested logics, need to refactor them;
  • Set special flags for upstream_id: Custom/None/Real ID
  • If we enable health checker, we should see them when viewing resources (Route/Service);

Related issues

None

Checklist:

  • Did you explain what problem does this PR solve? Or what new features have been added?
  • Have you added corresponding test cases? In Progress
  • Have you modified the corresponding document?
  • Is this PR backward compatible? If it is not backward compatible, please discuss on the mailing list first

@netlify
Copy link

netlify bot commented Apr 17, 2021

Deploy preview for apisix-dashboard ready!

Built with commit 508abbf

https://deploy-preview-1784--apisix-dashboard.netlify.app

@juzhiyuan juzhiyuan changed the title fix: transform data fix: show correct health checker Apr 17, 2021
@juzhiyuan juzhiyuan force-pushed the fix-upstream branch 3 times, most recently from e810ab9 to e2512e5 Compare April 17, 2021 23:10
@LiteSun
Copy link
Member

LiteSun commented Apr 18, 2021

Found a bug here.

  1. select a service(root) then go to route step2.
  2. select None in route step2 then go back to the route step1
  3. change service to None in route step1 page then go to route step2 page. Then you will see the bug.
    @juzhiyuan
upstream_bug.mov

@juzhiyuan
Copy link
Member Author

Yes, I noticed this case in the morning and fixed it just now. When that case happened, the notification will popup & reset the service_id to the previous value, we'd better now change the original data. Please have a try :)

@juzhiyuan juzhiyuan requested review from liuxiran and LiteSun and removed request for liuxiran April 18, 2021 05:59
</Row>
</Form.Item>
<React.Fragment>
<Form.Item label={formatMessage({ id: 'page.route.service' })} tooltip="绑定服务(Service)对象,以便复用其中的配置。">
Copy link
Member

Choose a reason for hiding this comment

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

i18n

Copy link
Member Author

Choose a reason for hiding this comment

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

@codecov-commenter
Copy link

codecov-commenter commented Apr 18, 2021

Codecov Report

Merging #1784 (508abbf) into master (c35203a) will increase coverage by 0.05%.
The diff coverage is 86.27%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1784      +/-   ##
==========================================
+ Coverage   72.08%   72.14%   +0.05%     
==========================================
  Files         126      125       -1     
  Lines        2920     2922       +2     
  Branches      705      703       -2     
==========================================
+ Hits         2105     2108       +3     
+ Misses        815      814       -1     
Flag Coverage Δ
frontend-e2e-test 72.14% <86.27%> (+0.05%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...mponents/Upstream/components/active-check/Host.tsx 33.33% <ø> (ø)
...ents/Upstream/components/active-check/HttpPath.tsx 33.33% <ø> (ø)
...mponents/Upstream/components/active-check/Port.tsx 33.33% <ø> (ø)
web/src/pages/Route/Create.tsx 90.74% <ø> (ø)
web/src/pages/Route/service.ts 88.23% <ø> (-0.66%) ⬇️
web/src/pages/Service/service.ts 100.00% <ø> (ø)
...eb/src/components/Upstream/components/PassHost.tsx 78.57% <33.33%> (-12.34%) ⬇️
web/src/pages/Upstream/Create.tsx 79.41% <33.33%> (ø)
web/src/components/Upstream/service.ts 72.91% <81.08%> (+22.91%) ⬆️
web/src/pages/Service/Create.tsx 94.73% <85.71%> (-1.63%) ⬇️
... and 8 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c35203a...508abbf. Read the comment docs.

@juzhiyuan juzhiyuan requested review from bzp2010 and imjoey April 18, 2021 10:39
@juzhiyuan juzhiyuan requested a review from membphis April 18, 2021 13:49
@juzhiyuan juzhiyuan merged commit 5e46f60 into apache:master Apr 19, 2021
@juzhiyuan juzhiyuan deleted the fix-upstream branch April 19, 2021 02:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants