Skip to content

Commit 7c5eced

Browse files
authored
feat: improve Consumer module (#2327)
=
1 parent 4e72d92 commit 7c5eced

File tree

7 files changed

+23
-9
lines changed

7 files changed

+23
-9
lines changed

web/cypress/integration/consumer/create_and_delete_consumer.spec.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ context('Create and Delete Consumer', () => {
9595

9696
cy.get(selector.nameSelector).type(data.consumerName);
9797
cy.contains('Search').click();
98+
cy.contains('key-auth').should('be.visible');
9899
cy.contains(data.consumerName).siblings().contains('View').click();
99100
cy.get(selector.drawer).should('be.visible');
100101

web/src/locales/en-US/component.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ export default {
5151
'component.status.fail': 'Failed',
5252
'component.global.popconfirm.title.delete': 'Are you sure to delete this record ?',
5353
'component.global.notification.success.message.deleteSuccess': 'Deleted Successfully',
54+
'component.global.create.consumer.success': 'Create Consumer Successfully',
55+
'component.global.delete.consumer.success': 'Delete Consumer Successfully',
56+
'component.global.edit.consumer.success': 'Edit Consumer Successfully',
5457

5558
'component.global.steps.stepTitle.basicInformation': 'Basic Information',
5659
'component.global.steps.stepTitle.preview': 'Preview',

web/src/locales/zh-CN/component.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,16 @@ export default {
5858
'component.global.name': '名称',
5959
'component.global.id': 'ID',
6060
'component.global.updateTime': '更新时间',
61+
'component.global.create.consumer.success': '创建消费者成功',
62+
'component.global.delete.consumer.success': '删除消费者成功',
63+
'component.global.edit.consumer.success': '配置消费者成功',
6164

6265
'component.global.popconfirm.title.delete': '确定删除该条记录吗?',
6366
'component.global.steps.stepTitle.basicInformation': '基础信息',
6467
'component.global.steps.stepTitle.preview': '预览',
6568
'component.global.steps.stepTitle.pluginConfig': '插件配置',
6669
'component.global.input.ruleMessage.name': '仅支持字母、数字、- 和 _,且只能以字母开头',
67-
'component.global.form.itemExtraMessage.nameGloballyUnique': '名称需全局唯一',
70+
'component.global.form.itemExtraMessage.nameGloballyUnique': '消费者名称需全局唯一',
6871
'component.global.input.placeholder.description': '请输入路由描述(内容不超过 256 个字符)',
6972

7073
// User component

web/src/pages/Consumer/Create.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,9 @@ const Page: React.FC = (props) => {
6262
notification.success({
6363
message: `${
6464
username
65-
? formatMessage({ id: 'component.global.edit' })
66-
: formatMessage({ id: 'component.global.create' })
67-
} ${formatMessage({ id: 'menu.consumer' })} ${formatMessage({
68-
id: 'component.status.success',
69-
})}`,
65+
? formatMessage({ id: 'component.global.edit.consumer.success' })
66+
: formatMessage({ id: 'component.global.create.consumer.success' })
67+
}`,
7068
});
7169
history.push('/consumer/list');
7270
})

web/src/pages/Consumer/List.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ const Page: React.FC = () => {
5555
hideInSearch: true,
5656
render: (text) => timestampToLocaleString(text as number),
5757
},
58+
{
59+
title: formatMessage({ id: 'menu.plugin' }),
60+
dataIndex: 'plugins',
61+
hideInSearch: true,
62+
render: (_, record) => Object.keys(record.plugins).join(','),
63+
},
5864
{
5965
title: formatMessage({ id: 'component.global.operation' }),
6066
valueType: 'option',
@@ -87,9 +93,7 @@ const Page: React.FC = () => {
8793
onConfirm={() => {
8894
remove(record.username).then(() => {
8995
notification.success({
90-
message: `${formatMessage({ id: 'component.global.delete' })} ${formatMessage({
91-
id: 'menu.consumer',
92-
})} ${formatMessage({ id: 'component.status.success' })}`,
96+
message: `${formatMessage({ id: 'component.global.delete.consumer.success' })}`,
9397
});
9498
/* eslint-disable no-unused-expressions */
9599
ref.current?.reload();

web/src/pages/Consumer/components/Step1.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ const Step1: React.FC<Props> = ({ form, disabled }) => {
4040
<Form.Item
4141
label={formatMessage({ id: 'page.consumer.username' })}
4242
name="username"
43+
help={formatMessage({ id: 'component.global.form.itemExtraMessage.nameGloballyUnique' })}
4344
rules={[
4445
{ required: true },
4546
{

web/src/pages/Route/List.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,6 +552,10 @@ const Page: React.FC = () => {
552552
</>
553553
),
554554
},
555+
{
556+
title: formatMessage({ id: 'menu.plugin' }),
557+
dataIndex: 'plugins',
558+
},
555559
];
556560

557561
return (

0 commit comments

Comments
 (0)