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.

Sign up for GitHub

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

feat: add the service page upstream select option #1633

Merged
merged 27 commits into from
May 3, 2021
Merged

feat: add the service page upstream select option #1633

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
78199c5
feat: add the service page upstream select option
stu01509 Mar 20, 2021
6749ff0
test: fix the upstream option ci
stu01509 Mar 20, 2021
bf39e42
Merge branch 'master' into fix-#1616-add-upstream-option
stu01509 Mar 22, 2021
5cc80e6
Merge remote-tracking branch 'upstream/master' into fix-#1616-add-ups…
stu01509 Mar 23, 2021
d47b446
Merge branch 'fix-#1616-add-upstream-option' of github.com:stu01509/a…
stu01509 Mar 23, 2021
59a97c4
Merge remote-tracking branch 'upstream/master' into fix-#1616-add-ups…
stu01509 Mar 24, 2021
7abb013
feat: add the service page upstream select option
stu01509 Mar 26, 2021
cc181b0
feat: adjust the option value field
stu01509 Mar 26, 2021
125518a
test: fix the select option test case
stu01509 Mar 27, 2021
75fb1b5
test: fix the select option test case
stu01509 Mar 28, 2021
3d94310
Merge remote-tracking branch 'upstream/master' into fix-#1616-add-ups…
stu01509 Apr 2, 2021
68ad8ac
test: fix ci error
stu01509 Apr 2, 2021
b535182
Merge remote-tracking branch 'upstream/master' into fix-#1616-add-ups…
stu01509 Apr 6, 2021
5e9fc28
fix: fix create service with None upstream error
stu01509 Apr 6, 2021
169fcf3
test: fix the select option test case
stu01509 Apr 8, 2021
a0a72a5
Merge branch 'master' into fix-#1616-add-upstream-option
stu01509 Apr 8, 2021
b4a55d5
test: fix ci error
stu01509 Apr 9, 2021
90c6796
Merge branch 'fix-#1616-add-upstream-option' of github.com:stu01509/a…
stu01509 Apr 9, 2021
41a4b61
Merge remote-tracking branch 'upstream/master' into fix-#1616-add-ups…
stu01509 Apr 13, 2021
f5f1a8d
feat: add the service page upstream select option
stu01509 Apr 13, 2021
aeb72f9
feat: add the service page upstream select option
stu01509 Apr 13, 2021
53f6159
Merge remote-tracking branch 'upstream/master' into fix-#1616-add-ups…
stu01509 Apr 24, 2021
bfd1f7f
test: fix ci error
stu01509 Apr 24, 2021
a9a401e
test: fix ci error
stu01509 Apr 24, 2021
0fe93b2
feat: change the en-US locales
stu01509 Apr 24, 2021
c9ae7ed
Merge remote-tracking branch 'upstream/master' into fix-#1616-add-ups…
stu01509 Apr 28, 2021
cfe100c
fix: create service when select upstream None error
stu01509 Apr 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions web/cypress/integration/route/can-skip-upstream-when-select-service-id.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ context('Can select service_id skip upstream in route', () => {
cy.get(this.domSelector.name).type(this.data.routeName);
cy.contains('Next').click();
cy.get(this.domSelector.upstreamSelector).click();
cy.contains('None').should('not.exist');
cy.contains('None').should('exist');
stu01509 marked this conversation as resolved.
Show resolved Hide resolved

cy.contains('Previous').click();
cy.contains('None').click();
Expand Down Expand Up @@ -89,7 +89,7 @@ context('Can select service_id skip upstream in route', () => {
cy.contains('None').click();
cy.contains('Next').click();
cy.get(this.domSelector.upstream_id).click();
cy.contains('None').should('not.exist');
cy.contains('None').should('exist');
stu01509 marked this conversation as resolved.
Show resolved Hide resolved
cy.contains(this.data.upstreamName).click();
cy.contains('Next').click();
cy.contains('Next').click();
Expand Down
4 changes: 3 additions & 1 deletion web/src/components/Upstream/UpstreamForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,9 @@ const UpstreamForm: React.FC<Props> = forwardRef(
item?.children.toLowerCase().includes(input.toLowerCase())
}
>
{Boolean(!required) && <Select.Option value={'None'}>None</Select.Option>}
{Boolean(!required) && <Select.Option value='None'>{
formatMessage({ id: 'page.upstream.step.select.upstream.select.none' })
}</Select.Option>}
{[
{
name: formatMessage({ id: 'page.upstream.step.select.upstream.select.option' }),
Expand Down
2 changes: 1 addition & 1 deletion web/src/pages/Service/components/Step1.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const Step1: React.FC<ServiceModule.Step1PassProps> = ({
</Form>
<UpstreamForm
ref={upstreamRef}
required
required={false}
form={upstreamForm}
disabled={disabled}
list={list}
Expand Down
1 change: 1 addition & 0 deletions web/src/pages/Upstream/locales/en-US.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
export default {
'page.upstream.step.select.upstream': 'Select Upstream',
'page.upstream.step.select.upstream.select.option': 'Custom',
'page.upstream.step.select.upstream.select.none': 'None',
'page.upstream.form.item-label.node.domain.or.ip': 'Node List',
'page.upstream.step.backend.server.domain.or.ip': 'Backend Server Domain/IP',
juzhiyuan marked this conversation as resolved.
Show resolved Hide resolved
'page.upstream.form.item.extra-message.node.domain.or.ip':
Expand Down
1 change: 1 addition & 0 deletions web/src/pages/Upstream/locales/zh-CN.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
export default {
'page.upstream.step.select.upstream': '选择上游服务',
'page.upstream.step.select.upstream.select.option': '手动填写',
'page.upstream.step.select.upstream.select.none': '无',
'page.upstream.form.item-label.node.domain.or.ip': '上游节点',
'page.upstream.step.backend.server.domain.or.ip': '后端服务域名或 IP',
'page.upstream.form.item.extra-message.node.domain.or.ip':
Expand Down