subteam wizard: misc fixes (keybase#23805)

shared/actions/json/teams.json

@@ -444,6 +444,9 @@
     "setTeamWizardSubteams": {
       "subteams": "Array<string>"
     },
+    "setTeamWizardSubteamMembers": {
+      "members": "Array<string>"
+    },
     "setTeamWizardError": {
       "error": "string"
     },

shared/actions/teams.tsx

@@ -1476,6 +1476,7 @@ const setTeamWizardAvatar = (state: TypedState) => {
       return RouteTreeGen.createNavigateAppend({path: [{selected: 'teamWizard4TeamSize'}]})
   }
 }
+const setTeamWizardSubteamMembers = () => RouteTreeGen.createNavigateAppend({path: ['teamAddToTeamConfirm']})
 const setTeamWizardTeamSize = (action: TeamsGen.SetTeamWizardTeamSizePayload) =>
   action.payload.isBig
     ? RouteTreeGen.createNavigateAppend({path: [{selected: 'teamWizard5Channels'}]})
@@ -1644,6 +1645,7 @@ const teamsSaga = function*() {
   yield* Saga.chainAction(TeamsGen.setTeamWizardTeamSize, setTeamWizardTeamSize)
   yield* Saga.chainAction(TeamsGen.setTeamWizardChannels, setTeamWizardChannels)
   yield* Saga.chainAction(TeamsGen.setTeamWizardSubteams, setTeamWizardSubteams)
+  yield* Saga.chainAction(TeamsGen.setTeamWizardSubteamMembers, setTeamWizardSubteamMembers)
   yield* Saga.chainAction2(TeamsGen.finishNewTeamWizard, finishNewTeamWizard)
   yield* Saga.chainAction(TeamsGen.finishedNewTeamWizard, finishedNewTeamWizard)
 

shared/reducers/teams.tsx

@@ -312,6 +312,14 @@ export default Container.makeReducer<Actions, Types.State>(initialState, {
   [TeamsGen.setTeamWizardSubteams]: (draftState, action) => {
     draftState.newTeamWizard.subteams = action.payload.subteams
   },
+  [TeamsGen.setTeamWizardSubteamMembers]: (draftState, action) => {
+    const {members} = action.payload
+    draftState.addMembersWizard = {
+      ...Constants.addMembersWizardEmptyState,
+      addingMembers: members.map(m => ({assertion: m, role: 'writer'})),
+      teamID: Types.newTeamWizardTeamID,
+    }
+  },
   [TeamsGen.setTeamWizardError]: (draftState, action) => {
     draftState.newTeamWizard.error = action.payload.error
   },

shared/teams/new-team/wizard/add-subteam-members.tsx

@@ -7,20 +7,25 @@ import * as Types from '../../../constants/types/teams'
 import * as Constants from '../../../constants/teams'
 import {pluralize} from '../../../util/string'
 import * as RouteTreeGen from '../../../actions/route-tree-gen'
+import * as TeamsGen from '../../../actions/teams-gen'
 import {useTeamDetailsSubscribe} from '../../subscriber'
 
 const AddSubteamMembers = () => {
   const dispatch = Container.useDispatch()
   const nav = Container.useSafeNavigation()
 
-  const onBack = () => dispatch(nav.safeNavigateUpPayload())
-  const onClose = () => dispatch(RouteTreeGen.createClearModals())
-  const onContinue = () => {} // TODO
-
   const [selectedMembers, setSelectedMembers] = React.useState(new Set<string>())
   const [filter, setFilter] = React.useState('')
   const filterL = filter.toLowerCase()
 
+  const onBack = () => dispatch(nav.safeNavigateUpPayload())
+  const onClose = () => dispatch(RouteTreeGen.createClearModals())
+  const onContinue = () =>
+    selectedMembers.size
+      ? dispatch(TeamsGen.createSetTeamWizardSubteamMembers({members: [...selectedMembers]}))
+      : dispatch(TeamsGen.createStartAddMembersWizard({teamID: Types.newTeamWizardTeamID}))
+
+  const yourUsername = Container.useSelector(state => state.config.username)
   const parentTeamID = Container.useSelector(
     state => state.teams.newTeamWizard.parentTeamID ?? Types.noTeamID
   )
@@ -29,7 +34,9 @@ const AddSubteamMembers = () => {
   const parentMembersMap = Container.useSelector(
     state => Constants.getTeamDetails(state, parentTeamID).members
   )
-  const parentMembers = [...parentMembersMap.values()].filter(m => !Constants.isBot(m.type))
+  const parentMembers = [...parentMembersMap.values()].filter(
+    m => !Constants.isBot(m.type) && m.username !== yourUsername
+  )
   const filteredMembers = filter
     ? parentMembers.filter(
         m => m.username.toLowerCase().includes(filterL) || m.fullName.toLowerCase().includes(filterL)

shared/teams/new-team/wizard/new-team-info.tsx

@@ -37,6 +37,7 @@ const NewTeamInfo = () => {
       ? Constants.getTeamNameFromID(state, teamWizardState.parentTeamID)
       : undefined
   )
+  const minLength = parentName ? 2 : 3
 
   const [name, _setName] = React.useState(teamWizardState.name)
   const teamname = parentName ? `${parentName}.${name}` : name
@@ -51,7 +52,7 @@ const NewTeamInfo = () => {
     []
   )
   React.useEffect(() => {
-    if (name.length >= 3) {
+    if (name.length >= minLength) {
       checkTeamNameTaken(
         [{teamName: {parts: teamname.split('.')}}],
         ({exists, status}) => {
@@ -64,7 +65,7 @@ const NewTeamInfo = () => {
       setTeamNameTaken(false)
       setTeamNameTakenStatus(0)
     }
-  }, [teamname, name.length, setTeamNameTaken, checkTeamNameTaken, setTeamNameTakenStatus])
+  }, [teamname, name.length, setTeamNameTaken, checkTeamNameTaken, setTeamNameTakenStatus, minLength])
 
   const [description, setDescription] = React.useState(teamWizardState.description)
   const [openTeam, _setOpenTeam] = React.useState(
@@ -85,7 +86,7 @@ const NewTeamInfo = () => {
   const [selectedRole, setSelectedRole] = React.useState<Types.TeamRoleType>(teamWizardState.openTeamJoinRole)
   const [rolePickerIsOpen, setRolePickerIsOpen] = React.useState(false)
 
-  const continueDisabled = rolePickerIsOpen || teamNameTaken || name.length < 3
+  const continueDisabled = rolePickerIsOpen || teamNameTaken || name.length < minLength
 
   const onBack = () => dispatch(nav.safeNavigateUpPayload())
   const onClose = () => dispatch(RouteTreeGen.createClearModals())