Răsfoiți Sursa

Merge pull request #3586 from weseek/imprv/GW-5530-allows-check-the-setup-status-of-BoltService-on-the-management-screen

imprv/allows check the setup status of BoltService on the management screen
itizawa 5 ani în urmă
părinte
comite
cdf228cbd3

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

@@ -21,6 +21,8 @@ const CustomBotWithoutProxySettings = (props) => {
   // get site name from this GROWI
   // get site name from this GROWI
   // eslint-disable-next-line no-unused-vars
   // eslint-disable-next-line no-unused-vars
   const [siteName, setSiteName] = useState('');
   const [siteName, setSiteName] = useState('');
+  // eslint-disable-next-line no-unused-vars
+  const [isBoltSetup, setIsBoltSetup] = useState(null);
   const currentBotType = 'custom-bot-without-proxy';
   const currentBotType = 'custom-bot-without-proxy';
 
 
   const getSlackWSInWithoutProxy = useCallback(async() => {
   const getSlackWSInWithoutProxy = useCallback(async() => {
@@ -38,13 +40,14 @@ const CustomBotWithoutProxySettings = (props) => {
       await adminAppContainer.retrieveAppSettingsData();
       await adminAppContainer.retrieveAppSettingsData();
       const res = await appContainer.apiv3.get('/slack-integration/');
       const res = await appContainer.apiv3.get('/slack-integration/');
       const {
       const {
-        slackSigningSecret, slackBotToken, slackSigningSecretEnvVars, slackBotTokenEnvVars,
+        slackSigningSecret, slackBotToken, slackSigningSecretEnvVars, slackBotTokenEnvVars, isBoltSetup,
       } = res.data.slackBotSettingParams.customBotWithoutProxySettings;
       } = res.data.slackBotSettingParams.customBotWithoutProxySettings;
       setSlackSigningSecret(slackSigningSecret);
       setSlackSigningSecret(slackSigningSecret);
       setSlackBotToken(slackBotToken);
       setSlackBotToken(slackBotToken);
       setSlackSigningSecretEnv(slackSigningSecretEnvVars);
       setSlackSigningSecretEnv(slackSigningSecretEnvVars);
       setSlackBotTokenEnv(slackBotTokenEnvVars);
       setSlackBotTokenEnv(slackBotTokenEnvVars);
       setSiteName(adminAppContainer.state.title);
       setSiteName(adminAppContainer.state.title);
+      setIsBoltSetup(isBoltSetup);
     }
     }
     catch (err) {
     catch (err) {
       toastError(err);
       toastError(err);

+ 1 - 0
src/server/routes/apiv3/slack-integration.js

@@ -100,6 +100,7 @@ module.exports = (crowi) => {
         slackBotTokenEnvVars: crowi.configManager.getConfigFromEnvVars('crowi', 'slackbot:token'),
         slackBotTokenEnvVars: crowi.configManager.getConfigFromEnvVars('crowi', 'slackbot:token'),
         slackSigningSecret: crowi.configManager.getConfig('crowi', 'slackbot:signingSecret'),
         slackSigningSecret: crowi.configManager.getConfig('crowi', 'slackbot:signingSecret'),
         slackBotToken: crowi.configManager.getConfig('crowi', 'slackbot:token'),
         slackBotToken: crowi.configManager.getConfig('crowi', 'slackbot:token'),
+        isBoltSetup: crowi.boltService.isBoltSetup,
       },
       },
       // TODO imple when creating with proxy
       // TODO imple when creating with proxy
       customBotWithProxySettings: {
       customBotWithProxySettings: {