clean

src/client/js/components/Admin/SlackIntegration/CustomBotWithoutProxySettings.jsx

@@ -9,15 +9,10 @@ import SlackGrowiBridging from './SlackGrowiBridging';
 import CustomBotWithoutProxySettingsAccordion, { botInstallationStep } from './CustomBotWithoutProxySettingsAccordion';
 
 const CustomBotWithoutProxySettings = (props) => {
-  const {
-    appContainer,
-    /*  adminAppContainer, */ /* slackBotToken, slackBotTokenEnv, slackSigningSecret, slackSigningSecretEnv, */
-    isConnectedToSlack, /* , isRgisterSlackCredentials, */
-  } = props;
+  const { appContainer } = props;
   const { t } = useTranslation();
 
   const [slackWSNameInWithoutProxy, setSlackWSNameInWithoutProxy] = useState(null);
-  // const [isRgisterSlackCredentials, setIsRgisterSlackCredentials] = useState(false);
 
   // get site name from this GROWI
   // eslint-disable-next-line no-unused-vars
@@ -26,26 +21,6 @@ const CustomBotWithoutProxySettings = (props) => {
   // eslint-disable-next-line no-unused-vars
   const [isSetupSlackBot, setIsSetupSlackBot] = useState(null);
 
-  // const [isConnectedToSlack, setIsConnectedToSlack] = useState(null);
-  // const [isSendTestMessage, setIsSendTestMessage] = useState(false);
-
-  // const fetchData = useCallback(async() => {
-  //   try {
-  //     await adminAppContainer.retrieveAppSettingsData();
-  //     const res = await appContainer.apiv3.get('/slack-integration/');
-  //     const { isSetupSlackBot, isConnectedToSlack } = res.data.slackBotSettingParams.customBotWithoutProxySettings;
-  //     setSiteName(adminAppContainer.state.title);
-  //     setIsSetupSlackBot(isSetupSlackBot);
-  //     setIsConnectedToSlack(isConnectedToSlack);
-  //     setIsRgisterSlackCredentials(false);
-  //     if ((slackBotToken && slackSigningSecret) || (slackBotTokenEnv && slackSigningSecretEnv)) {
-  //       setIsRgisterSlackCredentials(true);
-  //     }
-  //   }
-  //   catch (err) {
-  //     toastError(err);
-  //   }
-  // }, [appContainer, adminAppContainer, slackSigningSecretEnv, slackBotTokenEnv]);
 
   useEffect(() => {
     const getSlackWorkSpaceName = async() => {
@@ -58,11 +33,10 @@ const CustomBotWithoutProxySettings = (props) => {
       }
     };
     setSlackWSNameInWithoutProxy(null);
-    if (isConnectedToSlack) {
+    if (props.isConnectedToSlack) {
       getSlackWorkSpaceName();
     }
-    // fetchData();
-  }, [appContainer, isConnectedToSlack/* , fetchData */]);
+  }, [appContainer, props.isConnectedToSlack]);
 
   return (
     <>
@@ -98,11 +72,8 @@ const CustomBotWithoutProxySettings = (props) => {
 
       <div className="my-5 mx-3">
         <CustomBotWithoutProxySettingsAccordion
-          activeStep={botInstallationStep.CREATE_BOT}
-          // isRgisterSlackCredentials={isRgisterSlackCredentials}
-          // isSendTestMessage={isSendTestMessage}
-          // setIsSendTestMessage={setIsSendTestMessage}
           {...props}
+          activeStep={botInstallationStep.CREATE_BOT}
         />
       </div>
 

src/client/js/components/Admin/SlackIntegration/CustomBotWithoutProxySettingsAccordion.jsx

@@ -19,39 +19,14 @@ const CustomBotWithoutProxySettingsAccordion = ({
   appContainer,
   activeStep, slackSigningSecret, slackSigningSecretEnv, slackBotToken,
   slackBotTokenEnv, isRgisterSlackCredentials, isSendTestMessage,
-  setSlackSigningSecret, setSlackBotToken, setIsSendTestMessage,
+  setSlackSigningSecret, setSlackBotToken, setIsSendTestMessage, setIsRgisterSlackCredentials,
 }) => {
   const { t } = useTranslation('admin');
   const [openAccordionIndexes, setOpenAccordionIndexes] = useState(new Set([activeStep]));
   const [connectionErrorCode, setConnectionErrorCode] = useState(null);
   const [connectionErrorMessage, setConnectionErrorMessage] = useState(null);
-  // const [slackSigningSecret, setSlackSigningSecret] = useState('');
-  // const [slackBotToken, setSlackBotToken] = useState('');
-  // const [slackSigningSecretEnv, setSlackSigningSecretEnv] = useState('');
-  // const [slackBotTokenEnv, setSlackBotTokenEnv] = useState('');
   const currentBotType = 'custom-bot-without-proxy';
 
-  // const fetchData = useCallback(async() => {
-  //   try {
-  //     await adminAppContainer.retrieveAppSettingsData();
-  //     const res = await appContainer.apiv3.get('/slack-integration/');
-  //     const {
-  //       slackSigningSecret, slackBotToken, slackSigningSecretEnvVars, slackBotTokenEnvVars,
-  //     } = res.data.slackBotSettingParams.customBotWithoutProxySettings;
-  //     setSlackSigningSecret(slackSigningSecret);
-  //     setSlackBotToken(slackBotToken);
-  //     setSlackSigningSecretEnv(slackSigningSecretEnvVars);
-  //     setSlackBotTokenEnv(slackBotTokenEnvVars);
-  //   }
-  //   catch (err) {
-  //     toastError(err);
-  //   }
-  // }, [appContainer, adminAppContainer]);
-
-  // useEffect(() => {
-  //   fetchData();
-  // }, [fetchData]);
-
 
   const onToggleAccordionHandler = (installationStep) => {
     const accordionIndexes = new Set(openAccordionIndexes);
@@ -71,7 +46,7 @@ const CustomBotWithoutProxySettingsAccordion = ({
         slackBotToken,
         currentBotType,
       });
-      // fetchData();
+      setIsRgisterSlackCredentials(false);
       toastSuccess(t('toaster.update_successed', { target: t('admin:slack_integration.custom_bot_without_proxy_settings') }));
     }
     catch (err) {
@@ -259,6 +234,7 @@ CustomBotWithoutProxySettingsAccordion.propTypes = {
   setSlackSigningSecret: PropTypes.func,
   setSlackBotToken: PropTypes.func,
   setIsSendTestMessage: PropTypes.func,
+  setIsRgisterSlackCredentials: PropTypes.func,
   adminAppContainer: PropTypes.instanceOf(AdminAppContainer).isRequired,
   activeStep: PropTypes.oneOf(Object.values(botInstallationStep)).isRequired,
 };

src/client/js/components/Admin/SlackIntegration/SlackIntegration.jsx

@@ -129,6 +129,7 @@ const SlackIntegration = (props) => {
                 isRgisterSlackCredentials,
                 isSendTestMessage,
                 setIsSendTestMessage,
+                setIsRgisterSlackCredentials,
               }
             }
         />