From eef287410add9414413e19be236e6f422eeb3e7c Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Fri, 14 Aug 2020 14:49:03 -0400 Subject: [PATCH] 16683: Tweak other calls to user listing to work with federated users Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- ...ollections-content-address-middleware-service.ts | 13 ++++++------- .../data-explorer-middleware-service.ts | 1 + .../group-details-panel-middleware-service.ts | 3 ++- src/store/users/users-actions.ts | 2 +- .../sharing-dialog/participant-select.tsx | 6 +++--- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/store/collections-content-address-panel/collections-content-address-middleware-service.ts b/src/store/collections-content-address-panel/collections-content-address-middleware-service.ts index 72da1d2e..a68d13bd 100644 --- a/src/store/collections-content-address-panel/collections-content-address-middleware-service.ts +++ b/src/store/collections-content-address-panel/collections-content-address-middleware-service.ts @@ -77,25 +77,24 @@ export class CollectionsWithSameContentAddressMiddlewareService extends DataExpl } }); const responseUsers = await this.services.userService.list({ - limit: dataExplorer.rowsPerPage, - offset: dataExplorer.page * dataExplorer.rowsPerPage, filters: new FilterBuilder() .addIn('uuid', userUuids) - .getFilters() + .getFilters(), + count: "none" }); const responseGroups = await this.services.groupsService.list({ - limit: dataExplorer.rowsPerPage, - offset: dataExplorer.page * dataExplorer.rowsPerPage, filters: new FilterBuilder() .addIn('uuid', groupUuids) - .getFilters() + .getFilters(), + count: "none" }); responseUsers.items.map(it => { api.dispatch(ownerNameActions.SET_OWNER_NAME({ name: it.uuid === userUuid ? 'User: Me' : `User: ${getUserDisplayName(it)}`, - uuid: it.uuid })); + uuid: it.uuid + })); }); responseGroups.items.map(it => { api.dispatch(ownerNameActions.SET_OWNER_NAME({ name: `Project: ${it.name}`, uuid: it.uuid })); diff --git a/src/store/data-explorer/data-explorer-middleware-service.ts b/src/store/data-explorer/data-explorer-middleware-service.ts index 219e7603..a7c32f42 100644 --- a/src/store/data-explorer/data-explorer-middleware-service.ts +++ b/src/store/data-explorer/data-explorer-middleware-service.ts @@ -36,6 +36,7 @@ export const getDataExplorerColumnFilters = (columns: DataColumns, columnN export const dataExplorerToListParams = (dataExplorer: DataExplorer) => ({ limit: dataExplorer.rowsPerPage, offset: dataExplorer.page * dataExplorer.rowsPerPage, + count: "none" }); export const listResultsToDataExplorerItemsMeta = ({ itemsAvailable, offset, limit }: ListResults) => ({ diff --git a/src/store/group-details-panel/group-details-panel-middleware-service.ts b/src/store/group-details-panel/group-details-panel-middleware-service.ts index 94f78a58..5aff4e7b 100644 --- a/src/store/group-details-panel/group-details-panel-middleware-service.ts +++ b/src/store/group-details-panel/group-details-panel-middleware-service.ts @@ -36,7 +36,8 @@ export class GroupDetailsPanelMiddlewareService extends DataExplorerMiddlewareSe const users = await this.services.userService.list({ filters: new FilterBuilder() .addIn('uuid', permissions.items.map(item => item.headUuid)) - .getFilters() + .getFilters(), + count: "none" }); api.dispatch(GroupDetailsPanelActions.SET_ITEMS({ ...listResultsToDataExplorerItemsMeta(permissions), diff --git a/src/store/users/users-actions.ts b/src/store/users/users-actions.ts index 7b12fe75..8f696fa2 100644 --- a/src/store/users/users-actions.ts +++ b/src/store/users/users-actions.ts @@ -157,7 +157,7 @@ export const userBindedActions = bindDataExplorerActions(USERS_PANEL_ID); export const loadUsersData = () => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - await services.userService.list(); + await services.userService.list({ count: "none" }); }; export const loadUsersPanel = () => diff --git a/src/views-components/sharing-dialog/participant-select.tsx b/src/views-components/sharing-dialog/participant-select.tsx index 5d062da0..ea3775e9 100644 --- a/src/views-components/sharing-dialog/participant-select.tsx +++ b/src/views-components/sharing-dialog/participant-select.tsx @@ -41,7 +41,7 @@ interface ParticipantSelectState { } const getDisplayName = (item: GroupResource & UserResource) => { - switch(item.kind) { + switch (item.kind) { case ResourceKind.USER: return getUserDisplayName(item, true); case ResourceKind.GROUP: @@ -131,14 +131,14 @@ export const ParticipantSelect = connect()( const filterUsers = new FilterBuilder() .addILike('any', value) .getFilters(); - const userItems: ListResults = await userService.list({ filters: filterUsers, limit }); + const userItems: ListResults = await userService.list({ filters: filterUsers, limit, count: "none" }); const filterGroups = new FilterBuilder() .addNotIn('group_class', [GroupClass.PROJECT]) .addILike('name', value) .getFilters(); - const groupItems: ListResults = await groupsService.list({ filters: filterGroups, limit }); + const groupItems: ListResults = await groupsService.list({ filters: filterGroups, limit, count: "none" }); this.setState({ suggestions: this.props.onlyPeople ? userItems.items -- 2.30.2