Merge pull request #1309 from weseek/support/apply-bst4-UserInviteModal-rm-onToggleModal

修正に伴うUserInviteModal内のonToggleModalと余計なbsStyleの修正

src/client/js/components/Admin/Users/UserInviteModal.jsx

@@ -6,7 +6,7 @@ import { CopyToClipboard } from 'react-copy-to-clipboard';
 
 // import Button from 'react-bootstrap/es/Button';
 import {
-  Modal, ModalHeader, ModalBody, ModalFooter, Button,
+  Modal, ModalHeader, ModalBody, ModalFooter,
 } from 'reactstrap';
 
 import { toastSuccess, toastError } from '../../../util/apiNotification';
@@ -85,17 +85,17 @@ class UserInviteModal extends React.Component {
           </label>
         </div>
         <div>
-          <Button bsStyle="danger" className="fcbtn btn btn-xs btn-danger btn-outline btn-rounded" onClick={this.onToggleModal}>
-          Cancel
-          </Button>
-          <Button
-            bsStyle="primary"
-            className="fcbtn btn btn-primary btn-outline btn-rounded btn-1b"
+          <button type="button" className="fcbtn btn btn-xs btn-outline-secondary" onClick={this.onToggleModal}>
+            Cancel
+          </button>
+          <button
+            type="button"
+            className="fcbtn btn btn-primary btn-1b"
             onClick={this.handleSubmit}
             disabled={!this.validEmail()}
           >
-          Done
-          </Button>
+            Invite
+          </button>
         </div>
       </>
     );
@@ -109,13 +109,13 @@ class UserInviteModal extends React.Component {
         <label className="mr-3 text-left text-danger" style={{ flex: 1 }}>
           {t('user_management.send_temporary_password')}
         </label>
-        <Button
-          bsStyle="primary"
-          className="fcbtn btn btn-primary btn-outline btn-rounded"
+        <button
+          type="button"
+          className="fcbtn btn btn-primary"
           onClick={this.onToggleModal}
         >
           Close
-        </Button>
+        </button>
       </>
     );
   }
@@ -188,8 +188,8 @@ class UserInviteModal extends React.Component {
 
 
     return (
-      <Modal isOpen={adminUsersContainer.state.isUserInviteModalShown} toggle={this.props.onToggleModal}>
-        <ModalHeader toggle={this.props.onToggleModal} className="modal-header">
+      <Modal isOpen={adminUsersContainer.state.isUserInviteModalShown} toggle={this.onToggleModal}>
+        <ModalHeader toggle={this.onToggleModal} className="modal-header">
           { t('user_management.invite_users') }
         </ModalHeader>
         <ModalBody>
@@ -218,7 +218,6 @@ UserInviteModal.propTypes = {
   t: PropTypes.func.isRequired, // i18next
   appContainer: PropTypes.instanceOf(AppContainer).isRequired,
   adminUsersContainer: PropTypes.instanceOf(AdminUsersContainer).isRequired,
-  onToggleModal: PropTypes.func.isRequired, // for cancel evnet handling
 };
 
 export default withTranslation()(UserInviteModalWrapper);