Steven Fukase 5 лет назад
Родитель
Сommit
c13b310201

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

@@ -68,16 +68,14 @@ const CustomBotWithoutProxySettingsAccordion = ({
     setConnectionErrorMessage(null);
     setConnectionErrorMessage(null);
     setConnectionSuccessMessage(null);
     setConnectionSuccessMessage(null);
     try {
     try {
-      const res = await appContainer.apiv3.post('/slack-integration-settings/notification-test-to-slack-work-space', {
-        channel: testChannel,
-      });
-      setConnectionSuccessMessage(res.data.message);
-      onSetIsSendTestMessage(true);
+      // TODO: 5921 Add new Test endpoint
+      // eslint-disable-next-line no-console
+      console.log('Test');
     }
     }
     catch (err) {
     catch (err) {
       onSetIsSendTestMessage(false);
       onSetIsSendTestMessage(false);
-      setConnectionErrorCode(err[0].code);
-      setConnectionErrorMessage(err[0].message);
+      setConnectionErrorCode('dummy-error-code');
+      setConnectionErrorMessage('This is a sample error message');
     }
     }
   };
   };
 
 

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

@@ -26,9 +26,27 @@ const SlackIntegration = (props) => {
   const [isSendTestMessage, setIsSendTestMessage] = useState(false);
   const [isSendTestMessage, setIsSendTestMessage] = useState(false);
   const [slackWSNameInWithoutProxy, setSlackWSNameInWithoutProxy] = useState(null);
   const [slackWSNameInWithoutProxy, setSlackWSNameInWithoutProxy] = useState(null);
 
 
+  const fetchSlackWorkSpaceNameInWithoutProxy = useCallback(async() => {
+
+    try {
+      const res = await appContainer.apiv3.get('/slack-integration-settings/custom-bot-without-proxy/slack-workspace-name');
+      setSlackWSNameInWithoutProxy(res.data.slackWorkSpaceName);
+    }
+    catch (err) {
+      if (err[0].message === 'missing_scope') {
+        setSlackWSNameInWithoutProxy(null);
+        toastError(err, t('admin:slack_integration.set_scope'));
+      }
+      else {
+        toastError(err);
+      }
+    }
+  }, [appContainer.apiv3, t]);
+
   const fetchSlackIntegrationData = useCallback(async() => {
   const fetchSlackIntegrationData = useCallback(async() => {
     try {
     try {
       const response = await appContainer.apiv3.get('/slack-integration-settings');
       const response = await appContainer.apiv3.get('/slack-integration-settings');
+      console.log(response);
       const { currentBotType, customBotWithoutProxySettings } = response.data.slackBotSettingParams;
       const { currentBotType, customBotWithoutProxySettings } = response.data.slackBotSettingParams;
       const {
       const {
         slackSigningSecret, slackBotToken, slackSigningSecretEnvVars, slackBotTokenEnvVars,
         slackSigningSecret, slackBotToken, slackSigningSecretEnvVars, slackBotTokenEnvVars,
@@ -39,11 +57,12 @@ const SlackIntegration = (props) => {
       setSlackBotToken(slackBotToken);
       setSlackBotToken(slackBotToken);
       setSlackSigningSecretEnv(slackSigningSecretEnvVars);
       setSlackSigningSecretEnv(slackSigningSecretEnvVars);
       setSlackBotTokenEnv(slackBotTokenEnvVars);
       setSlackBotTokenEnv(slackBotTokenEnvVars);
+      fetchSlackWorkSpaceNameInWithoutProxy();
     }
     }
     catch (err) {
     catch (err) {
       toastError(err);
       toastError(err);
     }
     }
-  }, [appContainer.apiv3]);
+  }, [appContainer.apiv3, fetchSlackWorkSpaceNameInWithoutProxy]);
 
 
 
 
   useEffect(() => {
   useEffect(() => {