zahmis 5 лет назад
Родитель
Сommit
17524f52cf
1 измененных файлов с 22 добавлено и 20 удалено
  1. 22 20
      src/client/js/components/Admin/SlackIntegration/CustomBotWithoutProxySettings.jsx

+ 22 - 20
src/client/js/components/Admin/SlackIntegration/CustomBotWithoutProxySettings.jsx

@@ -29,23 +29,8 @@ const CustomBotWithoutProxySettings = (props) => {
   const [isConnectedToSlack, setIsConnectedToSlack] = useState(null);
   const [isConnectedToSlack, setIsConnectedToSlack] = useState(null);
   const currentBotType = 'custom-bot-without-proxy';
   const currentBotType = 'custom-bot-without-proxy';
 
 
-  useEffect(() => {
-    const fetchData = async() => {
-      try {
-        const res = await appContainer.apiv3.get('/slack-integration/custom-bot-without-proxy/slack-workspace-name');
-        setSlackWSNameInWithoutProxy(res.data.slackWorkSpaceName);
-      }
-      catch (err) {
-        toastError(err);
-      }
-    };
-    setSlackWSNameInWithoutProxy(null);
-    if (isConnectedToSlack) {
-      fetchData();
-    }
-  }, [appContainer, isConnectedToSlack]);
 
 
-  const checkCredentials = useCallback(() => {
+  const checkCredentials = () => {
     if (slackBotToken && slackSigningSecret) {
     if (slackBotToken && slackSigningSecret) {
       return setIsRgisterSlackCredentials(true);
       return setIsRgisterSlackCredentials(true);
     }
     }
@@ -53,7 +38,7 @@ const CustomBotWithoutProxySettings = (props) => {
       return setIsRgisterSlackCredentials(true);
       return setIsRgisterSlackCredentials(true);
     }
     }
     return setIsRgisterSlackCredentials(false);
     return setIsRgisterSlackCredentials(false);
-  }, [slackBotToken, slackBotTokenEnv, slackSigningSecret, slackSigningSecretEnv]);
+  };
 
 
   const fetchData = useCallback(async() => {
   const fetchData = useCallback(async() => {
     try {
     try {
@@ -69,16 +54,33 @@ const CustomBotWithoutProxySettings = (props) => {
       setSiteName(adminAppContainer.state.title);
       setSiteName(adminAppContainer.state.title);
       setIsSetupSlackBot(isSetupSlackBot);
       setIsSetupSlackBot(isSetupSlackBot);
       setIsConnectedToSlack(isConnectedToSlack);
       setIsConnectedToSlack(isConnectedToSlack);
-      checkCredentials();
+      checkCredentials;
     }
     }
     catch (err) {
     catch (err) {
       toastError(err);
       toastError(err);
     }
     }
-  }, [appContainer, adminAppContainer, checkCredentials]);
+  }, [appContainer, adminAppContainer]);
 
 
   useEffect(() => {
   useEffect(() => {
+    const getSlackWorkSpaceName = async() => {
+      try {
+        const res = await appContainer.apiv3.get('/slack-integration/custom-bot-without-proxy/slack-workspace-name');
+        setSlackWSNameInWithoutProxy(res.data.slackWorkSpaceName);
+      }
+      catch (err) {
+        toastError(err);
+      }
+    };
+    setSlackWSNameInWithoutProxy(null);
+    if (isConnectedToSlack) {
+      getSlackWorkSpaceName();
+    }
     fetchData();
     fetchData();
-  }, [fetchData]);
+  }, [appContainer, isConnectedToSlack, fetchData]);
+
+  // useEffect(() => {
+  //   fetchData();
+  // }, [fetchData]);
 
 
   async function updateHandler() {
   async function updateHandler() {
     try {
     try {