This is an automated email from the ASF dual-hosted git repository.
sunyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git
The following commit(s) were added to refs/heads/master by this push:
new 5411a1e fix: editing a Service, the upstream info will be lost.
(#1347)
5411a1e is described below
commit 5411a1efdad4b25d5b38e6540d3497d04fef7b2f
Author: guoqqqi <72343596+guoq...@users.noreply.github.com>
AuthorDate: Sun Jan 24 16:33:03 2021 +0800
fix: editing a Service, the upstream info will be lost. (#1347)
* fix: editing a Service, the upstream info will be lost.
* format code
* test: editing a Service
---
.../service/create-and-delete-service.spec.js | 54 -------------
.../service/create-edit-delete-service.spec.js | 94 ++++++++++++++++++++++
web/src/pages/Service/Create.tsx | 26 +++---
3 files changed, 106 insertions(+), 68 deletions(-)
diff --git a/web/cypress/integration/service/create-and-delete-service.spec.js
b/web/cypress/integration/service/create-and-delete-service.spec.js
deleted file mode 100644
index 9ee46a6..0000000
--- a/web/cypress/integration/service/create-and-delete-service.spec.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* eslint-disable no-undef */
-
-context('create and delete service ', () => {
- beforeEach(() => {
- // init login
- cy.login();
- });
-
- it('should create service', () => {
- // go to create service page
- cy.visit('/');
- cy.contains('Service').click();
- cy.contains('Create').click();
-
- cy.get('#name').type('service');
- cy.get('#desc').type('desc');
- cy.get('#nodes_0_host').click();
- cy.get('#nodes_0_host').type('12.12.12.12');
-
- cy.contains('Next').click();
- cy.contains('Next').click();
- cy.contains('Submit').click();
- });
-
- it('should delete the service', () => {
- cy.visit('/');
- cy.contains('Service').click();
-
- cy.get('[title=Name]').type('service');
- cy.contains('Search').click();
-
- cy.contains('service').siblings().contains('Delete').click();
- cy.contains('button', 'Confirm').click();
- cy.fixture('selector.json').then(({ notification }) => {
- cy.get(notification).should('contain', 'Delete Service Successfully');
- });
- });
-});
diff --git a/web/cypress/integration/service/create-edit-delete-service.spec.js
b/web/cypress/integration/service/create-edit-delete-service.spec.js
new file mode 100644
index 0000000..ac7eee3
--- /dev/null
+++ b/web/cypress/integration/service/create-edit-delete-service.spec.js
@@ -0,0 +1,94 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* eslint-disable no-undef */
+
+context('create and delete service ', () => {
+ const domSelector = {
+ name: '#name',
+ desc: '#desc',
+ nodes_0_host: '#nodes_0_host',
+ notification: '.ant-notification-notice-message',
+ search_name: '[title=Name]',
+ };
+ const data = {
+ service_name1: 'service',
+ service_name2: 'new service',
+ desc1: 'desc',
+ desc2: 'new desc',
+ ip1: '12.12.12.12',
+ ip2: '12.12.12.10',
+ create_service_success: 'Create Service Successfully',
+ edit_service_success: 'Edit Service Successfully',
+ delete_service_success: 'Delete Service Successfully',
+ }
+
+ beforeEach(() => {
+ cy.login();
+ });
+
+ it('should create service', () => {
+ cy.visit('/');
+ cy.contains('Service').click();
+ cy.contains('Create').click();
+
+ cy.get(domSelector.name).type(data.service_name1);
+ cy.get(domSelector.desc).type(data.desc1);
+ cy.get(domSelector.nodes_0_host).click();
+ cy.get(domSelector.nodes_0_host).type(data.ip1);
+
+ cy.contains('Next').click();
+ cy.contains('Next').click();
+ cy.contains('Submit').click();
+ cy.get(domSelector.notification).should('contain',
data.create_service_success);
+ });
+
+ it('should edit the service', () => {
+ cy.visit('/');
+ cy.contains('Service').click();
+
+ cy.get(domSelector.search_name).type(data.service_name1);
+ cy.contains('Search').click();
+ cy.contains(data.service_name1).siblings().contains('Edit').click();
+
+ // Confirm whether the created data is saved.
+ cy.get(domSelector.nodes_0_host).should('value', data.ip1);
+ cy.get(domSelector.desc).should('value', data.desc1)
+ cy.get(domSelector.name).clear().type(data.service_name2);
+ cy.get(domSelector.desc).clear().type(data.desc2);
+ cy.get(domSelector.nodes_0_host).click();
+ cy.get(domSelector.nodes_0_host).clear().type(data.ip2);
+ cy.contains('Next').click();
+ cy.contains('Next').click();
+ cy.contains('Submit').click();
+ cy.get(domSelector.notification).should('contain',
data.edit_service_success);
+ });
+
+ it('should delete the service', () => {
+ // Confirm whether the edited data is saved.
+ cy.get(domSelector.search_name).type(data.service_name2);
+ cy.contains('Search').click();
+ cy.contains(data.service_name2).siblings().contains('Edit').click();
+ cy.get(domSelector.nodes_0_host).should('value', data.ip2);
+ cy.get(domSelector.desc).should('value', data.desc2);
+
+ cy.visit('/');
+ cy.contains('Service').click();
+ cy.contains(data.service_name2).siblings().contains('Delete').click();
+ cy.contains('button', 'Confirm').click();
+ cy.get(domSelector.notification).should('contain',
data.delete_service_success);
+ });
+});
diff --git a/web/src/pages/Service/Create.tsx b/web/src/pages/Service/Create.tsx
index c85849d..c8ed53f 100644
--- a/web/src/pages/Service/Create.tsx
+++ b/web/src/pages/Service/Create.tsx
@@ -71,8 +71,8 @@ const Page: React.FC = (props) => {
};
const upstreamFormData = upstreamRef.current?.getData();
- if (upstreamFormData.upstream_id === '') {
- data.upstream = omit(upstreamFormData, ['upstream_id']);
+ if (!upstreamFormData.upstream_id) {
+ data.upstream = upstreamFormData;
} else {
data.upstream_id = upstreamFormData.upstream_id;
}
@@ -81,13 +81,12 @@ const Page: React.FC = (props) => {
(serviceId ? update(serviceId, data) : create(data))
.then(() => {
notification.success({
- message: `${
- serviceId
- ? formatMessage({ id: 'component.global.edit' })
- : formatMessage({ id: 'component.global.create' })
- } ${formatMessage({ id: 'menu.service' })} ${formatMessage({
- id: 'component.status.success',
- })}`,
+ message: `${serviceId
+ ? formatMessage({ id: 'component.global.edit' })
+ : formatMessage({ id: 'component.global.create' })
+ } ${formatMessage({ id: 'menu.service' })} ${formatMessage({
+ id: 'component.status.success',
+ })}`,
});
history.push('/service/list');
})
@@ -115,11 +114,10 @@ const Page: React.FC = (props) => {
return (
<>
<PageHeaderWrapper
- title={`${
- (props as any).match.params.rid
- ? formatMessage({ id: 'component.global.edit' })
- : formatMessage({ id: 'component.global.create' })
- } ${formatMessage({ id: 'menu.service' })}`}
+ title={`${(props as any).match.params.rid
+ ? formatMessage({ id: 'component.global.edit' })
+ : formatMessage({ id: 'component.global.create' })
+ } ${formatMessage({ id: 'menu.service' })}`}
>
<Card bordered={false}>
<Steps current={step - 1} style={{ marginBottom: '25px' }}>
