Merge pull request #3851 from weseek/fix/delete-message-after-test-is-successful

fix

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

@@ -13,19 +13,17 @@ const CustomBotWithoutProxySettings = (props) => {
 
   const [siteName, setSiteName] = useState('');
   const [isIntegrationSuccess, setIsIntegrationSuccess] = useState(false);
-  const [connectionMessage, setConnectionMessage] = useState('');
-  const [connectionErrorCode, setConnectionErrorCode] = useState(null);
+  const [connectionMessage, setConnectionMessage] = useState(null);
   const [testChannel, setTestChannel] = useState('');
 
   const testConnection = async() => {
     try {
       await appContainer.apiv3.post('/slack-integration-settings/without-proxy/test', { channel: testChannel });
-      setConnectionMessage('Send the message to slack work space.');
+      setConnectionMessage('');
       setIsIntegrationSuccess(true);
     }
     catch (err) {
-      setConnectionErrorCode(err[0].code);
-      setConnectionMessage(err[0].message);
+      setConnectionMessage(err[0]);
       setIsIntegrationSuccess(false);
     }
   };
@@ -66,7 +64,6 @@ const CustomBotWithoutProxySettings = (props) => {
           {...props}
           activeStep={botInstallationStep.CREATE_BOT}
           connectionMessage={connectionMessage}
-          connectionErrorCode={connectionErrorCode}
           isIntegrationSuccess={isIntegrationSuccess}
           testChannel={testChannel}
           onTestFormSubmitted={testConnection}

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

@@ -13,7 +13,7 @@ export const botInstallationStep = {
 
 const CustomBotWithoutProxySettingsAccordion = ({
   activeStep,
-  connectionMessage, connectionErrorCode, testChannel, slackSigningSecret, slackSigningSecretEnv, slackBotToken, slackBotTokenEnv,
+  connectionMessage, testChannel, slackSigningSecret, slackSigningSecretEnv, slackBotToken, slackBotTokenEnv,
   isRegisterSlackCredentials, isIntegrationSuccess,
   inputTestChannelHandler, onTestFormSubmitted, onSetSlackSigningSecret, onSetSlackBotToken,
 }) => {
@@ -43,13 +43,12 @@ const CustomBotWithoutProxySettingsAccordion = ({
     onTestFormSubmitted();
   };
 
-
   let value = '';
-  if (connectionMessage === 'Send the message to slack work space.' || connectionMessage === '') {
-    value = connectionMessage;
+  if (connectionMessage === '' || connectionMessage == null) {
+    value = '';
   }
   else {
-    value = [connectionErrorCode, connectionMessage];
+    value = [connectionMessage.code, connectionMessage.message];
   }
 
   return (
@@ -134,11 +133,11 @@ const CustomBotWithoutProxySettingsAccordion = ({
             </button>
           </form>
         </div>
-        {connectionMessage === ''
+        {connectionMessage == null
           ? <p></p>
           : (
             <>
-              {connectionMessage === 'Send the message to slack work space.'
+              {connectionMessage === ''
                 ? <p className="text-info text-center my-4">{t('admin:slack_integration.accordion.send_message_to_slack_work_space')}</p>
                 : <p className="text-danger text-center my-4">{t('admin:slack_integration.accordion.error_check_logs_below')}</p>
               }
@@ -178,7 +177,6 @@ CustomBotWithoutProxySettingsAccordion.propTypes = {
   onSetSlackSigningSecret: PropTypes.func,
   onSetSlackBotToken: PropTypes.func,
   connectionMessage: PropTypes.string,
-  connectionErrorCode: PropTypes.string,
   activeStep: PropTypes.oneOf(Object.values(botInstallationStep)).isRequired,
 };