You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by ju...@apache.org on 2020/06/02 13:24:18 UTC

[incubator-apisix-dashboard] branch next updated: codes clean

This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-dashboard.git


The following commit(s) were added to refs/heads/next by this push:
     new b2afd8f  codes clean
b2afd8f is described below

commit b2afd8f4c528aaf002902b596e7642afefb2baf7
Author: juzhiyuan <jj...@gmail.com>
AuthorDate: Tue Jun 2 21:23:47 2020 +0800

    codes clean
---
 src/pages/Routes/Create.tsx                        |   2 +-
 .../components/Step2/HttpHeaderRewriteView.tsx     |  21 +--
 .../Routes/components/Step2/RequestRewriteView.tsx | 152 ++++++++++-----------
 src/pages/Routes/components/Step2/index.tsx        |   9 +-
 src/pages/Routes/constants.ts                      |   8 +-
 src/pages/Routes/typing.d.ts                       |  10 +-
 6 files changed, 104 insertions(+), 98 deletions(-)

diff --git a/src/pages/Routes/Create.tsx b/src/pages/Routes/Create.tsx
index 0772606..08dab80 100644
--- a/src/pages/Routes/Create.tsx
+++ b/src/pages/Routes/Create.tsx
@@ -20,7 +20,7 @@ const Create: React.FC = () => {
   const [form1] = Form.useForm();
   const [form2] = Form.useForm();
 
-  const [step, setStep] = useState(1);
+  const [step, setStep] = useState(0);
   const [stepHeader] = useState(['定义 API 请求', '定义 API 后端服务', '插件配置', '预览']);
 
   const data = {
diff --git a/src/pages/Routes/components/Step2/HttpHeaderRewriteView.tsx b/src/pages/Routes/components/Step2/HttpHeaderRewriteView.tsx
index b028d55..e06cb31 100644
--- a/src/pages/Routes/components/Step2/HttpHeaderRewriteView.tsx
+++ b/src/pages/Routes/components/Step2/HttpHeaderRewriteView.tsx
@@ -8,7 +8,7 @@ import PanelSection from '../PanelSection';
 interface Props extends RouteModule.Data {}
 
 const HttpHeaderRewriteView: React.FC<Props> = ({ data, disabled, onChange }) => {
-  const { upstream_header } = data.step2Data;
+  const { upstreamHeaderList } = data.step2Data;
   const [visible, setVisible] = useState(false);
   const [modalForm] = Form.useForm();
   const [mode, setMode] = useState<RouteModule.ModalType>('CREATE');
@@ -19,7 +19,7 @@ const HttpHeaderRewriteView: React.FC<Props> = ({ data, disabled, onChange }) =>
     modalForm.setFieldsValue(record);
   };
   const handleRemove = (key: string) => {
-    onChange({ upstream_header: upstream_header.filter((item) => item.key !== key) });
+    onChange({ upstreamHeaderList: upstreamHeaderList.filter((item) => item.key !== key) });
   };
 
   const columns = [
@@ -69,13 +69,18 @@ const HttpHeaderRewriteView: React.FC<Props> = ({ data, disabled, onChange }) =>
       modalForm.validateFields().then((value) => {
         if (mode === 'EDIT') {
           const key = modalForm.getFieldValue('key');
-          const newUpstreamHeader = upstream_header.concat();
-          const findIndex = newUpstreamHeader.findIndex((item) => item.key === key);
-          newUpstreamHeader[findIndex] = { ...(value as RouteModule.UpstreamHeader), key };
-          onChange({ upstream_header: newUpstreamHeader, key });
+          onChange({
+            upstreamHeaderList: upstreamHeaderList.map((item) => {
+              if (item.key === key) {
+                return { ...(value as RouteModule.UpstreamHeader), key };
+              }
+              return item;
+            }),
+            key,
+          });
         } else {
           onChange({
-            upstream_header: upstream_header.concat({
+            upstreamHeaderList: upstreamHeaderList.concat({
               ...(value as RouteModule.UpstreamHeader),
               key: Math.random().toString(36).slice(2),
             }),
@@ -137,7 +142,7 @@ const HttpHeaderRewriteView: React.FC<Props> = ({ data, disabled, onChange }) =>
           增加
         </Button>
       )}
-      <Table key="table" bordered dataSource={upstream_header} columns={columns} />
+      <Table key="table" bordered dataSource={upstreamHeaderList} columns={columns} />
       {renderModal()}
     </PanelSection>
   );
diff --git a/src/pages/Routes/components/Step2/RequestRewriteView.tsx b/src/pages/Routes/components/Step2/RequestRewriteView.tsx
index a403769..781b2c8 100644
--- a/src/pages/Routes/components/Step2/RequestRewriteView.tsx
+++ b/src/pages/Routes/components/Step2/RequestRewriteView.tsx
@@ -2,9 +2,9 @@ import React from 'react';
 import Form, { FormInstance } from 'antd/es/form';
 import Radio, { RadioChangeEvent } from 'antd/lib/radio';
 import { Input, Row, Col, InputNumber, Button } from 'antd';
+import { PlusOutlined, MinusCircleOutlined } from '@ant-design/icons';
 
 import { FORM_ITEM_LAYOUT, FORM_ITEM_WITHOUT_LABEL } from '@/pages/Routes/constants';
-import { PlusOutlined, MinusCircleOutlined } from '@ant-design/icons';
 import PanelSection from '../PanelSection';
 import styles from '../../Create.less';
 
@@ -15,79 +15,75 @@ interface Props extends RouteModule.Data {
 const RequestRewriteView: React.FC<Props> = ({ data, form, disabled, onChange }) => {
   const { step2Data } = data;
   const onProtocolChange = (e: RadioChangeEvent) => {
-    onChange({ backendProtocol: e.target.value });
+    onChange({ upstreamProtocol: e.target.value });
   };
 
-  const renderBackendAddress = () => (
-    <Form.List name="backendAddressList">
-      {(fields, { add, remove }) => {
-        return (
-          <div>
-            {fields.map((field, index) => {
-              return (
-                <Form.Item
-                  required
-                  key={field.key}
-                  {...(index === 0 ? FORM_ITEM_LAYOUT : FORM_ITEM_WITHOUT_LABEL)}
-                  label={index === 0 ? '域名/IP' : ''}
-                >
-                  <Row style={{ marginBottom: '10px' }} gutter={16}>
-                    <Col span={9}>
-                      <Form.Item
-                        style={{ marginBottom: 0 }}
-                        name={[field.name, 'host']}
-                        rules={[{ required: true, message: '请输入域名/IP' }]}
-                      >
-                        <Input placeholder="域名/IP" disabled={disabled} />
-                      </Form.Item>
-                    </Col>
-                    <Col span={4}>
-                      <Form.Item
-                        style={{ marginBottom: 0 }}
-                        name={[field.name, 'port']}
-                        rules={[{ required: true, message: '请输入端口' }]}
-                      >
-                        <InputNumber placeholder="端口号" disabled={disabled} min={1} max={65535} />
-                      </Form.Item>
-                    </Col>
-                    <Col span={4} offset={1}>
-                      <Form.Item
-                        style={{ marginBottom: 0 }}
-                        name={[field.name, 'weight']}
-                        rules={[{ required: true, message: '请输入权重' }]}
-                      >
-                        <InputNumber placeholder="权重" disabled={disabled} min={0} max={100} />
-                      </Form.Item>
-                    </Col>
-                    <Col>
-                      {fields.length > 1 ? (
-                        <MinusCircleOutlined
-                          style={{ margin: '0 8px' }}
-                          onClick={() => {
-                            remove(field.name);
-                          }}
-                        />
-                      ) : null}
-                    </Col>
-                  </Row>
-                </Form.Item>
-              );
-            })}
-            <Form.Item {...FORM_ITEM_WITHOUT_LABEL}>
-              {!disabled && (
-                <Button
-                  type="dashed"
-                  onClick={() => {
-                    add();
-                  }}
-                >
-                  <PlusOutlined /> 增加
-                </Button>
-              )}
+  const renderUpstreamMeta = () => (
+    <Form.List name="upstreamHostList">
+      {(fields, { add, remove }) => (
+        <>
+          {fields.map((field, index) => (
+            <Form.Item
+              required
+              key={field.key}
+              {...(index === 0 ? FORM_ITEM_LAYOUT : FORM_ITEM_WITHOUT_LABEL)}
+              label={index === 0 ? '域名/IP' : ''}
+            >
+              <Row style={{ marginBottom: '10px' }} gutter={16}>
+                <Col span={9}>
+                  <Form.Item
+                    style={{ marginBottom: 0 }}
+                    name={[field.name, 'host']}
+                    rules={[{ required: true, message: '请输入域名/IP' }]}
+                  >
+                    <Input placeholder="域名/IP" disabled={disabled} />
+                  </Form.Item>
+                </Col>
+                <Col span={4}>
+                  <Form.Item
+                    style={{ marginBottom: 0 }}
+                    name={[field.name, 'port']}
+                    rules={[{ required: true, message: '请输入端口' }]}
+                  >
+                    <InputNumber placeholder="端口号" disabled={disabled} min={1} max={65535} />
+                  </Form.Item>
+                </Col>
+                <Col span={4} offset={1}>
+                  <Form.Item
+                    style={{ marginBottom: 0 }}
+                    name={[field.name, 'weight']}
+                    rules={[{ required: true, message: '请输入权重' }]}
+                  >
+                    <InputNumber placeholder="权重" disabled={disabled} min={0} max={100} />
+                  </Form.Item>
+                </Col>
+                <Col>
+                  {fields.length > 1 ? (
+                    <MinusCircleOutlined
+                      style={{ margin: '0 8px' }}
+                      onClick={() => {
+                        remove(field.name);
+                      }}
+                    />
+                  ) : null}
+                </Col>
+              </Row>
             </Form.Item>
-          </div>
-        );
-      }}
+          ))}
+          <Form.Item {...FORM_ITEM_WITHOUT_LABEL}>
+            {!disabled && (
+              <Button
+                type="dashed"
+                onClick={() => {
+                  add();
+                }}
+              >
+                <PlusOutlined /> 增加
+              </Button>
+            )}
+          </Form.Item>
+        </>
+      )}
     </Form.List>
   );
 
@@ -102,19 +98,19 @@ const RequestRewriteView: React.FC<Props> = ({ data, form, disabled, onChange })
       >
         <Form.Item
           label="协议"
-          name="backendProtocol"
+          name="upstreamProtocol"
           rules={[{ required: true, message: '请勾选协议' }]}
         >
-          <Radio.Group onChange={onProtocolChange} name="backendProtocol" disabled={disabled}>
+          <Radio.Group onChange={onProtocolChange} name="upstreamProtocol" disabled={disabled}>
             <Radio value="originalRequest">原始请求</Radio>
             <Radio value="HTTP">HTTP</Radio>
             <Radio value="HTTPS">HTTPS</Radio>
           </Radio.Group>
         </Form.Item>
-        {renderBackendAddress()}
+        {renderUpstreamMeta()}
         <Form.Item
           label="请求路径"
-          name="backendAddressPath"
+          name="upstreamPath"
           rules={[{ required: true, message: '请输入请求路径' }]}
         >
           <Input disabled={disabled} />
@@ -122,21 +118,21 @@ const RequestRewriteView: React.FC<Props> = ({ data, form, disabled, onChange })
         <Form.Item
           label="连接超时"
           name={['timeout', 'connect']}
-          rules={[{ required: true, message: '请输入连接超时' }]}
+          rules={[{ required: true, message: '连接超时时间' }]}
         >
           <InputNumber disabled={disabled} defaultValue={30000} /> ms
         </Form.Item>
         <Form.Item
           label="发送超时"
           name={['timeout', 'send']}
-          rules={[{ required: true, message: '请输入发送超时' }]}
+          rules={[{ required: true, message: '发送超时时间' }]}
         >
           <InputNumber disabled={disabled} defaultValue={30000} /> ms
         </Form.Item>
         <Form.Item
           label="接收超时"
           name={['timeout', 'read']}
-          rules={[{ required: true, message: '请输入接收超时' }]}
+          rules={[{ required: true, message: '接收超时时间' }]}
         >
           <InputNumber disabled={disabled} defaultValue={30000} /> ms
         </Form.Item>
diff --git a/src/pages/Routes/components/Step2/index.tsx b/src/pages/Routes/components/Step2/index.tsx
index ff4d918..dcf5df0 100644
--- a/src/pages/Routes/components/Step2/index.tsx
+++ b/src/pages/Routes/components/Step2/index.tsx
@@ -1,12 +1,17 @@
 import React from 'react';
+import { FormInstance } from 'antd/es/form';
 
 import RequestRewriteView from './RequestRewriteView';
 import HttpHeaderRewriteView from './HttpHeaderRewriteView';
 
-const Step2: React.FC<RouteModule.Data> = (props) => {
+interface Props extends RouteModule.Data {
+  form: FormInstance;
+}
+
+const Step2: React.FC<Props> = (props) => {
   return (
     <>
-      <RequestRewriteView form={props.form} {...props} />
+      <RequestRewriteView {...props} />
       <HttpHeaderRewriteView {...props} />
     </>
   );
diff --git a/src/pages/Routes/constants.ts b/src/pages/Routes/constants.ts
index c2473a8..88387e1 100644
--- a/src/pages/Routes/constants.ts
+++ b/src/pages/Routes/constants.ts
@@ -26,10 +26,10 @@ export const DEFAULT_STEP_1_DATA: RouteModule.Step1Data = {
 };
 
 export const DEFAULT_STEP_2_DATA: RouteModule.Step2Data = {
-  backendProtocol: 'originalRequest',
-  backendAddressList: [{ host: '', port: 0, weight: 0 }],
-  upstream_header: [],
-  backendAddressPath: '',
+  upstreamProtocol: 'originalRequest',
+  upstreamHostList: [{ host: '', port: 0, weight: 0 }],
+  upstreamHeaderList: [],
+  upstreamPath: '',
   timeout: {
     connect: 30000,
     send: 30000,
diff --git a/src/pages/Routes/typing.d.ts b/src/pages/Routes/typing.d.ts
index f766abf..91ab564 100644
--- a/src/pages/Routes/typing.d.ts
+++ b/src/pages/Routes/typing.d.ts
@@ -36,7 +36,7 @@ declare namespace RouteModule {
     form?: any;
   }
 
-  type backendAddressItemProps = {
+  type UpstreamHost = {
     host: '';
     port: number;
     weight: number;
@@ -50,10 +50,10 @@ declare namespace RouteModule {
   }
 
   type Step2Data = {
-    backendProtocol: 'HTTP' | 'HTTPS' | 'originalRequest';
-    backendAddressList: backendAddressItemProps[];
-    backendAddressPath: string;
-    upstream_header: UpstreamHeader[];
+    upstreamProtocol: 'HTTP' | 'HTTPS' | 'originalRequest';
+    upstreamHostList: UpstreamHost[];
+    upstreamPath: string;
+    upstreamHeaderList: UpstreamHeader[];
     timeout: {
       connect: number;
       send: number;