container removal (#28616)

Author: chrisnojima-zoom

shared/chat/blocking/block-modal/index.tsx renamed to shared/chat/blocking/block-modal.tsx

@@ -1,6 +1,8 @@
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
 import * as Styles from '@/styles'
+import * as C from '@/constants'
+import * as Constants from '@/constants/users'
 
 // Type for extra RouteProp passed to block modal sometimes when launching the
 // modal from specific places from the app.
@@ -35,6 +37,18 @@ export type Props = {
   teamname?: string
 }
 
+type OwnProps = {
+  blockUserByDefault?: boolean
+  filterUserByDefault?: boolean
+  flagUserByDefault?: boolean
+  reportsUserByDefault?: boolean
+  context?: BlockModalContext
+  conversationIDKey?: string
+  others?: Array<string>
+  team?: string
+  username?: string
+}
+
 type CheckboxRowProps = {
   checked: boolean
   disabled?: boolean
@@ -407,7 +421,118 @@ const BlockModal = React.memo(function BlockModal(p: Props) {
   )
 })
 
-export default BlockModal
+const Container = (ownProps: OwnProps) => {
+  const {context, conversationIDKey, blockUserByDefault = false, filterUserByDefault = false} = ownProps
+  const {flagUserByDefault = false, reportsUserByDefault = false, team: teamname} = ownProps
+  let {username: adderUsername, others} = ownProps
+  const waitingForLeave = C.Waiting.useAnyWaiting(
+    teamname ? C.Teams.leaveTeamWaitingKey(teamname) : undefined
+  )
+  const waitingForBlocking = C.Waiting.useAnyWaiting(Constants.setUserBlocksWaitingKey)
+  const waitingForReport = C.Waiting.useAnyWaiting(Constants.reportUserWaitingKey)
+  if (others?.length === 1 && !adderUsername) {
+    adderUsername = others[0]
+    others = undefined
+  }
+
+  const _allKnownBlocks = C.useUsersState(s => s.blockMap)
+  const loadingWaiting = C.Waiting.useAnyWaiting(Constants.getUserBlocksWaitingKey)
+
+  const onClose = C.useRouterState(s => s.dispatch.navigateUp)
+  const leaveTeam = C.useTeamsState(s => s.dispatch.leaveTeam)
+  const leaveTeamAndBlock = React.useCallback(
+    (teamname: string) => {
+      leaveTeam(teamname, true, 'chat')
+    },
+    [leaveTeam]
+  )
+  const getBlockState = C.useUsersState(s => s.dispatch.getBlockState)
+  const _reportUser = C.useUsersState(s => s.dispatch.reportUser)
+  const refreshBlocksFor = getBlockState
+  const reportUser = React.useCallback(
+    (username: string, conversationIDKey: string | undefined, report: ReportSettings) => {
+      _reportUser({
+        comment: report.extraNotes,
+        conversationIDKey,
+        includeTranscript: report.includeTranscript && !!conversationIDKey,
+        reason: report.reason,
+        username,
+      })
+    },
+    [_reportUser]
+  )
+  const setConversationStatus = C.useChatContext(s => s.dispatch.blockConversation)
+  const _setUserBlocks = C.useUsersState(s => s.dispatch.setUserBlocks)
+  const setUserBlocks = React.useCallback(
+    (newBlocks: NewBlocksMap) => {
+      // Convert our state block array to action payload.
+      const blocks = [...newBlocks.entries()]
+        .filter(
+          ([_, userBlocks]) => userBlocks.chatBlocked !== undefined || userBlocks.followBlocked !== undefined
+        )
+        .map(([username, userBlocks]) => ({
+          setChatBlock: userBlocks.chatBlocked,
+          setFollowBlock: userBlocks.followBlocked,
+          username,
+        }))
+      if (blocks.length) {
+        _setUserBlocks(blocks)
+      }
+    },
+    [_setUserBlocks]
+  )
+
+  const otherUsernames = others && others.length > 0 ? others : undefined
+  const props = {
+    adderUsername,
+    blockUserByDefault,
+    context,
+    conversationIDKey,
+    filterUserByDefault,
+    finishWaiting: waitingForLeave || waitingForBlocking || waitingForReport,
+    flagUserByDefault,
+    isBlocked: (username: string, which: BlockType) => {
+      const blockObj = _allKnownBlocks.get(username)
+      return blockObj ? blockObj[which] : false
+    },
+    loadingWaiting,
+    onClose,
+    onFinish: (newBlocks: NewBlocksMap, blockTeam: boolean) => {
+      let takingAction = false
+      if (blockTeam) {
+        if (teamname) {
+          takingAction = true
+          leaveTeamAndBlock(teamname)
+        } else if (conversationIDKey) {
+          takingAction = true
+          const anyReported = [...newBlocks.values()].some(v => v.report !== undefined)
+          setConversationStatus(anyReported)
+        }
+      }
+      if (newBlocks.size) {
+        takingAction = true
+        setUserBlocks(newBlocks)
+      }
+      newBlocks.forEach(({report}, username) => report && reportUser(username, conversationIDKey, report))
+      if (!takingAction) {
+        onClose()
+      }
+    },
+    otherUsernames,
+    refreshBlocks: () => {
+      const usernames = [...(adderUsername ? [adderUsername] : []), ...(otherUsernames || [])]
+      if (usernames.length) {
+        refreshBlocksFor(usernames)
+      }
+    },
+    reportsUserByDefault,
+    teamname,
+  }
+
+  return <BlockModal {...props} />
+}
+
+export default Container
 
 const getListHeightStyle = (numOthers: number, expanded: boolean) => ({
   height:

shared/chat/blocking/block-modal/container.tsx

@@ -1,10 +1,10 @@
 import * as C from '@/constants'
 import * as Kb from '@/common-adapters'
 import * as Styles from '@/styles'
-import * as Container from '@/util/container'
+import {useSafeNavigation} from '@/util/safe-navigation'
 
 const BlockButtons = () => {
-  const nav = Container.useSafeNavigation()
+  const nav = useSafeNavigation()
   const conversationIDKey = C.useChatContext(s => s.id)
 
   const team = C.useChatContext(s => s.meta.teamname)

shared/chat/blocking/invitation-to-block.tsx

@@ -2,7 +2,7 @@ import * as C from '@/constants'
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
 import * as Styles from '@/styles'
-import * as Container from '@/util/container'
+import {useSafeNavigation} from '@/util/safe-navigation'
 import * as T from '@/constants/types'
 import {useTeamDetailsSubscribe} from '@/teams/subscriber'
 import {pluralize} from '@/util/string'
@@ -12,7 +12,7 @@ type Props = {teamID: T.Teams.TeamID}
 
 const AddToChannel = (props: Props) => {
   const {teamID} = props
-  const nav = Container.useSafeNavigation()
+  const nav = useSafeNavigation()
   const conversationIDKey = C.useChatContext(s => s.id)
 
   const [toAdd, setToAdd] = React.useState<Set<string>>(new Set())

shared/chat/conversation/info-panel/add-to-channel.tsx

@@ -4,7 +4,7 @@ import * as T from '@/constants/types'
 import * as React from 'react'
 import MinWriterRole from './min-writer-role'
 import Notifications from './notifications'
-import RetentionPicker from '@/teams/team/settings-tab/retention/container'
+import RetentionPicker from '@/teams/team/settings-tab/retention'
 
 type EntityType = 'adhoc' | 'small team' | 'channel'
 type SettingsPanelProps = {isPreview: boolean}

shared/chat/conversation/info-panel/settings/index.tsx

@@ -1,4 +1,5 @@
 import * as Kb from '@/common-adapters'
+import * as C from '@/constants'
 
 type Props = {
   onCancel: () => void
@@ -85,4 +86,22 @@ const styles = Kb.Styles.styleSheetCreate(
     }) as const
 )
 
-export default DeleteHistoryWarning
+const Container = () => {
+  const navigateUp = C.useRouterState(s => s.dispatch.navigateUp)
+  const onCancel = () => {
+    navigateUp()
+  }
+  const clearModals = C.useRouterState(s => s.dispatch.clearModals)
+  const messageDeleteHistory = C.useChatContext(s => s.dispatch.messageDeleteHistory)
+  const onDeleteHistory = () => {
+    clearModals()
+    messageDeleteHistory()
+  }
+  const props = {
+    onCancel,
+    onDeleteHistory,
+  }
+  return <DeleteHistoryWarning {...props} />
+}
+
+export default Container

shared/chat/delete-history-warning/index.tsx renamed to shared/chat/delete-history-warning.tsx

@@ -1,10 +1,10 @@
 import * as C from '@/constants'
 import * as React from 'react'
 import * as Kb from '@/common-adapters'
-import * as Container from '@/util/container'
+import {useSafeNavigation} from '@/util/safe-navigation'
 
 const BuildTeam = React.memo(function BuildTeam() {
-  const nav = Container.useSafeNavigation()
+  const nav = useSafeNavigation()
   const launchNewTeamWizardOrModal = C.useTeamsState(s => s.dispatch.launchNewTeamWizardOrModal)
   const switchTab = C.useRouterState(s => s.dispatch.switchTab)
   const onCreateTeam = () => {

shared/chat/delete-history-warning/container.tsx

@@ -1,5 +1,5 @@
 import * as C from '@/constants'
-import NewTeamDialog from '../teams/new-team'
+import {CreateNewTeam} from '../teams/new-team'
 import upperFirst from 'lodash/upperFirst'
 
 const Container = () => {
@@ -23,7 +23,7 @@ const Container = () => {
     onClearError,
     onSubmit,
   }
-  return <NewTeamDialog {...props} />
+  return <CreateNewTeam {...props} />
 }
 
 export default Container