zahmis 5 лет назад
Родитель
Сommit
f4b27acc8b

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

@@ -6,6 +6,8 @@ import AdminAppContainer from '../../../services/AdminAppContainer';
 import { withUnstatedContainers } from '../../UnstatedUtils';
 import { toastSuccess, toastError } from '../../../util/apiNotification';
 import AdminUpdateButtonRow from '../Common/AdminUpdateButtonRow';
+import SlackGrowiBridging from './SlackGrowiBridging';
+
 
 const CustomBotWithoutProxySettings = (props) => {
   const { appContainer, adminAppContainer } = props;
@@ -60,6 +62,8 @@ const CustomBotWithoutProxySettings = (props) => {
   return (
     <>
       <h2 className="admin-setting-header">{t('admin:slack_integration.custom_bot_without_proxy_settings')}</h2>
+      {/* temporarily put bellow component */}
+      <SlackGrowiBridging />
       <div className="row my-5">
         <div className="mx-auto">
           <button

+ 3 - 3
src/client/js/components/Admin/SlackIntegration/SlackGrowiBridging.jsx

@@ -8,7 +8,7 @@ import AppContainer from '../../../services/AppContainer';
 import AdminAppContainer from '../../../services/AdminAppContainer';
 
 
-const SlackGrowiBridging = (crowi, props) => {
+const SlackGrowiBridging = (props) => {
   const { WebClient, LogLevel } = require('@slack/web-api');
   const { adminAppContainer } = props;
   const [siteName, setSiteName] = useState('');
@@ -29,8 +29,8 @@ const SlackGrowiBridging = (crowi, props) => {
 
   const fetchData = useCallback(async() => {
     try {
-      // await adminAppContainer.retrieveAppSettingsData();
-      // setSiteName(adminAppContainer.state.title);
+      await adminAppContainer.retrieveAppSettingsData();
+      setSiteName(adminAppContainer.state.title);
       checkSlackGrowiCommunication();
 
     }

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

@@ -5,7 +5,6 @@ import OfficialBotSettings from './OfficialBotSettings';
 import CustomBotWithoutProxySettings from './CustomBotWithoutProxySettings';
 import CustomBotWithProxySettings from './CustomBotWithProxySettings';
 import ConfirmBotChangeModal from './ConfirmBotChangeModal';
-import SlackGrowiBridging from './SlackGrowiBridging';
 
 const SlackIntegration = () => {
   const [currentBotType, setCurrentBotType] = useState(null);
@@ -62,9 +61,6 @@ const SlackIntegration = () => {
         </div>
       </div>
 
-      <SlackGrowiBridging />
-
-
       <div className="row my-5">
         <div className="card-deck mx-auto">