Merge branch 'feat/growi-bot' into imprv/gw6162-delete-accordon-in-official-bot

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

@@ -8,7 +8,7 @@ import CustomBotWithoutProxySettingsAccordion, { botInstallationStep } from './C
 import CustomBotWithoutProxyConnectionStatus from './CustomBotWithoutProxyConnectionStatus';
 
 const CustomBotWithoutProxySettings = (props) => {
-  const { appContainer, connectionStatuses } = props;
+  const { appContainer, connectionStatuses, onTestConnectionInvoked } = props;
   const { t } = useTranslation();
 
   const [siteName, setSiteName] = useState('');
@@ -21,6 +21,10 @@ const CustomBotWithoutProxySettings = (props) => {
       await appContainer.apiv3.post('/slack-integration-settings/without-proxy/test', { channel: testChannel });
       setConnectionMessage('');
       setIsIntegrationSuccess(true);
+
+      if (onTestConnectionInvoked != null) {
+        onTestConnectionInvoked();
+      }
     }
     catch (err) {
       setConnectionMessage(err[0]);
@@ -87,6 +91,7 @@ CustomBotWithoutProxySettings.propTypes = {
 
   isIntegrationSuccess: PropTypes.bool,
   connectionStatuses: PropTypes.object.isRequired,
+  onTestConnectionInvoked: PropTypes.func,
 };
 
 export default CustomBotWithoutProxySettingsWrapper;

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

@@ -24,11 +24,10 @@ const SlackIntegration = (props) => {
   const [slackSigningSecretEnv, setSlackSigningSecretEnv] = useState('');
   const [slackBotTokenEnv, setSlackBotTokenEnv] = useState('');
   const [isRegisterSlackCredentials, setIsRegisterSlackCredentials] = useState(false);
-  const [slackWSNameInWithoutProxy, setSlackWSNameInWithoutProxy] = useState(null);
   const [isDeleteConfirmModalShown, setIsDeleteConfirmModalShown] = useState(false);
   const [slackAppIntegrations, setSlackAppIntegrations] = useState();
   const [proxyServerUri, setProxyServerUri] = useState();
-  const [connectionStatuses, setConnectionStatuses] = useState(null);
+  const [connectionStatuses, setConnectionStatuses] = useState({});
 
 
   const fetchSlackIntegrationData = useCallback(async() => {
@@ -38,10 +37,6 @@ const SlackIntegration = (props) => {
         slackSigningSecret, slackBotToken, slackSigningSecretEnvVars, slackBotTokenEnvVars, slackAppIntegrations, proxyServerUri,
       } = data.settings;
 
-      if (data.connectionStatuses == null) {
-        data.connectionStatuses = {};
-      }
-
       setConnectionStatuses(data.connectionStatuses);
       setCurrentBotType(data.currentBotType);
       setSlackSigningSecret(slackSigningSecret);
@@ -97,7 +92,7 @@ const SlackIntegration = (props) => {
       setIsRegisterSlackCredentials(false);
       setSlackSigningSecret(null);
       setSlackBotToken(null);
-      setSlackWSNameInWithoutProxy(null);
+      setConnectionStatuses({});
     }
     catch (err) {
       toastError(err);
@@ -145,8 +140,7 @@ const SlackIntegration = (props) => {
           slackBotToken={slackBotToken}
           slackSigningSecretEnv={slackSigningSecretEnv}
           slackSigningSecret={slackSigningSecret}
-          slackWSNameInWithoutProxy={slackWSNameInWithoutProxy}
-          fetchSlackIntegrationData={fetchSlackIntegrationData}
+          onTestConnectionInvoked={fetchSlackIntegrationData}
           onUpdatedSecretToken={changeSecretAndToken}
           connectionStatuses={connectionStatuses}
         />