itizawa 6 лет назад
Родитель
Сommit
1810412ee7
1 измененных файлов с 25 добавлено и 29 удалено
  1. 25 29
      src/client/js/components/Admin/Users/ConfirmationPasswordModal.jsx

+ 25 - 29
src/client/js/components/Admin/Users/ConfirmationPasswordModal.jsx

@@ -9,16 +9,30 @@ import AppContainer from '../../../services/AppContainer';
 
 class ConfirmationPasswordModal extends React.Component {
 
-  render() {
-    const { t } = this.props;
+  renderCreatedEmail(userList) {
+    return userList.map((user) => {
+      return (
+        <tr key={user.email}>
+          <td>
+            <strong>{user.email}</strong>
+          </td>
+          <td>{user.password}</td>
+        </tr>
+      );
+    });
+  }
 
-    const renderCreatedEmail = () => {
-      return <p>helllo</p>;
-    };
+  renderExistingEmail(emailList) {
+    return emailList.map((user) => {
+      return (
+        <p key={user}><strong>{user}</strong></p>
+      );
+    });
+  }
 
-    const renderExistedEmail = () => {
-      return <p>helllo</p>;
-    };
+  render() {
+    const { t } = this.props;
+    const { createdUserList, existingEmailList } = this.props.invitedEmailList;
 
     return (
       <Modal show={this.props.show}>
@@ -31,26 +45,8 @@ class ConfirmationPasswordModal extends React.Component {
           <p>{ t('user_management.temporary_password') }</p>
           <p>{ t('user_management.send_new_password') }</p>
           <p className="text-danger">{ t('user_management.send_temporary_password') }</p>
-          {/* {this.props.invitedEmailList.map((email) => {
-              return (
-                <tr key={email._id}>
-                  <td>
-                    <strong>{email}</strong>
-                  </td>
-                  <td>{user.name}</td>
-                  <td>{user.email}</td>
-                  <td>{dateFnsFormat(new Date(user.createdAt), 'YYYY-MM-DD')}</td>
-                  <td>
-                    { user.lastLoginAt && <span>{dateFnsFormat(new Date(user.lastLoginAt), 'YYYY-MM-DD HH:mm')}</span> }
-                  </td>
-                  <td>
-                    <UserMenu user={user} onPasswordResetClicked={this.props.onPasswordResetClicked} />
-                  </td>
-                </tr>
-              );
-            })} */}
-          {renderCreatedEmail()}
-          {renderExistedEmail()}
+          {createdUserList && this.renderCreatedEmail(createdUserList)}
+          {existingEmailList && this.renderExistingEmail(existingEmailList)}
         </Modal.Body>
         <Modal.Footer className="d-flex">
         </Modal.Footer>
@@ -73,7 +69,7 @@ ConfirmationPasswordModal.propTypes = {
   appContainer: PropTypes.instanceOf(AppContainer).isRequired,
 
   show: PropTypes.bool.isRequired,
-  invitedEmailList: PropTypes.string,
+  invitedEmailList: PropTypes.object,
 };
 
 export default withTranslation()(ConfirmationPasswordModalWrapper);