feat: added priority (#1006)

apache · Dec 10, 2020 · 39239eb · 39239eb
1 parent 0010423
commit 39239eb
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 3 deletions.
diff --git a/web/src/components/Plugin/CodeMirrorDrawer.tsx b/web/src/components/Plugin/CodeMirrorDrawer.tsx
@@ -113,10 +113,11 @@ const CodeMirrorDrawer: React.FC<Props> = ({
               onClick={() => {
                 window.open(`https://github.com/apache/apisix/blob/master/doc/plugins/${name}.md`);
               }}
+              key={1}
             >
               Document
             </Button>,
-            <Button type="primary" onClick={formatCodes}>
+            <Button type="primary" onClick={formatCodes} key={2}>
               Format
             </Button>,
           ]}

diff --git a/web/src/components/Plugin/PluginPage.tsx b/web/src/components/Plugin/PluginPage.tsx
@@ -118,14 +118,15 @@ const PluginPage: React.FC<Props> = ({
                     title={[
                       item.avatar && (
                         <Avatar
+                          key={1}
                           icon={item.avatar}
                           className="plugin-avatar"
                           style={{
                             marginRight: 5,
                           }}
                         />
                       ),
-                      <span>{item.name}</span>,
+                      <span key={2}>{item.name}</span>,
                     ]}
                     style={{ height: 66 }}
                     extra={[

diff --git a/web/src/pages/Route/components/Step1/RequestConfigView.tsx b/web/src/pages/Route/components/Step1/RequestConfigView.tsx
@@ -16,7 +16,7 @@
  */
 import React from 'react';
 import Form from 'antd/es/form';
-import { Checkbox, Button, Input, Select, Row, Col } from 'antd';
+import { Checkbox, Button, Input, Select, Row, Col, InputNumber } from 'antd';
 import { PlusOutlined, MinusCircleOutlined } from '@ant-design/icons';
 import { useIntl } from 'umi';
 import { PanelSection } from '@api7-dashboard/ui';
@@ -267,6 +267,18 @@ const RequestConfigView: React.FC<RouteModule.Step1PassProps> = ({
       >
         <Checkbox.Group options={HTTP_METHOD_OPTION_LIST} disabled={disabled} />
       </Form.Item>
+      <Form.Item
+        label={formatMessage({ id: 'page.route.form.itemLabel.priority' })}
+        name="priority"
+      >
+        <InputNumber
+          placeholder={`Please input ${formatMessage({
+            id: 'page.route.form.itemLabel.priority',
+          })}`}
+          style={{ width: '60%' }}
+          disabled={disabled}
+        />
+      </Form.Item>
       <Form.Item
         label={formatMessage({ id: 'page.route.form.itemLabel.redirect' })}
         name="redirectOption"

diff --git a/web/src/pages/Route/locales/en-US.ts b/web/src/pages/Route/locales/en-US.ts
@@ -46,6 +46,7 @@ export default {
   'page.route.panelSection.title.requestConfigBasicDefine': 'Request Basic Define',
   'page.route.protocol': 'Protocol',
   'page.route.form.itemLabel.httpMethod': 'HTTP Method',
+  'page.route.form.itemLabel.priority': 'Priority',
   'page.route.form.itemLabel.redirect': 'Redirect',
   'page.route.select.option.enableHttps': 'Enable HTTPS',
   'page.route.select.option.configCustom': 'Custom',

diff --git a/web/src/pages/Route/locales/zh-CN.ts b/web/src/pages/Route/locales/zh-CN.ts
@@ -50,6 +50,7 @@ export default {
   'page.route.form.itemRulesPatternMessage.apiNameRule':
     '最大长度100，仅支持字母、数字、- 和 _，且只能以字母开头',
   'page.route.form.itemLabel.httpMethod': 'HTTP 方法',
+  'page.route.form.itemLabel.priority': '优先级',
   'page.route.form.itemLabel.redirect': '重定向',
   'page.route.form.itemLabel.redirectCustom': '自定义重定向',
   'page.route.form.itemLabel.rewriteType': '请求路径',

diff --git a/web/src/pages/Route/transform.ts b/web/src/pages/Route/transform.ts
@@ -145,6 +145,7 @@ export const transformRouteData = (data: RouteModule.Body) => {
     status,
     upstream,
     upstream_id,
+    priority = 0,
   } = data;
   const form1Data: Partial<RouteModule.Form1Data> = {
     name,
@@ -154,6 +155,7 @@ export const transformRouteData = (data: RouteModule.Body) => {
     uris: uris || (uri && [uri]) || [],
     remote_addrs: remote_addrs || [''],
     methods,
+    priority,
   };
 
   const redirect = data.plugins?.redirect || {};