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 7c70666e0c7cb798623fc32f9a9a08b11fc25e65..7d7803f59e6943efd042a0da166c38ccc473bdda 100644 (file)
--- a/src/store/groups-panel/groups-panel-middleware-service.ts
+++ b/src/store/groups-panel/groups-panel-middleware-service.ts
@@ -3,82 +3,64 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import { Dispatch, MiddlewareAPI } from "redux";
-import { DataExplorerMiddlewareService, listResultsToDataExplorerItemsMeta, dataExplorerToListParams } from "~/store/data-explorer/data-explorer-middleware-service";
-import { RootState } from "~/store/store";
-import { ServiceRepository } from "~/services/services";
-import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions';
-import { getDataExplorer, DataExplorer, getSortColumn } from "~/store/data-explorer/data-explorer-reducer";
-import { GroupsPanelActions } from '~/store/groups-panel/groups-panel-actions';
-import { FilterBuilder } from '~/services/api/filter-builder';
-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 { DataExplorerMiddlewareService, listResultsToDataExplorerItemsMeta, dataExplorerToListParams } from "store/data-explorer/data-explorer-middleware-service";
+import { RootState } from "store/store";
+import { ServiceRepository } from "services/services";
+import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
+import { getDataExplorer, getSortColumn } from "store/data-explorer/data-explorer-reducer";
+import { GroupsPanelActions } from 'store/groups-panel/groups-panel-actions';
+import { FilterBuilder } from 'services/api/filter-builder';
+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 { progressIndicatorActions } from "store/progress-indicator/progress-indicator-actions";
 
 export class GroupsPanelMiddlewareService extends DataExplorerMiddlewareService {
-
     constructor(private services: ServiceRepository, id: string) {
         super(id);
     }
-
     async requestItems(api: MiddlewareAPI<Dispatch, RootState>) {
-
         const dataExplorer = getDataExplorer(api.getState().dataExplorer, this.getId());
-
         if (!dataExplorer) {
-
             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()
-                    .addNotIn('groupClass', [GroupClass.PROJECT])
+                    .addEqual('group_class', GroupClass.ROLE)
                     .addILike('name', dataExplorer.searchValue)
                     .getFilters();
-
                 const response = await this.services.groupsService
                     .list({
                         ...dataExplorerToListParams(dataExplorer),
                         filters,
                         order: order.getOrder(),
                     });
-
                 api.dispatch(updateResources(response.items));
-
                 api.dispatch(GroupsPanelActions.SET_ITEMS({
                     ...listResultsToDataExplorerItemsMeta(response),
                     items: response.items.map(item => item.uuid),
                 }));
-
                 const permissions = await this.services.permissionService.list({
-
                     filters: new FilterBuilder()
-                        .addIn('tailUuid', response.items.map(item => item.uuid))
+                        .addIn('head_uuid', response.items.map(item => item.uuid))
                         .getFilters()
-
                 });
-
                 api.dispatch(updateResources(permissions.items));
-
-
             } catch (e) {
-
                 api.dispatch(couldNotFetchFavoritesContents());
-
+            } finally {
+                api.dispatch(progressIndicatorActions.STOP_WORKING(this.getId()));
             }
         }
     }
@@ -86,7 +68,8 @@ export class GroupsPanelMiddlewareService extends DataExplorerMiddlewareService
 
 const groupsPanelDataExplorerIsNotSet = () =>
     snackbarActions.OPEN_SNACKBAR({
-        message: 'Groups panel is not ready.'
+        message: 'Groups panel is not ready.',
+        kind: SnackbarKind.ERROR
     });
 
 const couldNotFetchFavoritesContents = () =>
@@ -94,4 +77,3 @@ const couldNotFetchFavoritesContents = () =>
         message: 'Could not fetch groups.',
         kind: SnackbarKind.ERROR
     });
-