[incubator-apisix-dashboard] branch feat-plugins updated: codes clean

[ju...@apache.org]

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

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


The following commit(s) were added to refs/heads/feat-plugins by this push:
     new 4e9885c  codes clean
4e9885c is described below

commit 4e9885cd358e0f817f9c75d9a84f1028ac88ad2b
Author: juzhiyuan <jj...@gmail.com>
AuthorDate: Thu Jun 11 16:34:34 2020 +0800

    codes clean
---
 src/pages/Routes/Create.tsx | 79 +++++++++++++++++++++++++--------------------
 1 file changed, 44 insertions(+), 35 deletions(-)

diff --git a/src/pages/Routes/Create.tsx b/src/pages/Routes/Create.tsx
index 8d4e5cb..29ff207 100644
--- a/src/pages/Routes/Create.tsx
+++ b/src/pages/Routes/Create.tsx
@@ -21,7 +21,13 @@ import styles from './Create.less';
 
 const { Step } = Steps;
 
-const Create: React.FC = (props) => {
+type Props = {
+  // FIXME
+  route: any;
+  match: any;
+};
+
+const Create: React.FC<Props> = (props) => {
   const [step1Data, setStep1Data] = useState(DEFAULT_STEP_1_DATA);
   const [step2Data, setStep2Data] = useState(DEFAULT_STEP_2_DATA);
   const [step3Data, setStep3Data] = useState(DEFAULT_STEP_3_DATA);
@@ -40,23 +46,7 @@ const Create: React.FC = (props) => {
     step3Data,
   };
 
-  const initRoute = (rid: number) => {
-    fetchRoute(rid).then((data) => {
-      form1.setFieldsValue(data.step1Data);
-      setStep1Data(data.step1Data as RouteModule.Step1Data);
-
-      form2.setFieldsValue(data.step2Data);
-      setStep2Data(data.step2Data);
-
-      setStep3Data(data.step3Data);
-    });
-  };
-
-  useEffect(() => {
-    if ((props as any).route.name === 'edit') {
-      initRoute((props as any).match.params.rid);
-    }
-
+  const setupPlugin = () => {
     const PLUGIN_BLOCK_LIST = Object.entries(PLUGIN_MAPPER_SOURCE)
       .filter(([, value]) => value.hidden)
       .flat()
@@ -80,24 +70,48 @@ const Create: React.FC = (props) => {
         })),
       });
     });
-  }, []);
+  };
+
+  const setupRoute = (rid: number) =>
+    fetchRoute(rid).then((data) => {
+      form1.setFieldsValue(data.step1Data);
+      setStep1Data(data.step1Data as RouteModule.Step1Data);
+
+      form2.setFieldsValue(data.step2Data);
+      setStep2Data(data.step2Data);
+
+      setStep3Data(data.step3Data);
+    });
 
   useEffect(() => {
-    if (step1Data.redirectURI !== '') {
-      if (step1Data.forceHttps) {
-        setStep1Data({ ...step1Data, redirectURI: '' });
-        setRedirect(false);
-        setStepHeader(STEP_HEADER_4);
-        return;
-      }
-      setRedirect(true);
-      setStepHeader(STEP_HEADER_2);
+    console.log(props);
+    if (props.route.name === 'edit') {
+      setupRoute(props.match.params.rid).then(() => setupPlugin());
     } else {
+      setupPlugin();
+    }
+  }, []);
+
+  useEffect(() => {
+    const { redirectURI, forceHttps } = step1Data;
+    if (redirectURI === '') {
       setRedirect(false);
       setStepHeader(STEP_HEADER_4);
+      return;
     }
+
+    if (!forceHttps) {
+      setRedirect(true);
+      setStepHeader(STEP_HEADER_2);
+      return;
+    }
+
+    setStep1Data({ ...step1Data, redirectURI: '' });
+    setRedirect(false);
+    setStepHeader(STEP_HEADER_4);
   }, [step1Data]);
 
+  // FIXME
   const onReset = () => {
     setStep1Data(DEFAULT_STEP_1_DATA);
     setStep2Data(DEFAULT_STEP_2_DATA);
@@ -126,6 +140,7 @@ const Create: React.FC = (props) => {
           <CreateStep4 data={routeData} form1={form1} form2={form2} onChange={() => {}} redirect />
         );
       }
+
       return (
         <Step2
           data={routeData}
@@ -208,13 +223,7 @@ const Create: React.FC = (props) => {
           {renderStep()}
         </Card>
       </PageHeaderWrapper>
-      <ActionBar
-        step={step}
-        redirect={redirect}
-        onChange={(nextStep) => {
-          onStepChange(nextStep);
-        }}
-      />
+      <ActionBar step={step} redirect={redirect} onChange={onStepChange} />
     </>
   );
 };