X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d4b18e45f319eb0885442ab1b64a01683630e38b..5620b9c4236bab9e9c98b6a4e955498823de4136:/src/store/group-details-panel/group-details-panel-actions.ts diff --git a/src/store/group-details-panel/group-details-panel-actions.ts b/src/store/group-details-panel/group-details-panel-actions.ts index 4ad0159447..b2a7280720 100644 --- a/src/store/group-details-panel/group-details-panel-actions.ts +++ b/src/store/group-details-panel/group-details-panel-actions.ts @@ -6,7 +6,7 @@ import { bindDataExplorerActions } from '~/store/data-explorer/data-explorer-act import { Dispatch } from 'redux'; import { propertiesActions } from '~/store/properties/properties-actions'; import { getProperty } from '~/store/properties/properties'; -import { Person } from '~/views-components/sharing-dialog/people-select'; +import { Participant } from '~/views-components/sharing-dialog/participant-select'; import { dialogActions } from '~/store/dialog/dialog-actions'; import { reset, startSubmit } from 'redux-form'; import { addGroupMember, deleteGroupMember } from '~/store/groups-panel/groups-panel-actions'; @@ -15,9 +15,8 @@ import { GroupResource } from '~/models/group'; import { RootState } from '~/store/store'; import { ServiceRepository } from '~/services/services'; import { PermissionResource } from '~/models/permission'; -import { GroupDetailsPanel } from '~/views/group-details-panel/group-details-panel'; import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions'; -import { UserResource, getUserFullname } from '~/models/user'; +import { UserResource, getUserDisplayName } from '~/models/user'; export const GROUP_DETAILS_PANEL_ID = 'groupDetailsPanel'; export const ADD_GROUP_MEMBERS_DIALOG = 'addGrupMembers'; @@ -37,7 +36,7 @@ export const loadGroupDetailsPanel = (groupUuid: string) => export const getCurrentGroupDetailsPanelUuid = getProperty(GROUP_DETAILS_PANEL_ID); export interface AddGroupMembersFormData { - [ADD_GROUP_MEMBERS_USERS_FIELD_NAME]: Person[]; + [ADD_GROUP_MEMBERS_USERS_FIELD_NAME]: Participant[]; } export const openAddGroupMembersDialog = () => @@ -109,12 +108,12 @@ export const removeGroupMember = (uuid: string) => const group = getResource(groupUuid)(getState().resources); const user = getResource(groupUuid)(getState().resources); - dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Removing ...' })); + dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Removing ...', kind: SnackbarKind.INFO })); await deleteGroupMember({ user: { uuid, - name: user ? getUserFullname(user) : uuid, + name: user ? getUserDisplayName(user) : uuid, }, group: { uuid: groupUuid,