handle page for user

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

@@ -19,6 +19,7 @@ class UserPage extends React.Component {
     super();
 
     this.state = {
+      totalUsers: 0,
       activePage: 1,
       pagingLimit: Infinity,
     };
@@ -32,27 +33,21 @@ class UserPage extends React.Component {
   }
 
   async syncUserGroupAndRelations() {
-    // let userGroups = [];
-    // let userGroupRelations = {};
-    // let totalUserGroups = 0;
-    // let pagingLimit = Infinity;
 
     try {
       const params = { page: this.state.activePage };
       const response = await this.props.appContainer.apiv3.get('/users', params);
 
-      // const [userGroupsRes, userGroupRelationsRes] = responses;
-      // userGroups = userGroupsRes.data.userGroups;
-      // totalUserGroups = userGroupsRes.data.totalUserGroups;
-      // pagingLimit = userGroupsRes.data.pagingLimit;
-      // userGroupRelations = userGroupRelationsRes.data.userGroupRelations;
-
-      // this.setState({
-      //   userGroups,
-      //   userGroupRelations,
-      //   totalUserGroups,
-      //   pagingLimit,
-      // });
+      const users = response.data.users;
+      const totalUsers = response.data.totalUsers;
+      const pagingLimit = response.data.pagingLimit;
+
+      this.props.adminUsersContainer.setState({ users });
+
+      this.setState({
+        totalUsers,
+        pagingLimit,
+      });
     }
     catch (err) {
       toastError(err);
@@ -75,8 +70,8 @@ class UserPage extends React.Component {
         <UserTable />
         <PaginationWrapper
           activePage={this.state.activePage}
-          changePage={this.handlePage} // / TODO GW-314 create function
-          totalItemsCount={adminUsersContainer.state.users.length}
+          changePage={this.handlePage}
+          totalItemsCount={this.state.totalUsers}
           pagingLimit={this.state.pagingLimit}
         />
       </Fragment>

src/server/routes/apiv3/users.js

@@ -36,9 +36,9 @@ module.exports = (crowi) => {
   router.get('/', loginRequiredStrictly, adminRequired, async(req, res) => {
     try {
       const page = parseInt(req.query.page) || 1;
-      const result = await User.findUserGroupsWithPagination({ page });
-      const { docs: userGroups, total: totalUserGroups, limit: pagingLimit } = result;
-      return res.apiv3({ userGroups, totalUserGroups, pagingLimit });
+      const result = await User.findUsersWithPagination({ page });
+      const { docs: users, total: totalUsers, limit: pagingLimit } = result;
+      return res.apiv3({ users, totalUsers, pagingLimit });
     }
     catch (err) {
       const msg = 'Error occurred in fetching user group list';