[apisix-dashboard] branch master updated: fix: fix the upstream timeout unit (#1580)

[sunyi]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 40d1dab  fix: fix the upstream timeout unit (#1580)
40d1dab is described below

commit 40d1dabf4380ee0ff6c48d2eb3943e6d50daf05b
Author: Cliff Su <stu01...@yahoo.com.tw>
AuthorDate: Mon Mar 15 23:50:42 2021 +0800

    fix: fix the upstream timeout unit (#1580)
---
 web/cypress/fixtures/export-route-dataset.json | 18 +++++++++---------
 web/src/components/Upstream/UpstreamForm.tsx   |  2 +-
 web/src/components/Upstream/constant.ts        |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/web/cypress/fixtures/export-route-dataset.json 
b/web/cypress/fixtures/export-route-dataset.json
index 6762933..e85aa2d 100644
--- a/web/cypress/fixtures/export-route-dataset.json
+++ b/web/cypress/fixtures/export-route-dataset.json
@@ -40,9 +40,9 @@
               }
             ],
             "timeout": {
-              "connect": 6000,
-              "read": 6000,
-              "send": 6000
+              "connect": 6,
+              "read": 6,
+              "send": 6
             },
             "type": "roundrobin",
             "pass_host": "pass"
@@ -92,9 +92,9 @@
               }
             ],
             "timeout": {
-              "connect": 6000,
-              "read": 6000,
-              "send": 6000
+              "connect": 6,
+              "read": 6,
+              "send": 6
             },
             "type": "roundrobin",
             "pass_host": "pass"
@@ -143,9 +143,9 @@
               }
             ],
             "timeout": {
-              "connect": 6000,
-              "read": 6000,
-              "send": 6000
+              "connect": 6,
+              "read": 6,
+              "send": 6
             },
             "type": "roundrobin",
             "pass_host": "pass"
diff --git a/web/src/components/Upstream/UpstreamForm.tsx 
b/web/src/components/Upstream/UpstreamForm.tsx
index 3052dde..cc3c41e 100644
--- a/web/src/components/Upstream/UpstreamForm.tsx
+++ b/web/src/components/Upstream/UpstreamForm.tsx
@@ -150,7 +150,7 @@ const UpstreamForm: React.FC<Props> = forwardRef(
       </>
     );
 
-    const TimeUnit = () => <span style={{ margin: '0 8px' }}>ms</span>;
+    const TimeUnit = () => <span style={{ margin: '0 8px' }}>s</span>;
     const NodeList = () => (
       <Form.List name="nodes">
         {(fields, { add, remove }) => (
diff --git a/web/src/components/Upstream/constant.ts 
b/web/src/components/Upstream/constant.ts
index 927f77f..9a2bc8a 100644
--- a/web/src/components/Upstream/constant.ts
+++ b/web/src/components/Upstream/constant.ts
@@ -19,8 +19,8 @@ export const DEFAULT_UPSTREAM = {
   nodes: [{ host: '', port: 80, weight: 1 }],
   type: 'roundrobin',
   timeout: {
-    connect: 6000,
-    send: 6000,
-    read: 6000,
+    connect: 6,
+    send: 6,
+    read: 6,
   },
 };