فهرست منبع

add condition in slackIntegration

zahmis 5 سال پیش
والد
کامیت
38f50e341c

+ 3 - 10
src/client/js/components/Admin/SlackIntegration/CustomBotWithoutProxySettingsAccordion.jsx

@@ -18,8 +18,8 @@ export const botInstallationStep = {
 const CustomBotWithoutProxySettingsAccordion = ({
 const CustomBotWithoutProxySettingsAccordion = ({
   appContainer, activeStep, fetchData,
   appContainer, activeStep, fetchData,
   slackSigningSecret, slackSigningSecretEnv, slackBotToken, slackBotTokenEnv,
   slackSigningSecret, slackSigningSecretEnv, slackBotToken, slackBotTokenEnv,
-  isRegisterSlackCredentials, isSendTestMessage, isConnectedToSlack,
-  onSetSlackSigningSecret, onSetSlackBotToken, onSetIsSendTestMessage, onSetIsRegisterSlackCredentials,
+  isRegisterSlackCredentials, isSendTestMessage,
+  onSetSlackSigningSecret, onSetSlackBotToken, onSetIsSendTestMessage,
 }) => {
 }) => {
   const { t } = useTranslation();
   const { t } = useTranslation();
   // TODO: GW-5644 Store default open accordion
   // TODO: GW-5644 Store default open accordion
@@ -42,17 +42,10 @@ const CustomBotWithoutProxySettingsAccordion = ({
 
 
       fetchData();
       fetchData();
 
 
-      if (isConnectedToSlack) {
-        onSetIsRegisterSlackCredentials(true);
-      }
-      else {
-        onSetIsRegisterSlackCredentials(false);
-        onSetIsSendTestMessage(false);
-      }
       toastSuccess(t('toaster.update_successed', { target: t('admin:slack_integration.custom_bot_without_proxy_settings') }));
       toastSuccess(t('toaster.update_successed', { target: t('admin:slack_integration.custom_bot_without_proxy_settings') }));
     }
     }
     catch (err) {
     catch (err) {
-      onSetIsRegisterSlackCredentials(false);
+      // onSetIsRegisterSlackCredentials(false);
       toastError(err);
       toastError(err);
     }
     }
   };
   };

+ 5 - 1
src/client/js/components/Admin/SlackIntegration/SlackIntegration.jsx

@@ -48,6 +48,10 @@ const SlackIntegration = (props) => {
       if (isConnectedToSlack) {
       if (isConnectedToSlack) {
         setIsRegisterSlackCredentials(true);
         setIsRegisterSlackCredentials(true);
       }
       }
+      else {
+        setIsRegisterSlackCredentials(false);
+        setIsSendTestMessage(false);
+      }
     }
     }
     catch (err) {
     catch (err) {
       toastError(err);
       toastError(err);
@@ -114,7 +118,7 @@ const SlackIntegration = (props) => {
           onSetSlackSigningSecret={setSlackSigningSecret}
           onSetSlackSigningSecret={setSlackSigningSecret}
           onSetSlackBotToken={setSlackBotToken}
           onSetSlackBotToken={setSlackBotToken}
           onSetIsSendTestMessage={setIsSendTestMessage}
           onSetIsSendTestMessage={setIsSendTestMessage}
-          onSetIsRegisterSlackCredentials={setIsRegisterSlackCredentials}
+          // onSetIsRegisterSlackCredentials={setIsRegisterSlackCredentials}
           fetchData={fetchData}
           fetchData={fetchData}
         />
         />
       );
       );