Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hook up teamEditMembers for editing multi members #24054

Merged
merged 5 commits into from May 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion protocol/bin/enabled-calls.json
Expand Up @@ -317,7 +317,7 @@
"keybase.1.teams.teamCreateSeitanInvitelinkWithDuration": {"promise": true},
"keybase.1.teams.teamCreateSeitanTokenV2": {"promise": true},
"keybase.1.teams.teamDelete": {"engineSaga": true, "promise": true},
"keybase.1.teams.teamEditMember": {"promise": true},
"keybase.1.teams.teamEditMembers": {"promise": true},
"keybase.1.teams.teamGet": {"promise": true},
"keybase.1.teams.teamGetByID": {"promise": true},
"keybase.1.teams.teamGetMembers": {"promise": true},
Expand Down
3 changes: 2 additions & 1 deletion shared/actions/json/teams.json
Expand Up @@ -203,8 +203,9 @@
"teamname": "string"
},
"editMembership": {
"_description": "Edit the role of one or more members in a team",
"teamID": "Types.TeamID",
"username": "string",
"usernames": "Array<string>",
"role": "Types.TeamRoleType"
},
"removeMember": {
Expand Down
13 changes: 8 additions & 5 deletions shared/actions/teams-gen.tsx

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 12 additions & 9 deletions shared/actions/teams.tsx
Expand Up @@ -452,19 +452,22 @@ const uploadAvatar = async (action: TeamsGen.UploadTeamAvatarPayload, logger: Sa
}
}

const editMembership = async (state: TypedState, action: TeamsGen.EditMembershipPayload) => {
const {teamID, username, role} = action.payload
const editMembership = async (action: TeamsGen.EditMembershipPayload) => {
const {teamID, usernames, role: _role} = action.payload
const role = _role ? RPCTypes.TeamRole[_role] : RPCTypes.TeamRole.none
try {
await RPCTypes.teamsTeamEditMemberRpcPromise(
await RPCTypes.teamsTeamEditMembersRpcPromise(
{
name: Constants.getTeamNameFromID(state, teamID) ?? '',
role: role ? RPCTypes.TeamRole[role] : RPCTypes.TeamRole.none,
username,
teamID,
users: usernames.map(assertion => ({assertion, role})),
},
[Constants.teamWaitingKey(teamID), Constants.editMembershipWaitingKey(teamID, username)]
[Constants.teamWaitingKey(teamID), Constants.editMembershipWaitingKey(teamID, ...usernames)]
)
} catch (e) {
return TeamsGen.createSetEditMemberError({error: e.message, teamID, username})
if (usernames.length === 1) {
// error is shown in the member page
return TeamsGen.createSetEditMemberError({error: e.message, teamID, username: usernames[0]})
}
}
return false
}
Expand Down Expand Up @@ -1697,7 +1700,7 @@ const teamsSaga = function*() {
yield* Saga.chainAction(TeamsGen.editTeamDescription, editDescription)
yield* Saga.chainAction(TeamsGen.uploadTeamAvatar, uploadAvatar)
yield* Saga.chainAction2(TeamsGen.createChannels, createChannels)
yield* Saga.chainAction2(TeamsGen.editMembership, editMembership)
yield* Saga.chainAction(TeamsGen.editMembership, editMembership)
yield* Saga.chainGenerator<TeamsGen.RemoveMemberPayload>(TeamsGen.removeMember, removeMember)
yield* Saga.chainGenerator<TeamsGen.RemovePendingInvitePayload>(
TeamsGen.removePendingInvite,
Expand Down
4 changes: 2 additions & 2 deletions shared/constants/teams.tsx
Expand Up @@ -51,8 +51,8 @@ export const loadWelcomeMessageWaitingKey = (teamID: Types.TeamID) => `loadWelco
export const setWelcomeMessageWaitingKey = (teamID: Types.TeamID) => `setWelcomeMessage:${teamID}`
export const loadTeamTreeActivityWaitingKey = (teamID: Types.TeamID, username: string) =>
`loadTeamTreeActivity:${teamID};${username}`
export const editMembershipWaitingKey = (teamID: Types.TeamID, username: string) =>
`editMembership:${teamID};${username}`
export const editMembershipWaitingKey = (teamID: Types.TeamID, ...usernames: Array<string>) =>
`editMembership:${teamID};${usernames.join(',')}`
export const updateChannelNameWaitingKey = (teamID: Types.TeamID) => `updateChannelName:${teamID}`

export const initialMemberInfo = Object.freeze<Types.MemberInfo>({
Expand Down
10 changes: 5 additions & 5 deletions shared/constants/types/rpc-gen.tsx

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions shared/teams/common/selection-popup.tsx
Expand Up @@ -286,9 +286,7 @@ const EditRoleButton = ({members, teamID}: {teamID: Types.TeamID; members: strin

const [showingPicker, setShowingPicker] = React.useState(false)

const waiting = Container.useAnyWaiting(
...members.map(username => Constants.editMembershipWaitingKey(teamID, username))
)
const waiting = Container.useAnyWaiting(Constants.editMembershipWaitingKey(teamID, ...members))

// We wait for the teamLoaded action
const waitForTeamLoaded = React.useCallback((a: Container.TypedActions) => {
Expand All @@ -302,8 +300,8 @@ const EditRoleButton = ({members, teamID}: {teamID: Types.TeamID; members: strin
Constants.getDisabledReasonsForRolePicker(state, teamID, members)
)
const disableButton = disabledReasons.admin !== undefined
const onChangeRoles = role =>
members.forEach(username => dispatch(TeamsGen.createEditMembership({role, teamID, username})))
const onChangeRoles = (role: Types.TeamRoleType) =>
dispatch(TeamsGen.createEditMembership({role, teamID, usernames: members}))

return (
<FloatingRolePicker
Expand Down
2 changes: 1 addition & 1 deletion shared/teams/team/member/container.tsx
Expand Up @@ -71,7 +71,7 @@ export default Container.connect(
dispatch(Chat2Gen.createPreviewConversation({participants: [username], reason: 'memberView'}))
},
_onEditRole: (teamID: Types.TeamID, username: string, role: Types.TeamRoleType) =>
dispatch(TeamsGen.createEditMembership({role, teamID, username})),
dispatch(TeamsGen.createEditMembership({role, teamID, usernames: [username]})),
_onRemoveMember: (teamID: Types.TeamID, username: string) => {
dispatch(
RouteTreeGen.createNavigateAppend({
Expand Down
2 changes: 1 addition & 1 deletion shared/teams/team/member/index.new.tsx
Expand Up @@ -505,7 +505,7 @@ const NodeInRow = (props: NodeInRowProps) => {
const [open, setOpen] = React.useState(false)
const onChangeRole = (role: Types.TeamRoleType) => {
setRole(role)
dispatch(TeamsGen.createEditMembership({role, teamID: props.node.teamID, username: props.username}))
dispatch(TeamsGen.createEditMembership({role, teamID: props.node.teamID, usernames: [props.username]}))
setOpen(false)
if (['reader, writer'].includes(role) && props.isParentTeamMe) {
dispatch(nav.safeNavigateUpPayload())
Expand Down