X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/88f16d1a87decacf3dc395126912684ed90dc16f..a48138fa7227595bba0db267a4c37832cba9afa2:/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 0b6f89b539..b5ef51b765 100644 --- a/src/store/groups-panel/groups-panel-middleware-service.ts +++ b/src/store/groups-panel/groups-panel-middleware-service.ts @@ -7,12 +7,12 @@ import { DataExplorerMiddlewareService, listResultsToDataExplorerItemsMeta, data 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 { 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 } from '~/models/group'; +import { GroupResource, GroupClass } from '~/models/group'; import { SortDirection } from '~/components/data-table/data-column'; import { GroupsPanelColumnNames } from '~/views/groups-panel/groups-panel'; @@ -46,7 +46,7 @@ export class GroupsPanelMiddlewareService extends DataExplorerMiddlewareService } const filters = new FilterBuilder() - .addEqual('groupClass', null) + .addNotIn('groupClass', [GroupClass.PROJECT]) .addILike('name', dataExplorer.searchValue) .getFilters(); @@ -64,6 +64,16 @@ export class GroupsPanelMiddlewareService extends DataExplorerMiddlewareService 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)) + .getFilters() + + }); + + api.dispatch(updateResources(permissions.items)); + } catch (e) { @@ -76,7 +86,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 = () =>