diff --git a/packages/vulcan-admin/lib/components/AdminHome.jsx b/packages/vulcan-admin/lib/components/AdminHome.jsx
index bc26d8b00..166c0e71d 100644
--- a/packages/vulcan-admin/lib/components/AdminHome.jsx
+++ b/packages/vulcan-admin/lib/components/AdminHome.jsx
@@ -2,23 +2,25 @@ import React from 'react';
import { Components, withCurrentUser, AdminColumns } from 'meteor/vulcan:core';
import { FormattedMessage } from 'meteor/vulcan:i18n';
import Users from 'meteor/vulcan:users';
+import { withRouter } from 'react-router';
import '../modules/columns.js';
-const AdminHome = ({ currentUser }) =>
-
+const AdminHome = ({ currentUser, match }) => {
+ return
}>
-
;
+};
-export default withCurrentUser(AdminHome);
\ No newline at end of file
+export default withRouter(withCurrentUser(AdminHome));
diff --git a/packages/vulcan-admin/lib/components/users/columns/AdminUsersName.jsx b/packages/vulcan-admin/lib/components/users/columns/AdminUsersName.jsx
index c56404761..36229b921 100644
--- a/packages/vulcan-admin/lib/components/users/columns/AdminUsersName.jsx
+++ b/packages/vulcan-admin/lib/components/users/columns/AdminUsersName.jsx
@@ -5,9 +5,7 @@ import { Components } from 'meteor/vulcan:core';
const AdminUsersName = ({ document: user, flash }) =>
-
-
- {Users.getDisplayName(user)}
+ {user.fullName}
diff --git a/packages/vulcan-admin/lib/modules/columns.js b/packages/vulcan-admin/lib/modules/columns.js
index d20cb7d5c..321d2eaed 100644
--- a/packages/vulcan-admin/lib/modules/columns.js
+++ b/packages/vulcan-admin/lib/modules/columns.js
@@ -6,7 +6,7 @@ import AdminUsersCreated from '../components/users/columns/AdminUsersCreated.jsx
addAdminColumn([
{
- name: 'name',
+ name: 'fullName',
order: 1,
component: AdminUsersName
},
diff --git a/packages/vulcan-admin/lib/modules/routes.js b/packages/vulcan-admin/lib/modules/routes.js
index 725b61ff0..8ef67b55b 100644
--- a/packages/vulcan-admin/lib/modules/routes.js
+++ b/packages/vulcan-admin/lib/modules/routes.js
@@ -9,6 +9,6 @@ addRoute({
});
addRoute({
name: 'admin2',
- path: '/admin/users',
+ path: '/admin/users/:id?',
component: () => getDynamicComponent(import('../components/AdminHome.jsx')),
});
diff --git a/packages/vulcan-core/lib/modules/components/Datatable.jsx b/packages/vulcan-core/lib/modules/components/Datatable.jsx
index d23a2e6a5..1c9b5c9e8 100644
--- a/packages/vulcan-core/lib/modules/components/Datatable.jsx
+++ b/packages/vulcan-core/lib/modules/components/Datatable.jsx
@@ -31,12 +31,12 @@ const getColumnName = column => (
class Datatable extends PureComponent {
- constructor() {
- super();
+ constructor(props) {
+ super(props);
this.updateQuery = this.updateQuery.bind(this);
this.state = {
value: '',
- query: '',
+ query: props.query ? props.query : '',
currentSort: {}
};
}
diff --git a/packages/vulcan-users/lib/modules/schema.js b/packages/vulcan-users/lib/modules/schema.js
index d929d82ea..6c992fa52 100644
--- a/packages/vulcan-users/lib/modules/schema.js
+++ b/packages/vulcan-users/lib/modules/schema.js
@@ -48,6 +48,7 @@ const schema = {
type: String,
optional: true,
canRead: ['guests'],
+ searchable: true,
},
username: {
type: String,