Merge branch '21128-toolbar-context-menu'

[arvados-workbench2.git] / src / store / groups-panel / groups-panel-middleware-service.ts

diff --git a/src/store/groups-panel/groups-panel-middleware-service.ts b/src/store/groups-panel/groups-panel-middleware-service.ts
index 2841550686d61dc9d1f7e7652e05334cdbbff4f3..7d7803f59e6943efd042a0da166c38ccc473bdda 100644 (file)
--- a/src/store/groups-panel/groups-panel-middleware-service.ts
+++ b/src/store/groups-panel/groups-panel-middleware-service.ts
@@ -14,7 +14,7 @@ import { updateResources } from 'store/resources/resources-actions';
 import { OrderBuilder, OrderDirection } from 'services/api/order-builder';
 import { GroupResource, GroupClass } from 'models/group';
 import { SortDirection } from 'components/data-table/data-column';
-import { GroupsPanelColumnNames } from 'views/groups-panel/groups-panel';
+import { progressIndicatorActions } from "store/progress-indicator/progress-indicator-actions";
 
 export class GroupsPanelMiddlewareService extends DataExplorerMiddlewareService {
     constructor(private services: ServiceRepository, id: string) {
@@ -26,14 +26,15 @@ export class GroupsPanelMiddlewareService extends DataExplorerMiddlewareService
             api.dispatch(groupsPanelDataExplorerIsNotSet());
         } else {
             try {
+                api.dispatch(progressIndicatorActions.START_WORKING(this.getId()));
+                const sortColumn = getSortColumn<GroupResource>(dataExplorer);
                 const order = new OrderBuilder<GroupResource>();
-                const sortColumn = getSortColumn(dataExplorer);
-                if (sortColumn) {
+                if (sortColumn && sortColumn.sort) {
                     const direction =
-                        sortColumn.sortDirection === SortDirection.ASC && sortColumn.name === GroupsPanelColumnNames.GROUP
+                        sortColumn.sort.direction === SortDirection.ASC
                             ? OrderDirection.ASC
                             : OrderDirection.DESC;
-                    order.addOrder(direction, 'name');
+                    order.addOrder(direction, sortColumn.sort.field);
                 }
                 const filters = new FilterBuilder()
                     .addEqual('group_class', GroupClass.ROLE)
@@ -58,6 +59,8 @@ export class GroupsPanelMiddlewareService extends DataExplorerMiddlewareService
                 api.dispatch(updateResources(permissions.items));
             } catch (e) {
                 api.dispatch(couldNotFetchFavoritesContents());
+            } finally {
+                api.dispatch(progressIndicatorActions.STOP_WORKING(this.getId()));
             }
         }
     }