use isSetupSlackBot

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

@@ -23,7 +23,7 @@ const CustomBotWithoutProxyIntegrationCard = (props) => {
       </div>
 
       <div className="text-center w-25">
-        {props.isSlackScopeSet && (
+        {props.isSlackScopeSet && props.isSetupSlackBot && (
         <div className="mt-5">
           <p className="text-success small">
             <i className="fa fa-check mr-1" />
@@ -32,7 +32,7 @@ const CustomBotWithoutProxyIntegrationCard = (props) => {
           <hr className="align-self-center admin-border-success border-success"></hr>
         </div>
           )}
-        {!props.isSlackScopeSet && (
+        {(!props.isSlackScopeSet || !props.isSetupSlackBot) && (
         <div className="mt-4">
           <small
             className="text-secondary m-0"

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

@@ -10,7 +10,7 @@ import CustomBotWithoutProxyIntegrationCard from './CustomBotWithoutProxyIntegra
 import DeleteSlackCredentialsModal from './DeleteSlackCredentialsModal';
 
 const CustomBotWithoutProxySettings = (props) => {
-  const { appContainer, isSlackScopeSet } = props;
+  const { appContainer, isSlackScopeSet, isSetupSlackBot } = props;
   const { t } = useTranslation();
 
   const [siteName, setSiteName] = useState('');
@@ -45,11 +45,12 @@ const CustomBotWithoutProxySettings = (props) => {
         siteName={siteName}
         slackWSNameInWithoutProxy={props.slackWSNameInWithoutProxy}
         isSlackScopeSet={props.isSlackScopeSet}
+        isSetupSlackBot={props.isSetupSlackBot}
       />
 
       <h2 className="admin-setting-header">{t('admin:slack_integration.custom_bot_without_proxy_settings')}</h2>
 
-      {isSlackScopeSet && (
+      {isSlackScopeSet && isSetupSlackBot && (
       <button
         className="pull-right btn text-danger border-danger"
         type="button"
@@ -57,6 +58,7 @@ const CustomBotWithoutProxySettings = (props) => {
       >リセット
       </button>
       ) }
+
       <div className="my-5 mx-3">
         <CustomBotWithoutProxySettingsAccordion
           {...props}

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

@@ -30,13 +30,10 @@ const SlackIntegration = (props) => {
   const [isSlackScopeSet, setIsSlackScopeSet] = useState(false);
 
   const fetchSlackWorkSpaceNameInWithoutProxy = useCallback(async() => {
-    if (!isConnectedToSlack || !isSlackScopeSet) {
+    if (!isConnectedToSlack || !isSetupSlackBot) {
       return setSlackWSNameInWithoutProxy(null);
     }
-
-    console.log(isSlackScopeSet);
     try {
-      console.log('try');
       const res = await appContainer.apiv3.get('/slack-integration/custom-bot-without-proxy/slack-workspace-name');
       setSlackWSNameInWithoutProxy(res.data.slackWorkSpaceName);
       setIsSlackScopeSet(true);
@@ -51,7 +48,7 @@ const SlackIntegration = (props) => {
         toastError(err);
       }
     }
-  }, [appContainer.apiv3, isConnectedToSlack, isSlackScopeSet, t]);
+  }, [appContainer.apiv3, isConnectedToSlack, isSetupSlackBot, t]);
 
   const fetchSlackIntegrationData = useCallback(async() => {
     try {