X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/8d374520f28b507e8934d57be46374044fb93e2f..0ee5873d56416cf0c102f9e8930322fa80762f41:/src/store/users/user-panel-middleware-service.ts

diff --git a/src/store/users/user-panel-middleware-service.ts b/src/store/users/user-panel-middleware-service.ts
index c0589a60..e965cd00 100644
--- a/src/store/users/user-panel-middleware-service.ts
+++ b/src/store/users/user-panel-middleware-service.ts
@@ -56,27 +56,19 @@ const getParams = (dataExplorer: DataExplorer) => ({
         .getFilters()
 });
 
-export const getOrder = (dataExplorer: DataExplorer) => {
-    const sortColumn = getSortColumn(dataExplorer);
+const getOrder = (dataExplorer: DataExplorer) => {
+    const sortColumn = getSortColumn<UserResource>(dataExplorer);
     const order = new OrderBuilder<UserResource>();
-    if (sortColumn) {
-        const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
+    if (sortColumn && sortColumn.sort) {
+        const sortDirection = sortColumn.sort.direction === SortDirection.ASC
             ? OrderDirection.ASC
             : OrderDirection.DESC;
-        switch (sortColumn.name) {
-            case UserPanelColumnNames.NAME:
-                order.addOrder(sortDirection, "firstName")
-                    .addOrder(sortDirection, "lastName");
-                break;
-            case UserPanelColumnNames.UUID:
-                order.addOrder(sortDirection, "uuid");
-                break;
-            case UserPanelColumnNames.EMAIL:
-                order.addOrder(sortDirection, "email");
-                break;
-            case UserPanelColumnNames.USERNAME:
-                order.addOrder(sortDirection, "username");
-                break;
+
+        if (sortColumn.name === UserPanelColumnNames.NAME) {
+            order.addOrder(sortDirection, "firstName")
+                .addOrder(sortDirection, "lastName");
+        } else {
+            order.addOrder(sortDirection, sortColumn.sort.field);
         }
     }
     return order.getOrder();