diff --git a/web/cypress/integration/route/create-and-delete-route.spec.js b/web/cypress/integration/route/create-and-delete-route.spec.js index 7b57428222..c8bd6d99a6 100644 --- a/web/cypress/integration/route/create-and-delete-route.spec.js +++ b/web/cypress/integration/route/create-and-delete-route.spec.js @@ -56,10 +56,7 @@ context('Create and Delete Route', () => { // go to step2 cy.contains('Next').click(); - cy.wait(400); - cy.get('#nodes_0_host').type('12.12.12.12', { - timeout: 5000 - }); + cy.get('#nodes_0_host').type('12.12.12.12') // go to step3 cy.contains('Next').click(); diff --git a/web/src/components/Upstream/UpstreamForm.tsx b/web/src/components/Upstream/UpstreamForm.tsx index 7afc30e1a5..fcbedaa3d7 100644 --- a/web/src/components/Upstream/UpstreamForm.tsx +++ b/web/src/components/Upstream/UpstreamForm.tsx @@ -566,9 +566,9 @@ const UpstreamForm: React.FC = forwardRef( > {showSelector && ( { + setReadonly(Boolean(next.upstream_id)); if (prev.upstream_id !== next.upstream_id) { const id = next.upstream_id; - setReadonly(Boolean(id)); if (id) { form.setFieldsValue(list.find((item) => item.id === id)); form.setFieldsValue({ @@ -609,9 +609,7 @@ const UpstreamForm: React.FC = forwardRef( return null; }} - - - + {NodeList()}