parent to chilke

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

@@ -17,12 +17,22 @@ const CustomBotWithoutProxySettings = (props) => {
   const [slackBotToken, setSlackBotToken] = useState('');
   const [slackSigningSecretEnv, setSlackSigningSecretEnv] = useState('');
   const [slackBotTokenEnv, setSlackBotTokenEnv] = useState('');
-
+  const [slackWSNameInWithoutProxy, setSlackWSNameInWithoutProxy] = useState(null);
   // get site name from this GROWI
   // eslint-disable-next-line no-unused-vars
   const [siteName, setSiteName] = useState('');
   const botType = 'without-proxy';
 
+  const getSlackWSInWithoutProxy = useCallback(async() => {
+    try {
+      const res = await appContainer.apiv3.get('/slack-integration/custom-bot-without-proxy-slack-workspace');
+      setSlackWSNameInWithoutProxy(res.data.slackWorkSpaceName);
+    }
+    catch (err) {
+      toastError(err);
+    }
+  }, [appContainer]);
+
   const fetchData = useCallback(async() => {
     try {
       await adminAppContainer.retrieveAppSettingsData();
@@ -52,7 +62,7 @@ const CustomBotWithoutProxySettings = (props) => {
         slackBotToken,
         botType,
       });
-      props.onChangeRenderer();
+      getSlackWSInWithoutProxy();
       toastSuccess(t('toaster.update_successed', { target: t('admin:slack_integration.custom_bot_without_proxy_settings') }));
     }
     catch (err) {
@@ -66,7 +76,7 @@ const CustomBotWithoutProxySettings = (props) => {
       {/* temporarily put bellow component */}
       <SlackGrowiBridging
         siteName={siteName}
-        slackWorkSpaceName={props.slackWorkSpaceName}
+        slackWorkSpaceName={slackWSNameInWithoutProxy}
       />
       <div className="row my-5">
         <div className="mx-auto">
@@ -150,8 +160,6 @@ const CustomBotWithoutProxySettingsWrapper = withUnstatedContainers(CustomBotWit
 CustomBotWithoutProxySettings.propTypes = {
   appContainer: PropTypes.instanceOf(AppContainer).isRequired,
   adminAppContainer: PropTypes.instanceOf(AdminAppContainer).isRequired,
-  slackWorkSpaceName: PropTypes.string,
-  onChangeRenderer: PropTypes.func.isRequired,
 };
 
 export default CustomBotWithoutProxySettingsWrapper;

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

@@ -18,17 +18,17 @@ const SlackIntegration = (props) => {
   const { t } = useTranslation();
   const [currentBotType, setCurrentBotType] = useState(null);
   const [selectedBotType, setSelectedBotType] = useState(null);
-  const [slackWSNameInWithoutProxy, setSlackWSNameInWithoutProxy] = useState(null);
-
-  const getSlackWSInWithoutProxy = useCallback(async() => {
-    try {
-      const res = await appContainer.apiv3.get('/slack-integration/custom-bot-without-proxy-slack-workspace');
-      setSlackWSNameInWithoutProxy(res.data.slackWorkSpaceName);
-    }
-    catch (err) {
-      toastError(err);
-    }
-  }, [appContainer]);
+  // const [slackWSNameInWithoutProxy, setSlackWSNameInWithoutProxy] = useState(null);
+
+  // const getSlackWSInWithoutProxy = useCallback(async() => {
+  //   try {
+  //     const res = await appContainer.apiv3.get('/slack-integration/custom-bot-without-proxy-slack-workspace');
+  //     setSlackWSNameInWithoutProxy(res.data.slackWorkSpaceName);
+  //   }
+  //   catch (err) {
+  //     toastError(err);
+  //   }
+  // }, [appContainer]);
 
   const handleBotTypeSelect = (clickedBotType) => {
     if (clickedBotType === currentBotType) {
@@ -39,7 +39,6 @@ const SlackIntegration = (props) => {
       return;
     }
     setSelectedBotType(clickedBotType);
-    getSlackWSInWithoutProxy();
   };
 
   const handleCancelBotChange = () => {
@@ -70,10 +69,7 @@ const SlackIntegration = (props) => {
       break;
     case 'custom-bot-without-proxy':
       settingsComponent = (
-        <CustomBotWithoutProxySettings
-          onChangeRenderer={getSlackWSInWithoutProxy}
-          slackWorkSpaceName={slackWSNameInWithoutProxy}
-        />
+        <CustomBotWithoutProxySettings />
       );
       break;
     case 'custom-bot-with-proxy':
@@ -144,7 +140,6 @@ const SlackIntegrationWrapper = withUnstatedContainers(SlackIntegration, [AppCon
 SlackIntegration.propTypes = {
   appContainer: PropTypes.instanceOf(AppContainer).isRequired,
   adminAppContainer: PropTypes.instanceOf(AdminAppContainer).isRequired,
-  onChangeRenderer: PropTypes.func,
 };
 
 export default SlackIntegrationWrapper;