zahmis пре 4 година
родитељ
комит
3d133a0d6d

+ 1 - 19
src/client/js/components/Admin/SlackIntegration/CustomBotWithoutProxySettingsAccordion.jsx

@@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next';
 import Accordion from '../Common/Accordion';
 import Accordion from '../Common/Accordion';
 import AppContainer from '../../../services/AppContainer';
 import AppContainer from '../../../services/AppContainer';
 import { withUnstatedContainers } from '../../UnstatedUtils';
 import { withUnstatedContainers } from '../../UnstatedUtils';
+import MessageBasedOnConnection from './MessageBasedOnConnection';
 import CustomBotWithoutProxySecretTokenSection from './CustomBotWithoutProxySecretTokenSection';
 import CustomBotWithoutProxySecretTokenSection from './CustomBotWithoutProxySecretTokenSection';
 import { addLogs } from './slak-integration-util';
 import { addLogs } from './slak-integration-util';
 
 
@@ -15,25 +16,6 @@ export const botInstallationStep = {
   CONNECTION_TEST: 'connection-test',
   CONNECTION_TEST: 'connection-test',
 };
 };
 
 
-const MessageBasedOnConnection = (props) => {
-  const { isLatestConnectionSuccess, logsValue } = props;
-  const { t } = useTranslation();
-  if (isLatestConnectionSuccess) {
-    return <p className="text-info text-center my-4">{t('admin:slack_integration.accordion.send_message_to_slack_work_space')}</p>;
-  }
-
-  if (logsValue === '') {
-    return <p></p>;
-  }
-
-  return <p className="text-danger text-center my-4">{t('admin:slack_integration.accordion.error_check_logs_below')}</p>;
-};
-
-MessageBasedOnConnection.propTypes = {
-  isLatestConnectionSuccess: PropTypes.bool.isRequired,
-  logsValue: PropTypes.string.isRequired,
-};
-
 
 
 const CustomBotWithoutProxySettingsAccordion = (props) => {
 const CustomBotWithoutProxySettingsAccordion = (props) => {
   const {
   const {

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

@@ -6,6 +6,8 @@ import { useTranslation } from 'react-i18next';
 const MessageBasedOnConnection = (props) => {
 const MessageBasedOnConnection = (props) => {
   const { isLatestConnectionSuccess, logsValue } = props;
   const { isLatestConnectionSuccess, logsValue } = props;
   const { t } = useTranslation();
   const { t } = useTranslation();
+
+  console.log(isLatestConnectionSuccess);
   if (isLatestConnectionSuccess) {
   if (isLatestConnectionSuccess) {
     return <p className="text-info text-center my-4">{t('admin:slack_integration.accordion.send_message_to_slack_work_space')}</p>;
     return <p className="text-info text-center my-4">{t('admin:slack_integration.accordion.send_message_to_slack_work_space')}</p>;
   }
   }
@@ -21,3 +23,5 @@ MessageBasedOnConnection.propTypes = {
   isLatestConnectionSuccess: PropTypes.bool.isRequired,
   isLatestConnectionSuccess: PropTypes.bool.isRequired,
   logsValue: PropTypes.string.isRequired,
   logsValue: PropTypes.string.isRequired,
 };
 };
+
+export default MessageBasedOnConnection;