Steven Fukase 5 лет назад
Родитель
Сommit
1940afa2b7

+ 20 - 5
src/client/js/components/Admin/SlackIntegration/ConfirmBotChangeModal.jsx

@@ -5,12 +5,27 @@ import {
   Modal, ModalHeader, ModalBody, ModalFooter,
 } from 'reactstrap';
 
-const ConfirmBotChangeModal = ({ show, onConfirmClick, onCancelClick }) => {
+const ConfirmBotChangeModal = (props) => {
   const { t } = useTranslation('admin');
+  let isOpen = false;
+  let onConfirmClick = null;
+  let onCancelClick = null;
+
+  if (props.isOpen != null) {
+    isOpen = props.isOpen;
+  }
+
+  if (props.onConfirmClick != null) {
+    onConfirmClick = props.onConfirmClick;
+  }
+
+  if (props.onCancelClick != null) {
+    onCancelClick = props.onCancelClick;
+  }
 
   return (
     <>
-      <Modal isOpen={show} centered>
+      <Modal isOpen={isOpen} centered>
         <ModalHeader toggle={onCancelClick}>
           {t('slack_integration.modal.warning')}
         </ModalHeader>
@@ -36,9 +51,9 @@ const ConfirmBotChangeModal = ({ show, onConfirmClick, onCancelClick }) => {
 };
 
 ConfirmBotChangeModal.propTypes = {
-  show: PropTypes.bool.isRequired,
-  onConfirmClick: PropTypes.func.isRequired,
-  onCancelClick: PropTypes.func.isRequired,
+  isOpen: PropTypes.bool,
+  onConfirmClick: PropTypes.func,
+  onCancelClick: PropTypes.func,
 };
 
 export default ConfirmBotChangeModal;

+ 5 - 5
src/client/js/components/Admin/SlackIntegration/SlackIntegration.jsx

@@ -9,7 +9,7 @@ import ConfirmBotChangeModal from './ConfirmBotChangeModal';
 const SlackIntegration = () => {
   const [currentBotType, setCurrentBotType] = useState(null);
   const [selectedBotType, setSelectedBotType] = useState(null);
-  const [isConfirmBotChangeModalOpen, setIsConfirmBotChangeModalOpen] = useState(false);
+  // const [isConfirmBotChangeModalOpen, setIsConfirmBotChangeModalOpen] = useState(false);
 
   const handleBotTypeSelect = (clickedBotType) => {
     if (clickedBotType === currentBotType) {
@@ -20,18 +20,18 @@ const SlackIntegration = () => {
       return;
     }
     setSelectedBotType(clickedBotType);
-    setIsConfirmBotChangeModalOpen(true);
+    // setIsConfirmBotChangeModalOpen(true);
   };
 
   const handleBotChangeCancel = () => {
     setSelectedBotType(null);
-    setIsConfirmBotChangeModalOpen(false);
+    // setIsConfirmBotChangeModalOpen(false);
   };
 
   const changeCurrentBotSettings = () => {
     setCurrentBotType(selectedBotType);
     setSelectedBotType(null);
-    setIsConfirmBotChangeModalOpen(false);
+    // setIsConfirmBotChangeModalOpen(false);
   };
 
   let settingsComponent = null;
@@ -52,7 +52,7 @@ const SlackIntegration = () => {
     <>
       <div className="container">
         <ConfirmBotChangeModal
-          isOpen = {isConfirmBotChangeModalOpen}
+          isOpen={selectedBotType != null}
           onConfirmClick={changeCurrentBotSettings}
           onCancelClick={handleBotChangeCancel}
         />