revert "Merge branch 'imprv/6083-show-accordion' of https://github.com/weseek/growi into feat/growi-bot"

This reverts commit cb2eb51ea503b8734c86bc5b42ecc6ed61aa1475, reversing
changes made to dfe4d8b4c7bd2a60baef90e1e0a53192976cdfb6.

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

@@ -122,12 +122,7 @@ const SlackIntegration = (props) => {
 
   switch (currentBotType) {
     case 'officialBot':
-      settingsComponent = (
-        <OfficialBotSettings
-          slackAppIntegrations={slackAppIntegrations}
-          proxyServerUri={proxyServerUri}
-        />
-      );
+      settingsComponent = <OfficialBotSettings slackAppIntegrations={slackAppIntegrations} proxyServerUri={proxyServerUri} />;
       break;
     case 'customBotWithoutProxy':
       settingsComponent = (

src/server/routes/apiv3/slack-integration-settings.js

@@ -165,26 +165,20 @@ module.exports = (crowi) => {
       }
     }
     else {
-      try {
-        const slackAppIntegrations = await SlackAppIntegration.find();
-        settings.slackAppIntegrations = slackAppIntegrations;
-      }
-      catch (error) {
-        const msg = 'Error occured in getting connection statuses';
-        logger.error('Error', error);
-        return res.apiv3Err(new ErrorV3(msg, 'get-connection-failed'), 500);
-      }
-
       const proxyServerUri = settings.proxyServerUri;
+
       if (proxyServerUri != null) {
         try {
-          if (settings.slackAppIntegrations.length > 0) {
-            const tokenGtoPs = settings.slackAppIntegrations.map(slackAppIntegration => slackAppIntegration.tokenGtoP);
+          const slackAppIntegrations = await SlackAppIntegration.find();
+          settings.slackAppIntegrations = slackAppIntegrations;
+
+          if (slackAppIntegrations.length > 0) {
+            const tokenGtoPs = slackAppIntegrations.map(slackAppIntegration => slackAppIntegration.tokenGtoP);
             connectionStatuses = (await getConnectionStatusesFromProxy(tokenGtoPs)).connectionStatuses;
           }
         }
         catch (error) {
-          const msg = 'Error occured in testing connection statuses';
+          const msg = 'Error occured in getting connection statuses';
           logger.error('Error', error);
           return res.apiv3Err(new ErrorV3(msg, 'get-connection-failed'), 500);
         }