From 54970f239795f4b957febefbc514572e0d19633c Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Mon, 26 Aug 2019 12:51:19 -0300 Subject: [PATCH] 15524: Shows groups names on sharing dialog's permission rows where applicable. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- src/store/sharing-dialog/sharing-dialog-actions.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/store/sharing-dialog/sharing-dialog-actions.ts b/src/store/sharing-dialog/sharing-dialog-actions.ts index 17b237ecc6..bbd50dbb34 100644 --- a/src/store/sharing-dialog/sharing-dialog-actions.ts +++ b/src/store/sharing-dialog/sharing-dialog-actions.ts @@ -74,19 +74,23 @@ const loadSharingDialog = async (dispatch: Dispatch, getState: () => RootState, }; const initializeManagementForm = (permissionLinks: PermissionResource[]) => - async (dispatch: Dispatch, getState: () => RootState, { userService }: ServiceRepository) => { + async (dispatch: Dispatch, getState: () => RootState, { userService, groupsService }: ServiceRepository) => { const filters = new FilterBuilder() .addIn('uuid', permissionLinks.map(({ tailUuid }) => tailUuid)) .getFilters(); const { items: users } = await userService.list({ filters }); + const { items: groups} = await groupsService.list({ filters }); const getEmail = (tailUuid: string) => { const user = users.find(({ uuid }) => uuid === tailUuid); + const group = groups.find(({ uuid }) => uuid === tailUuid); return user ? user.email - : tailUuid; + : group + ? group.name + : tailUuid; }; const managementPermissions = permissionLinks -- 2.39.5