From 85d518096caa1b16c71987366c0ee3622c30558a Mon Sep 17 00:00:00 2001
From: dklimpel <5740567+dklimpel@users.noreply.github.com>
Date: Fri, 23 Apr 2021 15:42:58 +0200
Subject: [PATCH] Enable sorting of user list

---
 README.md               |  2 +-
 src/components/users.js | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 05cd8ac..93053d5 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 This project is built using [react-admin](https://marmelab.com/react-admin/).
 
-It needs at least Synapse v1.23.0 for all functions to work as expected!
+It needs at least Synapse v1.32.0 for all functions to work as expected!
 
 You get your server version with the request `/_synapse/admin/v1/server_version`.
 See also [Synapse version API](https://github.com/matrix-org/synapse/blob/develop/docs/admin_api/version_api.rst).
diff --git a/src/components/users.js b/src/components/users.js
index e66eb44..469428f 100644
--- a/src/components/users.js
+++ b/src/components/users.js
@@ -164,6 +164,7 @@ export const UserList = props => {
       {...props}
       filters={<UserFilter />}
       filterDefaultValues={{ guests: true, deactivated: false }}
+      sort={{ field: "name", order: "ASC" }}
       actions={<UserListActions maxResults={10000} />}
       bulkActionButtons={<UserBulkActionButtons />}
       pagination={<UserPagination />}
@@ -171,14 +172,14 @@ export const UserList = props => {
       <Datagrid rowClick="edit">
         <AvatarField
           source="avatar_src"
-          sortable={false}
           className={classes.small}
+          sortBy="avatar_url"
         />
-        <TextField source="id" sortable={false} />
-        <TextField source="displayname" sortable={false} />
-        <BooleanField source="is_guest" sortable={false} />
-        <BooleanField source="admin" sortable={false} />
-        <BooleanField source="deactivated" sortable={false} />
+        <TextField source="id" sortBy="name" />
+        <TextField source="displayname" />
+        <BooleanField source="is_guest" />
+        <BooleanField source="admin" />
+        <BooleanField source="deactivated" />
       </Datagrid>
     </List>
   );