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 limit-count plugin #1739

Merged
merged 16 commits into from
Apr 15, 2021
Merged

feat: add limit-count plugin #1739

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d8156d0
feat: add limit-count plugin
LiteSun Apr 10, 2021
3eb2053
feat: update
LiteSun Apr 11, 2021
40be120
fix: style
LiteSun Apr 11, 2021
8a86b65
feat: update i18n
LiteSun Apr 11, 2021
88bd2e4
test: add testcase
LiteSun Apr 11, 2021
2b74398
fix: lint
LiteSun Apr 11, 2021
c173197
feat: update
LiteSun Apr 11, 2021
2cf677e
fix: dom lost
LiteSun Apr 12, 2021
bcb2ad0
Merge branch 'master' into limit-count-plugin-form
LiteSun Apr 12, 2021
80c3e3e
feat: update
LiteSun Apr 12, 2021
0fbc35b
Merge branch 'master' into limit-count-plugin-form
LiteSun Apr 13, 2021
e416191
feat: update rule
LiteSun Apr 13, 2021
a1b87a6
feat: update testcase
LiteSun Apr 13, 2021
edc362b
test: add create-route-with-limit-count-plugin-form.spec
LiteSun Apr 13, 2021
4325300
Merge branch 'master' into limit-count-plugin-form
LiteSun Apr 14, 2021
d896705
Merge branch 'master' into limit-count-plugin-form
juzhiyuan Apr 15, 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/consumer/create-consumer-with-limit-count-plugin-form.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ context('Create and delete consumer with limit-count plugin form', () => {
redis_host: '127.0.0.1',
redis_password: 'redis_password',
redis_cluster_name: 'redis_cluster_name',
redis_cluster_nodes_0: "redis.cluster1",
redis_cluster_nodes_1: "redis.cluster1",
redis_cluster_nodes_0: "127.0.0.1:5000",
redis_cluster_nodes_1: "127.0.0.1:5000",
}

it('should create consumer with limit-count form', function () {
Expand Down
10 changes: 5 additions & 5 deletions web/src/components/Plugin/UI/limit-count.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const RedisForm: React.FC = () => {
label="redis_host"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

emmm would better have i18n for those fields, for users may not know what's it

name="redis_host"
tooltip={formatMessage({ id: 'component.pluginForm.limit-count.redis_host.tooltip' })}
required
rules={[{ required: true, message: 'Please input redis_host' }]}
>
<Input />
</Form.Item>
Expand All @@ -70,7 +70,7 @@ const RedisForm: React.FC = () => {
label="redis_password"
name="redis_password"
tooltip={formatMessage({ id: 'component.pluginForm.limit-count.redis_password.tooltip' })}
required
rules={[{ required: true, message: 'Please input redis_password' }]}
>
<Input />
</Form.Item>
Expand Down Expand Up @@ -100,7 +100,7 @@ const RedisClusterForm: React.FC<Props> = () => {
label="redis_cluster_name"
name="redis_cluster_name"
tooltip={formatMessage({ id: 'component.pluginForm.limit-count.redis_cluster_name.tooltip' })}
required
rules={[{ required: true, message: 'Please input redis_cluster_name' }]}
>
<Input />
</Form.Item>
Expand Down Expand Up @@ -169,15 +169,15 @@ const LimitCount: React.FC<Props> = ({ form }) => {
label="count"
name="count"
tooltip={formatMessage({ id: 'component.pluginForm.limit-count.count.tooltip' })}
required
rules={[{ required: true, message: 'Please input count' }]}
juzhiyuan marked this conversation as resolved.
Show resolved Hide resolved
>
<InputNumber min={1} />
</Form.Item>
<Form.Item
label="time_window"
name="time_window"
tooltip={formatMessage({ id: 'component.pluginForm.limit-count.time_window.tooltip' })}
required
rules={[{ required: true, message: 'Please input time_window' }]}
>
<InputNumber min={1} />
</Form.Item>
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/Plugin/locales/en-US.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default {
'component.step.select.pluginTemplate.select.option': 'Custom',
'component.plugin.pluginTemplate.tip1': '1. When a route already have plugins field configured, the plugins in the plugin template will be merged into it.',
'component.plugin.pluginTemplate.tip2': '2. The same plugin in the plugin template will override one in the plugins',

'component.plugin.form': 'Form',
'component.plugin.format-codes.disable': 'Format JSON or YAML data',
'component.plugin.editor': 'Plugin Editor',
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/Plugin/locales/zh-CN.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default {
'component.step.select.pluginTemplate.select.option': '手动配置',
'component.plugin.pluginTemplate.tip1': '1. 若路由已配置插件，则插件模板数据将与已配置的插件数据合并。',
'component.plugin.pluginTemplate.tip2': '2. 插件模板相同的插件会覆盖掉原有的插件。',

'component.plugin.form': '表单',
'component.plugin.format-codes.disable': '用于格式化 JSON 或 YAML 内容',
'component.plugin.editor': '插件配置',
Expand Down