From 3c37739107794466a30c44163743915d489bb3ae Mon Sep 17 00:00:00 2001
From: Wang Sijie <wangsijie@silverhand.io>
Date: Tue, 31 May 2022 12:59:08 +0800
Subject: [PATCH] fix(console): connector guide (#990)

---
 .../Connectors/components/GuideModal/index.tsx | 18 +++++++++++++-----
 .../console/src/pages/Connectors/index.tsx     |  3 +++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/packages/console/src/pages/Connectors/components/GuideModal/index.tsx b/packages/console/src/pages/Connectors/components/GuideModal/index.tsx
index 589f5a352..abecd1577 100644
--- a/packages/console/src/pages/Connectors/components/GuideModal/index.tsx
+++ b/packages/console/src/pages/Connectors/components/GuideModal/index.tsx
@@ -8,12 +8,10 @@ import { useTranslation } from 'react-i18next';
 import ReactMarkdown from 'react-markdown';
 import Modal from 'react-modal';
 
-import Button from '@/components/Button';
 import CardTitle from '@/components/CardTitle';
 import CodeEditor from '@/components/CodeEditor';
 import DangerousRaw from '@/components/DangerousRaw';
 import IconButton from '@/components/IconButton';
-import Spacer from '@/components/Spacer';
 import useApi from '@/hooks/use-api';
 import useAdminConsoleConfigs from '@/hooks/use-configs';
 import Close from '@/icons/Close';
@@ -44,6 +42,7 @@ const GuideModal = ({ connector, isOpen, onClose }: Props) => {
   const isSocialConnector =
     connectorType !== ConnectorType.SMS && connectorType !== ConnectorType.Email;
   const [activeStepIndex, setActiveStepIndex] = useState<number>(0);
+  const steps = isSocialConnector ? 1 : 2;
   const methods = useForm<GuideForm>({ reValidateMode: 'onBlur' });
   const {
     control,
@@ -63,12 +62,22 @@ const GuideModal = ({ connector, isOpen, onClose }: Props) => {
           json: { config },
         })
         .json<ConnectorDTO>();
+      await api
+        .patch(`/api/connectors/${connectorId}/enabled`, {
+          json: { enabled: true },
+        })
+        .json<ConnectorDTO>();
 
       await updateConfigs({
         ...conditional(!isSocialConnector && { configurePasswordless: true }),
         ...conditional(isSocialConnector && { configureSocialSignIn: true }),
       });
-      setActiveStepIndex(activeStepIndex + 1);
+
+      if (activeStepIndex === steps - 1) {
+        onClose();
+      } else {
+        setActiveStepIndex(activeStepIndex + 1);
+      }
       toast.success(t('connector_details.save_success'));
     } catch (error: unknown) {
       if (error instanceof SyntaxError) {
@@ -90,8 +99,6 @@ const GuideModal = ({ connector, isOpen, onClose }: Props) => {
             title={<DangerousRaw>{connectorName}</DangerousRaw>}
             subtitle="connectors.guide.subtitle"
           />
-          <Spacer />
-          <Button type="plain" size="small" title="general.skip" onClick={onClose} />
         </div>
         <div className={styles.content}>
           <ReactMarkdown
@@ -119,6 +126,7 @@ const GuideModal = ({ connector, isOpen, onClose }: Props) => {
                   index={0}
                   activeIndex={activeStepIndex}
                   buttonHtmlType="submit"
+                  buttonText={steps === 1 ? 'general.done' : undefined}
                 >
                   <Controller
                     name="connectorConfigJson"
diff --git a/packages/console/src/pages/Connectors/index.tsx b/packages/console/src/pages/Connectors/index.tsx
index 269137dd1..406a3fa7a 100644
--- a/packages/console/src/pages/Connectors/index.tsx
+++ b/packages/console/src/pages/Connectors/index.tsx
@@ -116,6 +116,9 @@ const Connectors = () => {
                 <ConnectorRow
                   connectors={smsConnector ? [smsConnector] : []}
                   type={ConnectorType.SMS}
+                  onClickSetup={() => {
+                    setCreateType(ConnectorType.SMS);
+                  }}
                 />
               )}
               {socialConnectorGroups?.map(({ connectors, id }) => (