You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by GitBox <gi...@apache.org> on 2021/04/17 13:27:36 UTC

[GitHub] [apisix-dashboard] juzhiyuan opened a new pull request #1784: fix: transform data

juzhiyuan opened a new pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784


   Please answer these questions before submitting a pull request, **or your PR will get closed**.
   
   **Why submit this pull request?**
   
   - [x] Bugfix
   - [ ] New feature provided
   - [ ] Improve performance
   - [ ] Backport patches
   
   **What changes will this PR take into?**
   
   - [x] We have nested logics, need to refactor them;
   - [x] Set special flags for upstream_id: Custom/None/Real ID
   - [x] Check logics are valid
   
   **Related issues**
   
   None
   
   **Checklist:**
   
   - [x] Did you explain what problem does this PR solve? Or what new features have been added?
   - [ ] Have you added corresponding test cases? I**n Progress**
   - [ ] Have you modified the corresponding document?
   - [x] Is this PR backward compatible? If it is not backward compatible, please discuss on the mailing list first
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
netlify[bot] edited a comment on pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#issuecomment-821822616


   Deploy preview for *apisix-dashboard* ready!
   
   Built with commit 508abbf4db4c57e5c0dea4af403e3ee15c811b3f
   
   https://deploy-preview-1784--apisix-dashboard.netlify.app


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] juzhiyuan merged pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
juzhiyuan merged pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784


   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
netlify[bot] edited a comment on pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#issuecomment-821822616






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
netlify[bot] edited a comment on pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#issuecomment-821822616


   Deploy preview for *apisix-dashboard* ready!
   
   Built with commit 2cf58bdb45a2287dfd5a7312436aaa2806c601d7
   
   https://deploy-preview-1784--apisix-dashboard.netlify.app


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] codecov-commenter edited a comment on pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
codecov-commenter edited a comment on pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#issuecomment-821968697


   # [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1784?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
   > Merging [#1784](https://codecov.io/gh/apache/apisix-dashboard/pull/1784?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (508abbf) into [master](https://codecov.io/gh/apache/apisix-dashboard/commit/c35203aa524d4ccf1e51990ae0855ad4cbd7608a?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (c35203a) will **increase** coverage by `0.05%`.
   > The diff coverage is `86.27%`.
   
   [![Impacted file tree graph](https://codecov.io/gh/apache/apisix-dashboard/pull/1784/graphs/tree.svg?width=650&height=150&src=pr&token=Q1HERXN96P&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)](https://codecov.io/gh/apache/apisix-dashboard/pull/1784?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
   
   ```diff
   @@            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%)` | :arrow_up: |
   
   Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#carryforward-flags-in-the-pull-request-comment) to find out more.
   
   | [Impacted Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1784?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
   |---|---|---|
   | [...mponents/Upstream/components/active-check/Host.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1784/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1Vwc3RyZWFtL2NvbXBvbmVudHMvYWN0aXZlLWNoZWNrL0hvc3QudHN4) | `33.33% <ø> (ø)` | |
   | [...ents/Upstream/components/active-check/HttpPath.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1784/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1Vwc3RyZWFtL2NvbXBvbmVudHMvYWN0aXZlLWNoZWNrL0h0dHBQYXRoLnRzeA==) | `33.33% <ø> (ø)` | |
   | [...mponents/Upstream/components/active-check/Port.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1784/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1Vwc3RyZWFtL2NvbXBvbmVudHMvYWN0aXZlLWNoZWNrL1BvcnQudHN4) | `33.33% <ø> (ø)` | |
   | [web/src/pages/Route/Create.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1784/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9wYWdlcy9Sb3V0ZS9DcmVhdGUudHN4) | `90.74% <ø> (ø)` | |
   | [web/src/pages/Route/service.ts](https://codecov.io/gh/apache/apisix-dashboard/pull/1784/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9wYWdlcy9Sb3V0ZS9zZXJ2aWNlLnRz) | `88.23% <ø> (-0.66%)` | :arrow_down: |
   | [web/src/pages/Service/service.ts](https://codecov.io/gh/apache/apisix-dashboard/pull/1784/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9wYWdlcy9TZXJ2aWNlL3NlcnZpY2UudHM=) | `100.00% <ø> (ø)` | |
   | [...eb/src/components/Upstream/components/PassHost.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1784/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1Vwc3RyZWFtL2NvbXBvbmVudHMvUGFzc0hvc3QudHN4) | `78.57% <33.33%> (-12.34%)` | :arrow_down: |
   | [web/src/pages/Upstream/Create.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1784/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9wYWdlcy9VcHN0cmVhbS9DcmVhdGUudHN4) | `79.41% <33.33%> (ø)` | |
   | [web/src/components/Upstream/service.ts](https://codecov.io/gh/apache/apisix-dashboard/pull/1784/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1Vwc3RyZWFtL3NlcnZpY2UudHM=) | `72.91% <81.08%> (+22.91%)` | :arrow_up: |
   | [web/src/pages/Service/Create.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1784/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9wYWdlcy9TZXJ2aWNlL0NyZWF0ZS50c3g=) | `94.73% <85.71%> (-1.63%)` | :arrow_down: |
   | ... and [8 more](https://codecov.io/gh/apache/apisix-dashboard/pull/1784/diff?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | |
   
   ------
   
   [Continue to review full report at Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1784?src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
   > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
   > `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
   > Powered by [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1784?src=pr&el=footer&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Last update [c35203a...508abbf](https://codecov.io/gh/apache/apisix-dashboard/pull/1784?src=pr&el=lastupdated&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
netlify[bot] edited a comment on pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#issuecomment-821822616


   Deploy preview for *apisix-dashboard* ready!
   
   Built with commit b2cbe40a6c5c66db387ae8bbcf6d823f07e7daaa
   
   https://deploy-preview-1784--apisix-dashboard.netlify.app


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] netlify[bot] commented on pull request #1784: fix: transform data

Posted by GitBox <gi...@apache.org>.
netlify[bot] commented on pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#issuecomment-821822616


   Deploy preview for *apisix-dashboard* processing.
   
   Building with commit 50b82a41ee15886f479bec04c08c71c159d923bd
   
   https://app.netlify.com/sites/apisix-dashboard/deploys/607ae241817f680007965c42


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] LiteSun commented on pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
LiteSun commented on pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#issuecomment-821930146


   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 
   
   https://user-images.githubusercontent.com/31329157/115134191-9f8b7500-a040-11eb-8beb-e305234b2099.mov
   
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
netlify[bot] edited a comment on pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#issuecomment-821822616






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
netlify[bot] edited a comment on pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#issuecomment-821822616






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] juzhiyuan commented on a change in pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
juzhiyuan commented on a change in pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#discussion_r615464564



##########
File path: web/src/components/Upstream/locales/zh-CN.ts
##########
@@ -95,4 +94,10 @@ export default {
 
   'component.upstream.fields.checks.passive.unhealthy.timeouts': '超时时间',
   'component.upstream.fields.checks.passive.unhealthy.timeouts.tooltip': '根据被动健康检查的观察,在代理中认为目标不健康的超时次数。',
+
+  'component.upstream.other.none': '不选择(仅在绑定服务时可用)',

Review comment:
       sure, I will handle this case in a new PR :)




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
netlify[bot] edited a comment on pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#issuecomment-821822616


   Deploy preview for *apisix-dashboard* ready!
   
   Built with commit 069519c3722a4d14ceb634c161e3c986e9aff733
   
   https://deploy-preview-1784--apisix-dashboard.netlify.app


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] LiteSun commented on a change in pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
LiteSun commented on a change in pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#discussion_r615363809



##########
File path: web/src/pages/Route/components/Step1/MetaView.tsx
##########
@@ -285,27 +285,44 @@ const MetaView: React.FC<RouteModule.Step1PassProps> = ({ disabled, form, isEdit
   )
 
   const ServiceSelector: React.FC = () => (
-    <Form.Item label={formatMessage({ id: 'page.route.service' })} tooltip="绑定服务(Service)对象,以便复用其中的配置。">
-      <Row>
-        <Col span={5}>
-          <Form.Item noStyle name="service_id">
-            <Select disabled={disabled}>
-              {/* TODO: value === '' means  no service_id select, need to find a better way */}
-              <Select.Option value="" key={Math.random().toString(36).substring(7)}>
-                {formatMessage({ id: "page.route.service.none" })}
-              </Select.Option>
-              {serviceList.map((item) => {
-                return (
-                  <Select.Option value={item.id} key={item.id}>
-                    {item.name}
-                  </Select.Option>
-                );
-              })}
-            </Select>
-          </Form.Item>
-        </Col>
-      </Row>
-    </Form.Item>
+    <React.Fragment>
+      <Form.Item label={formatMessage({ id: 'page.route.service' })} tooltip="绑定服务(Service)对象,以便复用其中的配置。">

Review comment:
       i18n




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
netlify[bot] edited a comment on pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#issuecomment-821822616


   Deploy preview for *apisix-dashboard* ready!
   
   Built with commit c163987cf9e1169efc5eb94948f4aeb3d991e8a1
   
   https://deploy-preview-1784--apisix-dashboard.netlify.app


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
netlify[bot] edited a comment on pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#issuecomment-821822616


   Deploy preview for *apisix-dashboard* processing.
   
   Building with commit 2cf58bdb45a2287dfd5a7312436aaa2806c601d7
   
   https://app.netlify.com/sites/apisix-dashboard/deploys/607c0365b222c200073ad258


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] LiteSun edited a comment on pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
LiteSun edited a comment on pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#issuecomment-821930146


   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 
   
   https://user-images.githubusercontent.com/31329157/115134191-9f8b7500-a040-11eb-8beb-e305234b2099.mov
   
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
netlify[bot] edited a comment on pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#issuecomment-821822616


   Deploy preview for *apisix-dashboard* processing.
   
   Building with commit 508abbf4db4c57e5c0dea4af403e3ee15c811b3f
   
   https://app.netlify.com/sites/apisix-dashboard/deploys/607c2ccd920fc600070b86b7


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
netlify[bot] edited a comment on pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#issuecomment-821822616


   Deploy preview for *apisix-dashboard* processing.
   
   Building with commit b2cbe40a6c5c66db387ae8bbcf6d823f07e7daaa
   
   https://app.netlify.com/sites/apisix-dashboard/deploys/607bc6bdd702ef000754c1ff


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
netlify[bot] edited a comment on pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#issuecomment-821822616


   Deploy preview for *apisix-dashboard* processing.
   
   Building with commit 7e57c9d15657c9854dea4b6f55f9dec80d213637
   
   https://app.netlify.com/sites/apisix-dashboard/deploys/607b63a288aa35000701f280


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] juzhiyuan commented on a change in pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
juzhiyuan commented on a change in pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#discussion_r615370196



##########
File path: web/src/pages/Route/components/Step1/MetaView.tsx
##########
@@ -285,27 +285,44 @@ const MetaView: React.FC<RouteModule.Step1PassProps> = ({ disabled, form, isEdit
   )
 
   const ServiceSelector: React.FC = () => (
-    <Form.Item label={formatMessage({ id: 'page.route.service' })} tooltip="绑定服务(Service)对象,以便复用其中的配置。">
-      <Row>
-        <Col span={5}>
-          <Form.Item noStyle name="service_id">
-            <Select disabled={disabled}>
-              {/* TODO: value === '' means  no service_id select, need to find a better way */}
-              <Select.Option value="" key={Math.random().toString(36).substring(7)}>
-                {formatMessage({ id: "page.route.service.none" })}
-              </Select.Option>
-              {serviceList.map((item) => {
-                return (
-                  <Select.Option value={item.id} key={item.id}>
-                    {item.name}
-                  </Select.Option>
-                );
-              })}
-            </Select>
-          </Form.Item>
-        </Col>
-      </Row>
-    </Form.Item>
+    <React.Fragment>
+      <Form.Item label={formatMessage({ id: 'page.route.service' })} tooltip="绑定服务(Service)对象,以便复用其中的配置。">

Review comment:
       Hi, this PR will fix this.
   
   https://github.com/apache/apisix-dashboard/pull/1785/files#diff-48bf46c8113258031a14f9204041bb5ff51de312ef61c7686f41ea3499fe2c14R176




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
netlify[bot] edited a comment on pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#issuecomment-821822616






-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] codecov-commenter commented on pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
codecov-commenter commented on pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#issuecomment-821968697


   # [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1784?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
   > :exclamation: No coverage uploaded for pull request base (`master@1e2e0b7`). [Click here to learn what that means](https://docs.codecov.io/docs/error-reference?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#section-missing-base-commit).
   > The diff coverage is `67.96%`.
   
   [![Impacted file tree graph](https://codecov.io/gh/apache/apisix-dashboard/pull/1784/graphs/tree.svg?width=650&height=150&src=pr&token=Q1HERXN96P&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)](https://codecov.io/gh/apache/apisix-dashboard/pull/1784?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
   
   ```diff
   @@            Coverage Diff            @@
   ##             master    #1784   +/-   ##
   =========================================
     Coverage          ?   72.20%           
   =========================================
     Files             ?      124           
     Lines             ?     2907           
     Branches          ?      697           
   =========================================
     Hits              ?     2099           
     Misses            ?      808           
     Partials          ?        0           
   ```
   
   | Flag | Coverage Δ | |
   |---|---|---|
   | frontend-e2e-test | `72.20% <67.96%> (?)` | |
   
   Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#carryforward-flags-in-the-pull-request-comment) to find out more.
   
   | [Impacted Files](https://codecov.io/gh/apache/apisix-dashboard/pull/1784?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
   |---|---|---|
   | [web/src/components/Upstream/components/Nodes.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1784/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1Vwc3RyZWFtL2NvbXBvbmVudHMvTm9kZXMudHN4) | `100.00% <ø> (ø)` | |
   | [web/src/components/Upstream/components/Retries.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1784/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1Vwc3RyZWFtL2NvbXBvbmVudHMvUmV0cmllcy50c3g=) | `100.00% <ø> (ø)` | |
   | [web/src/components/Upstream/components/Timeout.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1784/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1Vwc3RyZWFtL2NvbXBvbmVudHMvVGltZW91dC50c3g=) | `100.00% <ø> (ø)` | |
   | [...tream/components/active-check/Healthy/Interval.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1784/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1Vwc3RyZWFtL2NvbXBvbmVudHMvYWN0aXZlLWNoZWNrL0hlYWx0aHkvSW50ZXJ2YWwudHN4) | `33.33% <ø> (ø)` | |
   | [...ream/components/active-check/Healthy/Successes.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1784/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1Vwc3RyZWFtL2NvbXBvbmVudHMvYWN0aXZlLWNoZWNrL0hlYWx0aHkvU3VjY2Vzc2VzLnRzeA==) | `33.33% <ø> (ø)` | |
   | [...mponents/Upstream/components/active-check/Host.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1784/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1Vwc3RyZWFtL2NvbXBvbmVudHMvYWN0aXZlLWNoZWNrL0hvc3QudHN4) | `33.33% <ø> (ø)` | |
   | [...ents/Upstream/components/active-check/HttpPath.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1784/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1Vwc3RyZWFtL2NvbXBvbmVudHMvYWN0aXZlLWNoZWNrL0h0dHBQYXRoLnRzeA==) | `33.33% <ø> (ø)` | |
   | [...mponents/Upstream/components/active-check/Port.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1784/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1Vwc3RyZWFtL2NvbXBvbmVudHMvYWN0aXZlLWNoZWNrL1BvcnQudHN4) | `33.33% <ø> (ø)` | |
   | [...ts/Upstream/components/active-check/ReqHeaders.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1784/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1Vwc3RyZWFtL2NvbXBvbmVudHMvYWN0aXZlLWNoZWNrL1JlcUhlYWRlcnMudHN4) | `8.33% <0.00%> (ø)` | |
   | [...nents/Upstream/components/active-check/Timeout.tsx](https://codecov.io/gh/apache/apisix-dashboard/pull/1784/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-d2ViL3NyYy9jb21wb25lbnRzL1Vwc3RyZWFtL2NvbXBvbmVudHMvYWN0aXZlLWNoZWNrL1RpbWVvdXQudHN4) | `33.33% <ø> (ø)` | |
   | ... and [42 more](https://codecov.io/gh/apache/apisix-dashboard/pull/1784/diff?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | |
   
   ------
   
   [Continue to review full report at Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1784?src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
   > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
   > `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
   > Powered by [Codecov](https://codecov.io/gh/apache/apisix-dashboard/pull/1784?src=pr&el=footer&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Last update [1e2e0b7...2cf58bd](https://codecov.io/gh/apache/apisix-dashboard/pull/1784?src=pr&el=lastupdated&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
netlify[bot] edited a comment on pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#issuecomment-821822616


   Deploy preview for *apisix-dashboard* processing.
   
   Building with commit 069519c3722a4d14ceb634c161e3c986e9aff733
   
   https://app.netlify.com/sites/apisix-dashboard/deploys/607af5dc930e730007f157f5


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] juzhiyuan commented on pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
juzhiyuan commented on pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#issuecomment-821938364


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


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
netlify[bot] edited a comment on pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#issuecomment-821822616


   Deploy preview for *apisix-dashboard* ready!
   
   Built with commit 50b82a41ee15886f479bec04c08c71c159d923bd
   
   https://deploy-preview-1784--apisix-dashboard.netlify.app


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
netlify[bot] edited a comment on pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#issuecomment-821822616


   Deploy preview for *apisix-dashboard* processing.
   
   Building with commit 642fec5ce537a5a25e200586291427f05f548ae0
   
   https://app.netlify.com/sites/apisix-dashboard/deploys/607b66ae931a6900087a910d


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] netlify[bot] edited a comment on pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
netlify[bot] edited a comment on pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#issuecomment-821822616


   Deploy preview for *apisix-dashboard* ready!
   
   Built with commit 7e57c9d15657c9854dea4b6f55f9dec80d213637
   
   https://deploy-preview-1784--apisix-dashboard.netlify.app


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] liuxiran commented on a change in pull request #1784: fix: show correct health checker

Posted by GitBox <gi...@apache.org>.
liuxiran commented on a change in pull request #1784:
URL: https://github.com/apache/apisix-dashboard/pull/1784#discussion_r615463646



##########
File path: web/src/components/Upstream/locales/zh-CN.ts
##########
@@ -95,4 +94,10 @@ export default {
 
   'component.upstream.fields.checks.passive.unhealthy.timeouts': '超时时间',
   'component.upstream.fields.checks.passive.unhealthy.timeouts.tooltip': '根据被动健康检查的观察,在代理中认为目标不健康的超时次数。',
+
+  'component.upstream.other.none': '不选择(仅在绑定服务时可用)',

Review comment:
       we will reuse `UpstreamForm` when creating a service
   
   ![image](https://user-images.githubusercontent.com/2561857/115162774-f85a1c80-a0d7-11eb-8607-2fc3c34f4e9d.png)
   
   so remove `(仅在绑定服务时可用)` may be  more general here or change another remark ^_^




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org