[incubator-apisix-dashboard] branch next updated: fix: default upstream host

[ju...@apache.org]

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 312e83f  fix: default upstream host
312e83f is described below

commit 312e83f1c49eb3c8b77fd0aa7265caa41f6a71cc
Author: juzhiyuan <jj...@gmail.com>
AuthorDate: Sat Jun 6 11:33:23 2020 +0800

    fix: default upstream host
---
 src/pages/Routes/Create.tsx                             | 10 ----------
 src/pages/Routes/components/CreateStep3/CreateStep3.tsx |  2 ++
 src/pages/Routes/transform.ts                           |  5 ++++-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/pages/Routes/Create.tsx b/src/pages/Routes/Create.tsx
index c1ab25b..02187d3 100644
--- a/src/pages/Routes/Create.tsx
+++ b/src/pages/Routes/Create.tsx
@@ -73,16 +73,6 @@ const Create: React.FC = (props) => {
     }
   }, [step1Data]);
 
-  useEffect(() => {
-    if (step1Data.redirectURI !== '') {
-      setRedirect(true);
-      setStepHeader(STEP_HEADER_2);
-    } else {
-      setRedirect(false);
-      setStepHeader(STEP_HEADER_4);
-    }
-  }, [step1Data]);
-
   const onReset = () => {
     setStep1Data(DEFAULT_STEP_1_DATA);
     setStep2Data(DEFAULT_STEP_2_DATA);
diff --git a/src/pages/Routes/components/CreateStep3/CreateStep3.tsx b/src/pages/Routes/components/CreateStep3/CreateStep3.tsx
index 5f5f266..8d20af4 100644
--- a/src/pages/Routes/components/CreateStep3/CreateStep3.tsx
+++ b/src/pages/Routes/components/CreateStep3/CreateStep3.tsx
@@ -29,6 +29,8 @@ const CreateStep3: React.FC<Props> = ({ data, disabled, onChange }) => {
     'oauth',
     'redirect',
     'wolf-rbac',
+    // BUG:
+    'proxy-rewrite',
   ];
 
   const list = pluginList.filter(({ name }) => !pluginBlackList.includes(name));
diff --git a/src/pages/Routes/transform.ts b/src/pages/Routes/transform.ts
index 3baa679..1d97c1e 100644
--- a/src/pages/Routes/transform.ts
+++ b/src/pages/Routes/transform.ts
@@ -102,11 +102,14 @@ const transformVarsToRules = (
 const transformUpstreamNodes = (
   nodes: { [key: string]: number } = {},
 ): RouteModule.UpstreamHost[] => {
-  const data: RouteModule.UpstreamHost[] = [{} as RouteModule.UpstreamHost];
+  const data: RouteModule.UpstreamHost[] = [];
   Object.entries(nodes).forEach(([k, v]) => {
     const [host, port] = k.split(':');
     data.push({ host, port: Number(port), weight: Number(v) });
   });
+  if (data.length === 0) {
+    data.push({} as RouteModule.UpstreamHost);
+  }
   return data;
 };