yusuketk 5 лет назад
Родитель
Сommit
5fd946d265

+ 1 - 0
src/client/js/components/Admin/Users/UserTable.jsx

@@ -86,6 +86,7 @@ class UserTable extends React.Component {
     const { t, adminUsersContainer } = this.props;
 
     const isCurrentSortOrderAsc = adminUsersContainer.state.sortOrder === 'asc';
+
     return (
       <Fragment>
         <table className="table table-default table-bordered table-user-list">

+ 4 - 19
src/client/js/components/User/UserPicture.jsx

@@ -1,13 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import { createSubscribedElement } from '../UnstatedUtils';
-import AppContainer from '../../services/AppContainer';
-
 const DEFAULT_IMAGE = '/images/icons/user.svg';
 
 // TODO UserComponent?
-class UserPicture extends React.Component {
+export default class UserPicture extends React.Component {
 
   getClassName() {
     const className = ['img-circle', 'picture'];
@@ -30,24 +27,19 @@ class UserPicture extends React.Component {
   }
 
   render() {
-    const { user, appContainer } = this.props;
+    const user = this.props.user;
 
     if (user == null) {
       return this.renderForNull();
     }
 
-    if (!user.imageUrlCached) {
-      appContainer.willUpdateImageUrlCacheUserIds.push(user._id);
-      return this.renderForNull();
-    }
-
-    const imgElem = (
+    const imgElem = user.imageUrlCached ? (
       <img
         src={user.imageUrlCached}
         alt={user.username}
         className={this.getClassName()}
       />
-    );
+    ) : this.renderForNull();
 
     return (
       (this.props.withoutLink)
@@ -62,15 +54,8 @@ UserPicture.propTypes = {
   user: PropTypes.object,
   size: PropTypes.string,
   withoutLink: PropTypes.bool,
-  appContainer: PropTypes.instanceOf(AppContainer).isRequired,
 };
 
 UserPicture.defaultProps = {
   size: null,
 };
-
-const UserPictureWrapper = (props) => {
-  return createSubscribedElement(UserPicture, props, [AppContainer]);
-};
-
-export default UserPictureWrapper;

+ 0 - 1
src/client/js/services/AppContainer.js

@@ -164,7 +164,6 @@ export default class AppContainer extends Container {
       return;
     }
     const res = await this.apiv3Put('/users/update.imageUrlCache', { userIds: this.willUpdateImageUrlCacheUserIds });
-    console.log(res);
     this.willUpdateImageUrlCacheUserIds = [];
   }
 

+ 0 - 1
src/server/routes/user.js

@@ -127,7 +127,6 @@ module.exports = function(crowi, app) {
    */
   api.list = async function(req, res) {
     const userIds = req.query.user_ids || null; // TODO: handling
-    console.log('aaaa', userIds);
     let userFetcher;
     if (!userIds || userIds.split(',').length <= 0) {
       userFetcher = User.findAllUsers();