From 36b4f29bb53a3b7c20aed4524d26446d7469e4d8 Mon Sep 17 00:00:00 2001
From: guoqqqi <979918879@qq.com>
Date: Sat, 19 Dec 2020 20:16:40 +0800
Subject: [PATCH 1/3] feat: active check support custom port

---
 web/src/components/Upstream/UpstreamForm.tsx | 17 +++++++++++++++++
 web/src/pages/Upstream/locales/en-US.ts      |  2 ++
 web/src/pages/Upstream/locales/zh-CN.ts      |  2 ++
 3 files changed, 21 insertions(+)

diff --git a/web/src/components/Upstream/UpstreamForm.tsx b/web/src/components/Upstream/UpstreamForm.tsx
index 09241a591d..f622e7454a 100644
--- a/web/src/components/Upstream/UpstreamForm.tsx
+++ b/web/src/components/Upstream/UpstreamForm.tsx
@@ -246,6 +246,23 @@ const UpstreamForm: React.FC<Props> = forwardRef(
           </Form.Item>
         </Form.Item>
 
+        <Form.Item label={formatMessage({ id: 'upstream.step.healthy.checks.active.port' })}>
+          <Form.Item
+            name={['checks', 'active', 'port']}
+            noStyle
+            rules={[
+              {
+                message: formatMessage({ id: 'upstream.step.input.healthy.checks.active.port' }),
+              },
+            ]}
+          >
+            <InputNumber
+              placeholder={formatMessage({ id: 'upstream.step.input.healthy.checks.active.port' })}
+              disabled={readonly}
+            />
+          </Form.Item>
+        </Form.Item>
+
         <Form.Item
           label={formatMessage({ id: 'upstream.step.healthy.checks.active.http_path' })}
           required
diff --git a/web/src/pages/Upstream/locales/en-US.ts b/web/src/pages/Upstream/locales/en-US.ts
index 697ee11bfb..b19684e24c 100644
--- a/web/src/pages/Upstream/locales/en-US.ts
+++ b/web/src/pages/Upstream/locales/en-US.ts
@@ -46,6 +46,8 @@ export default {
   'upstream.step.input.healthy.checks.active.timeout': 'Please input timeout',
   'upstream.step.healthy.checks.active.http_path': 'HttpPath',
   'upstream.step.input.healthy.checks.active.http_path': 'HttpPath',
+  'upstream.step.healthy.checks.active.port': "Port",
+  'upstream.step.input.healthy.checks.active.port': 'Port',
   'upstream.step.healthy.checks.active.host': 'Host',
   'upstream.step.input.healthy.checks.active.host': 'Please input Host',
   'upstream.step.healthy.checks.active.interval': 'Interval',
diff --git a/web/src/pages/Upstream/locales/zh-CN.ts b/web/src/pages/Upstream/locales/zh-CN.ts
index 36525b7bb7..878036e91f 100644
--- a/web/src/pages/Upstream/locales/zh-CN.ts
+++ b/web/src/pages/Upstream/locales/zh-CN.ts
@@ -46,6 +46,8 @@ export default {
   'upstream.step.input.healthy.checks.active.timeout': '请输入超时时间',
   'upstream.step.healthy.checks.active.http_path': '路径',
   'upstream.step.input.healthy.checks.active.http_path': '请输入路径',
+  'upstream.step.healthy.checks.active.port': "端口",
+  'upstream.step.input.healthy.checks.active.port': '请输入端口',
   'upstream.step.healthy.checks.active.host': '域名',
   'upstream.step.input.healthy.checks.active.host': '请输入域名',
   'upstream.step.healthy.checks.active.interval': '间隔',

From ece94faaca5e7371cc4fae5f1bd4d9b3cbb8573e Mon Sep 17 00:00:00 2001
From: guoqqqi <979918879@qq.com>
Date: Sat, 19 Dec 2020 20:38:50 +0800
Subject: [PATCH 2/3] fix: omit null value

---
 web/src/components/Upstream/UpstreamForm.tsx | 5 -----
 web/src/pages/Upstream/transform.ts          | 8 +++++++-
 web/src/pages/Upstream/typing.d.ts           | 1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/web/src/components/Upstream/UpstreamForm.tsx b/web/src/components/Upstream/UpstreamForm.tsx
index f622e7454a..1e4c196e09 100644
--- a/web/src/components/Upstream/UpstreamForm.tsx
+++ b/web/src/components/Upstream/UpstreamForm.tsx
@@ -250,11 +250,6 @@ const UpstreamForm: React.FC<Props> = forwardRef(
           <Form.Item
             name={['checks', 'active', 'port']}
             noStyle
-            rules={[
-              {
-                message: formatMessage({ id: 'upstream.step.input.healthy.checks.active.port' }),
-              },
-            ]}
           >
             <InputNumber
               placeholder={formatMessage({ id: 'upstream.step.input.healthy.checks.active.port' })}
diff --git a/web/src/pages/Upstream/transform.ts b/web/src/pages/Upstream/transform.ts
index 172a96f215..efe0f17223 100644
--- a/web/src/pages/Upstream/transform.ts
+++ b/web/src/pages/Upstream/transform.ts
@@ -30,7 +30,13 @@ export const transformRequest = (
     upstream_host,
     upstream_id,
   } = data;
-  data.checks = pickBy(data.checks, identity);
+  data.checks = pickBy(data.checks || {}, identity);
+  if (data.checks.active) {
+    data.checks.active = pickBy(
+      data.checks.active,
+      identity,
+    ) as UpstreamModule.HealthCheck['active'];
+  }
 
   if (upstream_id) {
     return { upstream_id };
diff --git a/web/src/pages/Upstream/typing.d.ts b/web/src/pages/Upstream/typing.d.ts
index 120f1aaf9c..3529ed8947 100644
--- a/web/src/pages/Upstream/typing.d.ts
+++ b/web/src/pages/Upstream/typing.d.ts
@@ -34,6 +34,7 @@ declare namespace UpstreamModule {
         http_failures: number;
       };
       req_headers?: string[];
+      port?: number;
     };
     passive?: {
       healthy: {

From ee34eebbc385b3fd5f461cb3229ce14bc36fa14d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=90=9A=E8=87=B4=E8=BF=9C?= <juzhiyuan@apache.org>
Date: Sun, 20 Dec 2020 10:19:27 +0800
Subject: [PATCH 3/3] Update web/src/pages/Upstream/locales/en-US.ts

Co-authored-by: litesun <sunyi@apache.org>
---
 web/src/pages/Upstream/locales/en-US.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/pages/Upstream/locales/en-US.ts b/web/src/pages/Upstream/locales/en-US.ts
index b19684e24c..d8e54b31be 100644
--- a/web/src/pages/Upstream/locales/en-US.ts
+++ b/web/src/pages/Upstream/locales/en-US.ts
@@ -47,7 +47,7 @@ export default {
   'upstream.step.healthy.checks.active.http_path': 'HttpPath',
   'upstream.step.input.healthy.checks.active.http_path': 'HttpPath',
   'upstream.step.healthy.checks.active.port': "Port",
-  'upstream.step.input.healthy.checks.active.port': 'Port',
+  'upstream.step.input.healthy.checks.active.port': 'Please input port',
   'upstream.step.healthy.checks.active.host': 'Host',
   'upstream.step.input.healthy.checks.active.host': 'Please input Host',
   'upstream.step.healthy.checks.active.interval': 'Interval',