Yuki Takei 4 лет назад
Родитель
Сommit
03782f7949

+ 1 - 0
packages/app/src/client/services/AdminSlackIntegrationLegacyContainer.js

@@ -38,6 +38,7 @@ export default class AdminSlackIntegrationLegacyContainer extends Container {
     const { slackIntegrationParams } = response.data;
 
     this.setState({
+      isSlackbotConfigured: slackIntegrationParams.isSlackbotConfigured,
       webhookUrl: slackIntegrationParams.webhookUrl,
       isIncomingWebhookPrioritized: slackIntegrationParams.isIncomingWebhookPrioritized,
       slackToken: slackIntegrationParams.slackToken,

+ 9 - 5
packages/app/src/components/Admin/LegacySlackIntegration/LegacySlackIntegration.jsx

@@ -39,13 +39,17 @@ function LegacySlackIntegration(props) {
     throw new Error(`${retrieveErrors.length} errors occured`);
   }
 
+  const isDisabled = adminSlackIntegrationLegacyContainer.state.isSlackbotConfigured;
+
   return (
     <>
-      <div className="alert alert-danger">
-        <i className="icon-minus icon-fw"></i>
-        {/* eslint-disable-next-line react/no-danger */}
-        <span dangerouslySetInnerHTML={{ __html: t('admin:slack_integration_legacy.alert_disabled') }}></span>
-      </div>
+      { isDisabled && (
+        <div className="alert alert-danger">
+          <i className="icon-minus icon-fw"></i>
+          {/* eslint-disable-next-line react/no-danger */}
+          <span dangerouslySetInnerHTML={{ __html: t('admin:slack_integration_legacy.alert_disabled') }}></span>
+        </div>
+      ) }
 
       <div className="alert alert-warning">
         <i className="icon-info icon-fw"></i>

+ 1 - 0
packages/app/src/server/routes/apiv3/slack-integration-legacy-settings.js

@@ -70,6 +70,7 @@ module.exports = (crowi) => {
   router.get('/', loginRequiredStrictly, adminRequired, async(req, res) => {
 
     const slackIntegrationParams = {
+      isSlackbotConfigured: crowi.slackIntegrationService.isSlackbotConfigured,
       webhookUrl: await crowi.configManager.getConfig('notification', 'slack:incomingWebhookUrl'),
       isIncomingWebhookPrioritized: await crowi.configManager.getConfig('notification', 'slack:isIncomingWebhookPrioritized'),
       slackToken: await crowi.configManager.getConfig('notification', 'slack:token'),