fix:When create the upstream, some properties can still be edited on … #1828

Engine-AI · 2021-04-26T08:57:59Z

…the preview page bug

Why submit this pull request?

Bugfix
New feature provided
Improve performance
Backport patches

What changes will this PR take into?
#1827

…the preview page bug

netlify · 2021-04-26T08:58:06Z

Deploy preview for apisix-dashboard ready!

Built with commit 103c3a3

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

codecov-commenter · 2021-04-26T09:18:07Z

Codecov Report

Merging #1828 (103c3a3) into master (2f3717f) will increase coverage by 0.07%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #1828      +/-   ##
==========================================
+ Coverage   72.07%   72.15%   +0.07%     
==========================================
  Files         125      125              
  Lines        2944     2945       +1     
  Branches      711      711              
==========================================
+ Hits         2122     2125       +3     
+ Misses        822      820       -2

Flag	Coverage Δ
frontend-e2e-test	`72.15% <100.00%> (+0.07%)`	⬆️

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

Impacted Files	Coverage Δ
web/src/components/Upstream/UpstreamForm.tsx	`81.69% <100.00%> (+0.26%)`	⬆️
web/src/helpers.tsx	`72.13% <0.00%> (+3.27%)`	⬆️

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 2f3717f...103c3a3. Read the comment docs.

juzhiyuan · 2021-04-26T15:53:02Z

web/src/components/Upstream/UpstreamForm.tsx

@@ -83,6 +83,7 @@ const UpstreamForm: React.FC<Props> = forwardRef(

    const resetForm = (upstream_id: string) => {
      if (upstream_id === undefined) {
+        setReadonly(disabled);


noted, need @guoqqqi to confirm

Yes, currently all can be edited on the preview page when first configuring upstream.

Does this will affect Route module?

Does this will affect Route module?

Yes！When the router, service, and upstream are created for the first time, this problem also occurs in the upstream involved.

guoqqqi · 2021-04-26T16:17:36Z

LGTM！

liuxiran · 2021-04-29T08:10:22Z

LGTM for code and founction, it would be better to add test case about it @Engine-AI

… be edited on the preview page bug

Engine-AI · 2021-04-29T13:24:40Z

@liuxiran @juzhiyuan ,This is my first time write test case using cypress. Could you please check if my test case complies with the specification

Engine-AI · 2021-04-29T13:28:18Z

@liuxiran @juzhiyuan ,This is my first time write test case using cypress. Could you please check if my test case complies with the specification
This is part of my test case, I think it passed。

guoqqqi

Hi, we can also determine if the input is disabled.

web/cypress/integration/route/create-route-when-not-select-upsteam-id.spec.js

guoqqqi · 2021-04-29T13:56:44Z

web/cypress/integration/service/create-service-with-not-select-upstream.spec.js

+    cy.get(this.domSelector.nodes_0_host).should('be.disabled','true');
+    cy.get(this.domSelector.nodes_0_port).should('be.disabled','true');
+    cy.get(this.domSelector.nodes_0_weight).should('be.disabled','true');
+    cy.get('#timeout_connect').should('be.disabled','true');
+    cy.get('#timeout_send').should('be.disabled','true');
+    cy.get('#timeout_read').should('be.disabled','true');
+    cy.get('#custom_checks_active').should('be.disabled','true');
+    cy.get('#custom_checks_passive').should('be.disabled','true');


guoqqqi · 2021-04-29T13:57:05Z

web/cypress/integration/service/create-service-with-not-select-upstream.spec.js

+    cy.get(this.domSelector.nodes_0_host).should('be.disabled','true');
+    cy.get(this.domSelector.nodes_0_port).should('be.disabled','true');
+    cy.get(this.domSelector.nodes_0_weight).should('be.disabled','true');
+    cy.get('#timeout_connect').should('be.disabled','true');
+    cy.get('#timeout_send').should('be.disabled','true');
+    cy.get('#timeout_read').should('be.disabled','true');
+    cy.get('#custom_checks_active').should('be.disabled','true');
+    cy.get('#custom_checks_passive').should('be.disabled','true');


@guoqqqi If this suggestion or comment is resolved, please click Resolve conversition

web/cypress/integration/upstream/create_and_delete_upstream.spec.js

…team-id.spec.js Co-authored-by: guoqqqi <72343596+guoqqqi@users.noreply.github.com>

guoqqqi

Hi~ also😊

web/cypress/integration/service/create-service-with-not-select-upstream.spec.js

web/cypress/integration/upstream/create_and_delete_upstream.spec.js

…ec.js Co-authored-by: guoqqqi <72343596+guoqqqi@users.noreply.github.com>

…-upstream.spec.js Co-authored-by: guoqqqi <72343596+guoqqqi@users.noreply.github.com>

Engine-AI · 2021-04-30T02:14:34Z

Hi~ also😊

Thank you @guoqqqi for pointing out my problem

Engine-AI

LGTM！

fix:When create the upstream, some properties can still be edited on …

a784419

…the preview page bug

juzhiyuan reviewed Apr 26, 2021

View reviewed changes

juzhiyuan requested review from LiteSun and liuxiran April 28, 2021 01:43

LiteSun approved these changes Apr 28, 2021

View reviewed changes

add:test case for When create the upstream, some properties can still…

64778d6

… be edited on the preview page bug

guoqqqi reviewed Apr 29, 2021

View reviewed changes

Engine-AI and others added 2 commits April 29, 2021 22:12

Update web/cypress/integration/route/create-route-when-not-select-ups…

17a5423

…team-id.spec.js Co-authored-by: guoqqqi <72343596+guoqqqi@users.noreply.github.com>

Update web/cypress/integration/route/create-route-when-not-select-ups…

73633d0

…team-id.spec.js Co-authored-by: guoqqqi <72343596+guoqqqi@users.noreply.github.com>

guoqqqi reviewed Apr 29, 2021

View reviewed changes

Engine-AI and others added 3 commits April 30, 2021 09:51

Update web/cypress/integration/upstream/create_and_delete_upstream.sp…

45c2d5c

…ec.js Co-authored-by: guoqqqi <72343596+guoqqqi@users.noreply.github.com>

Update web/cypress/integration/service/create-service-with-not-select…

2a92b69

…-upstream.spec.js Co-authored-by: guoqqqi <72343596+guoqqqi@users.noreply.github.com>

Update web/cypress/integration/service/create-service-with-not-select…

103c3a3

…-upstream.spec.js Co-authored-by: guoqqqi <72343596+guoqqqi@users.noreply.github.com>

liuxiran approved these changes Apr 30, 2021

View reviewed changes

Engine-AI commented Apr 30, 2021

View reviewed changes

juzhiyuan approved these changes May 3, 2021

View reviewed changes

juzhiyuan merged commit 6b997d1 into apache:master May 3, 2021

Engine-AI deleted the fix-upstream branch May 6, 2021 05:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix:When create the upstream, some properties can still be edited on … #1828

fix:When create the upstream, some properties can still be edited on … #1828

Engine-AI commented Apr 26, 2021

netlify bot commented Apr 26, 2021 •

edited

Loading

codecov-commenter commented Apr 26, 2021 •

edited

Loading

juzhiyuan Apr 26, 2021

guoqqqi Apr 26, 2021

juzhiyuan Apr 27, 2021

Engine-AI Apr 27, 2021

guoqqqi commented Apr 26, 2021

liuxiran commented Apr 29, 2021

Engine-AI commented Apr 29, 2021

Engine-AI commented Apr 29, 2021

guoqqqi left a comment

guoqqqi Apr 29, 2021

guoqqqi Apr 29, 2021

juzhiyuan May 3, 2021

guoqqqi left a comment

Engine-AI commented Apr 30, 2021

Engine-AI left a comment

fix:When create the upstream, some properties can still be edited on … #1828

fix:When create the upstream, some properties can still be edited on … #1828

Conversation

Engine-AI commented Apr 26, 2021

netlify bot commented Apr 26, 2021 • edited Loading

codecov-commenter commented Apr 26, 2021 • edited Loading

Codecov Report

juzhiyuan Apr 26, 2021

Choose a reason for hiding this comment

guoqqqi Apr 26, 2021

Choose a reason for hiding this comment

juzhiyuan Apr 27, 2021

Choose a reason for hiding this comment

Engine-AI Apr 27, 2021

Choose a reason for hiding this comment

guoqqqi commented Apr 26, 2021

liuxiran commented Apr 29, 2021

Engine-AI commented Apr 29, 2021

Engine-AI commented Apr 29, 2021

guoqqqi left a comment

Choose a reason for hiding this comment

guoqqqi Apr 29, 2021

Choose a reason for hiding this comment

guoqqqi Apr 29, 2021

Choose a reason for hiding this comment

juzhiyuan May 3, 2021

Choose a reason for hiding this comment

guoqqqi left a comment

Choose a reason for hiding this comment

Engine-AI commented Apr 30, 2021

Engine-AI left a comment

Choose a reason for hiding this comment

netlify bot commented Apr 26, 2021 •

edited

Loading

codecov-commenter commented Apr 26, 2021 •

edited

Loading