|
@@ -14,7 +14,7 @@ export const botInstallationStep = {
|
|
|
const CustomBotWithoutProxySettingsAccordion = (props) => {
|
|
const CustomBotWithoutProxySettingsAccordion = (props) => {
|
|
|
const {
|
|
const {
|
|
|
activeStep, connectionMessage, connectionErrorCode, testChannel,
|
|
activeStep, connectionMessage, connectionErrorCode, testChannel,
|
|
|
- slackSigningSecret, slackBotToken, /* slackSigningSecretEnv, slackBotTokenEnv, */
|
|
|
|
|
|
|
+ slackSigningSecret, slackBotToken, slackSigningSecretEnv, slackBotTokenEnv,
|
|
|
isIntegrationSuccess,
|
|
isIntegrationSuccess,
|
|
|
inputTestChannelHandler, onTestFormSubmitted,
|
|
inputTestChannelHandler, onTestFormSubmitted,
|
|
|
} = props;
|
|
} = props;
|
|
@@ -42,6 +42,11 @@ const CustomBotWithoutProxySettingsAccordion = (props) => {
|
|
|
value = [connectionErrorCode, connectionMessage];
|
|
value = [connectionErrorCode, connectionMessage];
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ let isEnterdSecretAndToken = false;
|
|
|
|
|
+ if ((slackSigningSecret != null && slackBotToken != null) || (slackSigningSecretEnv != null && slackBotTokenEnv != null)) {
|
|
|
|
|
+ isEnterdSecretAndToken = true;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
return (
|
|
return (
|
|
|
<div className="card border-0 rounded-lg shadow overflow-hidden">
|
|
<div className="card border-0 rounded-lg shadow overflow-hidden">
|
|
|
<Accordion
|
|
<Accordion
|
|
@@ -85,7 +90,7 @@ const CustomBotWithoutProxySettingsAccordion = (props) => {
|
|
|
<Accordion
|
|
<Accordion
|
|
|
defaultIsActive={defaultOpenAccordionKeys.has(botInstallationStep.REGISTER_SLACK_CONFIGURATION)}
|
|
defaultIsActive={defaultOpenAccordionKeys.has(botInstallationStep.REGISTER_SLACK_CONFIGURATION)}
|
|
|
// eslint-disable-next-line max-len
|
|
// eslint-disable-next-line max-len
|
|
|
- title={<><span className="mr-2">③</span>{t('admin:slack_integration.accordion.register_secret_and_token')}{slackSigningSecret != null && slackBotToken != null && <i className="ml-3 text-success fa fa-check"></i>}</>}
|
|
|
|
|
|
|
+ title={<><span className="mr-2">③</span>{t('admin:slack_integration.accordion.register_secret_and_token')}{isEnterdSecretAndToken && <i className="ml-3 text-success fa fa-check"></i>}</>}
|
|
|
>
|
|
>
|
|
|
<CustomBotWithoutProxySecretTokenSection
|
|
<CustomBotWithoutProxySecretTokenSection
|
|
|
{...props}
|
|
{...props}
|