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

fix: advance matching in the route create page causes the page to crash #2440

Merged
merged 8 commits into from
May 30, 2022
Merged

fix: advance matching in the route create page causes the page to crash #2440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9a495f7
fix: Advanced matching causes page crashes
Si-ege Apr 24, 2022
f6626a9
feat: update
Si-ege Apr 24, 2022
b45f347
Empty-Commit
Si-ege Apr 25, 2022
2ffd210
feat: Add test code
Si-ege Apr 25, 2022
be4e2a3
feat: update test code
Si-ege Apr 26, 2022
1947e24
feat: update test code
Si-ege Apr 27, 2022
7825f6c
feat: update test code
Si-ege May 6, 2022
d45cfe1
Merge branch 'master' into advance-matching-in-the-route-create-page-…
Si-ege May 6, 2022
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
45 changes: 44 additions & 1 deletion 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 @@ -30,6 +30,13 @@ context('Can select service_id skip upstream in route', () => {
deleteAlert: '.ant-modal-body',
notificationCloseIcon: '.ant-notification-close-icon',
enable_websocket: '#enable_websocket',
addbtn: '.ant-btn-primary',
selectItem: '.ant-select-item-option-content',
position: '#position',
value: '#value',
operator: '#operator',
rowcard: '.ant-table-row-level-0',
reverse: '#reverse',
};

const data = {
Expand All @@ -45,6 +52,8 @@ context('Can select service_id skip upstream in route', () => {
ip1: '127.0.0.1',
port0: '7000',
weight0: '1',
parameterName: 'text_Parameter',
value: '["1", "2"]',
};

beforeEach(() => {
Expand Down Expand Up @@ -103,12 +112,46 @@ context('Can select service_id skip upstream in route', () => {
cy.get(selector.input).should('be.disabled');

cy.contains(data.upstreamName).click();
cy.contains('None').click({ force: true });
cy.contains('None').click({
force: true,
});
cy.contains('Next').click();
cy.contains('Next').click();
cy.contains('Submit').click();
cy.contains('Goto List').click();
});
it('should Add Advanced Routing Matching Conditions', function () {
cy.visit('/');
cy.contains('Route').click();

cy.get(selector.nameSelector).type(data.routeName);
cy.contains('Search').click();
cy.contains(data.routeName).siblings().contains('Configure').click();
cy.get(selector.addbtn).contains('Add').click();
cy.get(selector.position).click();
cy.get(selector.selectItem).within(() => {
cy.contains('HTTP Request Header').click();
});
cy.get('.ant-form-item-control-input-content > #name').type(data.parameterName);
cy.get(selector.reverse).click();
cy.get(selector.operator).click();
cy.get(selector.selectItem).within(() => {
cy.contains('IN').click();
});
cy.get(selector.value).type(data.value);
cy.contains('Confirm').click();
cy.get(selector.rowcard).should('be.visible');
cy.get(selector.rowcard).get('tr>td').eq(2).contains('true').should('be.visible');
cy.get(selector.rowcard).contains('Configure').click();
cy.get(selector.reverse).click();
cy.contains('Confirm').click();
cy.get(selector.rowcard).get('tr>td').eq(2).contains('false').should('be.visible');
cy.contains('Next').click();
cy.contains('Next').click();
cy.contains('Next').click();
cy.contains('Submit').click();
cy.contains(data.submitSuccess);
});

it('should skip upstream module after service is selected when editing route', function () {
cy.visit('/');
Expand Down
76 changes: 38 additions & 38 deletions web/src/pages/Route/List.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,47 +228,47 @@ const Page: React.FC = () => {
onClick: () => void;
icon?: ReactNode;
}[] = [
{
name: formatMessage({ id: 'component.global.view' }),
onClick: () => {
setId(record.id);
setRawData(omit(record, DELETE_FIELDS));
setVisible(true);
setEditorMode('update');
},
{
name: formatMessage({ id: 'component.global.view' }),
onClick: () => {
setId(record.id);
setRawData(omit(record, DELETE_FIELDS));
setVisible(true);
setEditorMode('update');
},
{
name: formatMessage({ id: 'component.global.duplicate' }),
onClick: () => {
history.push(`/routes/${record.id}/duplicate`);
},
},
{
name: formatMessage({ id: 'component.global.duplicate' }),
onClick: () => {
history.push(`/routes/${record.id}/duplicate`);
},
{
name: formatMessage({ id: 'component.global.delete' }),
onClick: () => {
Modal.confirm({
type: 'warning',
title: formatMessage({ id: 'component.global.popconfirm.title.delete' }),
content: (
<>
{formatMessage({ id: 'component.global.name' })} - {record.name}
<br />
ID - {record.id}
</>
),
onOk: () => {
return remove(record.id!).then(() => {
handleTableActionSuccessResponse(
`${formatMessage({ id: 'component.global.delete' })} ${formatMessage({
id: 'menu.routes',
})} ${formatMessage({ id: 'component.status.success' })}`,
);
});
},
});
},
},
{
name: formatMessage({ id: 'component.global.delete' }),
onClick: () => {
Modal.confirm({
type: 'warning',
title: formatMessage({ id: 'component.global.popconfirm.title.delete' }),
content: (
<>
{formatMessage({ id: 'component.global.name' })} - {record.name}
<br />
ID - {record.id}
</>
),
onOk: () => {
return remove(record.id!).then(() => {
handleTableActionSuccessResponse(
`${formatMessage({ id: 'component.global.delete' })} ${formatMessage({
id: 'menu.routes',
})} ${formatMessage({ id: 'component.status.success' })}`,
);
});
},
});
},
];
},
];

return (
<Dropdown
Expand Down
1 change: 1 addition & 0 deletions web/src/pages/Route/components/Step1/MatchingRulesView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ const MatchingRulesView: React.FC<RouteModule.Step1PassProps> = ({
name={'reverse'}
valuePropName={'checked'}
required
initialValue={false}
>
<Switch />
</Form.Item>
Expand Down