Skip to content

Commit

Permalink
Make role picker nicer (keybase#23618)
Browse files Browse the repository at this point in the history
* fancy role picker

* stories

* danny feedback

* stories ???\

* stories
  • Loading branch information
aaazalea authored Apr 15, 2020
1 parent c9de11b commit 79ea592
Show file tree
Hide file tree
Showing 13 changed files with 4,796 additions and 1,799 deletions.
5 changes: 5 additions & 0 deletions shared/__mocks__/react-spring.tsx
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
export const Spring = () => null
export const useSpring = <T extends {}>(c: {config?: any} & T) => {
const {config, ...rest} = c
return rest
}
export const animated = x => x
4 changes: 2 additions & 2 deletions shared/actions/json/teams.json
Original file line number Diff line number Diff line change
Expand Up @@ -366,12 +366,12 @@
},
"setAddMembersWizardRole": {
"_description": "Set the role for the add members wizard.",
"role": ["Types.TeamRoleType", "undefined"]
"role": ["Types.AddingMemberTeamRoleType", "'setIndividually'"]
},
"setAddMembersWizardIndividualRole": {
"_description": "Set the role for a pending member in the add member wizard.",
"assertion": "string",
"role": "Types.TeamRoleType"
"role": "Types.AddingMemberTeamRoleType"
},
"addMembersWizardPushMembers": {
"_description": "Add pending members to the add members wizard and show the confirm screen.",
Expand Down
4 changes: 2 additions & 2 deletions shared/actions/teams-gen.tsx

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

6 changes: 4 additions & 2 deletions shared/constants/types/teams.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -181,16 +181,18 @@ export type NewTeamWizardState = {
error?: string
}

export type AddingMemberTeamRoleType = 'owner' | 'admin' | 'reader' | 'writer'

export type AddingMember = {
assertion: string
role: TeamRoleType
role: AddingMemberTeamRoleType
note?: string // note is for imp tofu assertions that got turned into usernames. It doesn't go to the server but it displays to the user in the confirm screen.
}
export type AddMembersWizardState = {
addingMembers: Array<AddingMember>
defaultChannels: Array<ChannelNameID> | undefined // undefined -> unchanged from default
justFinished: boolean
role: TeamRoleType | undefined // undefined -> role set individually
role: AddingMemberTeamRoleType | 'setIndividually'
teamID: TeamID
}

Expand Down
2 changes: 1 addition & 1 deletion shared/reducers/teams.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ export default Container.makeReducer<Actions, Types.State>(initialState, {
[TeamsGen.setAddMembersWizardRole]: (draftState, action) => {
const {role} = action.payload
draftState.addMembersWizard.role = role
if (role) {
if (role !== 'setIndividually') {
// keep roles stored with indiv members in sync with top level one
draftState.addMembersWizard.addingMembers.forEach(member => {
member.role = role
Expand Down
Loading

0 comments on commit 79ea592

Please sign in to comment.