X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/02fe86a56f080ed1d5770ad6c6856a15f50ab508..a74d278febca225076a72413a8343e13f5488a58:/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 b5ef51b765..8589c7687e 100644 --- a/src/store/groups-panel/groups-panel-middleware-service.ts +++ b/src/store/groups-panel/groups-panel-middleware-service.ts @@ -17,23 +17,15 @@ import { SortDirection } from '~/components/data-table/data-column'; import { GroupsPanelColumnNames } from '~/views/groups-panel/groups-panel'; export class GroupsPanelMiddlewareService extends DataExplorerMiddlewareService { - constructor(private services: ServiceRepository, id: string) { super(id); } - async requestItems(api: MiddlewareAPI) { - const dataExplorer = getDataExplorer(api.getState().dataExplorer, this.getId()); - if (!dataExplorer) { - api.dispatch(groupsPanelDataExplorerIsNotSet()); - } else { - try { - const order = new OrderBuilder(); const sortColumn = getSortColumn(dataExplorer); if (sortColumn) { @@ -41,44 +33,31 @@ export class GroupsPanelMiddlewareService extends DataExplorerMiddlewareService sortColumn.sortDirection === SortDirection.ASC && sortColumn.name === GroupsPanelColumnNames.GROUP ? OrderDirection.ASC : OrderDirection.DESC; - order.addOrder(direction, 'name'); } - const filters = new FilterBuilder() - .addNotIn('groupClass', [GroupClass.PROJECT]) + .addNotIn('group_class', [GroupClass.PROJECT, GroupClass.FILTER]) .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('tail_uuid', response.items.map(item => item.uuid)) .getFilters() - }); - api.dispatch(updateResources(permissions.items)); - - } catch (e) { - api.dispatch(couldNotFetchFavoritesContents()); - } } }