Просмотр исходного кода

add fetchSlackwsname in Integration

zahmis 5 лет назад
Родитель
Сommit
b836b52f56

+ 4 - 2
src/client/js/components/Admin/SlackIntegration/CustomBotWithoutProxySettingsAccordion.jsx

@@ -18,8 +18,8 @@ export const botInstallationStep = {
 const CustomBotWithoutProxySettingsAccordion = ({
   appContainer,
   activeStep, slackSigningSecret, slackSigningSecretEnv, slackBotToken,
-  slackBotTokenEnv, isRegisterSlackCredentials, isSendTestMessage, isConnectedToSlack,
-  setSlackSigningSecret, setSlackBotToken, setIsSendTestMessage, setIsRegisterSlackCredentials, setSlackWSNameInWithoutProxy,
+  slackBotTokenEnv, isRegisterSlackCredentials, isSendTestMessage, isConnectedToSlack, isSetupSlackBot,
+  setSlackSigningSecret, setSlackBotToken, setIsSendTestMessage, setIsRegisterSlackCredentials, setSlackWSNameInWithoutProxy, fetchSlackWorkSpaceName,
 }) => {
   const { t } = useTranslation();
   // TODO: GW-5644 Store default open accordion
@@ -152,6 +152,7 @@ const CustomBotWithoutProxySettingsAccordion = ({
           slackSigningSecretEnv={slackSigningSecretEnv}
           slackBotToken={slackBotToken}
           slackBotTokenEnv={slackBotTokenEnv}
+          fetchSlackWorkSpaceName={fetchSlackWorkSpaceName}
         />
       </Accordion>
       <Accordion
@@ -221,6 +222,7 @@ CustomBotWithoutProxySettingsAccordion.propTypes = {
   setSlackWSNameInWithoutProxy: PropTypes.func,
   adminAppContainer: PropTypes.instanceOf(AdminAppContainer).isRequired,
   activeStep: PropTypes.oneOf(Object.values(botInstallationStep)).isRequired,
+  isSetupSlackBot: PropTypes.bool,
 };
 
 export default CustomBotWithoutProxySettingsAccordionWrapper;

+ 2 - 4
src/client/js/components/Admin/SlackIntegration/SlackIntegration.jsx

@@ -68,10 +68,7 @@ const SlackIntegration = (props) => {
 
   useEffect(() => {
     fetchData();
-    if (isSetupSlackBot) {
-      fetchSlackWorkSpaceName();
-    }
-  }, [fetchData, fetchSlackWorkSpaceName, isSetupSlackBot]);
+  }, [fetchData]);
 
   const handleBotTypeSelect = (clickedBotType) => {
     if (clickedBotType === currentBotType) {
@@ -131,6 +128,7 @@ const SlackIntegration = (props) => {
           setSlackWSNameInWithoutProxy={setSlackWSNameInWithoutProxy}
           isSetupSlackBot={isSetupSlackBot}
           slackWSNameInWithoutProxy={slackWSNameInWithoutProxy}
+          fetchSlackWorkSpaceName={fetchSlackWorkSpaceName}
         />
       );
       break;