journeycard canShowcase condition (keybase#22287)

* journeycard canShowcase condition * sort-keys disagrees with vscode ordering * canShowcase * imperative
lynsei · Jan 30, 2020 · e608c6d · e608c6d
1 parent 98a881e
commit e608c6d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/shared/chat/conversation/messages/cards/team-journey/container.tsx b/shared/chat/conversation/messages/cards/team-journey/container.tsx
@@ -19,6 +19,7 @@ type OwnProps = {
 }
 
 type Props = {
+  canShowcase: boolean
   cannotWrite: boolean
   channelname: string
   conversationIDKey: ChatTypes.ConversationIDKey
@@ -47,18 +48,22 @@ const TeamJourneyContainer = (props: Props) => {
 
   switch (props.message.cardType) {
     case RPCChatTypes.JourneycardType.welcome:
-      actions =
-        props.teamType === 'big'
-          ? [
-              {label: 'Browse channels', onClick: props.onBrowseChannels},
-              {label: 'Publish team on your profile', onClick: props.onPublishTeam},
-            ]
-          : [{label: 'Publish team on your profile', onClick: props.onPublishTeam}]
+      image = 'icon-illustration-welcome-96'
       if (!props.cannotWrite) {
-        actions.unshift('wave')
+        actions.push('wave')
       }
-      image = 'icon-illustration-welcome-96'
-      textComponent = (
+      if (props.teamType === 'big') {
+        actions.push({label: 'Browse channels', onClick: props.onBrowseChannels})
+      }
+      if (props.canShowcase) {
+        actions.push({label: 'Publish team on your profile', onClick: props.onPublishTeam})
+      }
+      textComponent = props.cannotWrite ? (
+        <Kb.Text type="BodySmall">
+          <Kb.Emoji allowFontScaling={true} size={Styles.globalMargins.small} emojiName=":wave:" /> Welcome to
+          the team!
+        </Kb.Text>
+      ) : (
         <Kb.Text type="BodySmall">
           <Kb.Emoji allowFontScaling={true} size={Styles.globalMargins.small} emojiName=":wave:" /> Welcome to
           the team! Say hi to everyone and introduce yourself.
@@ -164,6 +169,7 @@ const TeamJourneyConnected = Container.connect(
     return {
       _channelInfos: TeamConstants.getTeamChannelInfos(state, teamID),
       _teamID: teamID,
+      canShowcase: TeamConstants.canShowcase(state, teamID),
       cannotWrite: cannotWrite,
       channelname,
       conversationIDKey,
@@ -197,7 +203,7 @@ const TeamJourneyConnected = Container.connect(
       dispatch(RouteTreeGen.createNavigateAppend({path: [teamsTab, {props: {teamID}, selected: 'team'}]})),
   }),
   (stateProps, dispatchProps, ownProps) => {
-    const {cannotWrite, channelname, conversationIDKey, teamname, teamType} = stateProps
+    const {canShowcase, cannotWrite, channelname, conversationIDKey, teamname, teamType} = stateProps
     // Take the top three channels with most recent activity.
     const joinableStatuses = new Set([
       // keep in sync with journey_card_manager.go
@@ -218,6 +224,7 @@ const TeamJourneyConnected = Container.connect(
       .map(info => info.channelname)
 
     return {
+      canShowcase,
       cannotWrite,
       channelname,
       conversationIDKey,

diff --git a/shared/constants/teams.tsx b/shared/constants/teams.tsx
@@ -711,6 +711,11 @@ export const annotatedInvitesToInviteInfo = (
 export const getTeamDetails = (state: TypedState, teamID: Types.TeamID) =>
   state.teams.teamDetails.get(teamID) || emptyTeamDetails
 
+export const canShowcase = (state: TypedState, teamID: Types.TeamID) => {
+  const role = getRole(state, teamID)
+  return getTeamDetails(state, teamID).allowPromote || role === 'admin' || role === 'owner'
+}
+
 const _canUserPerformCache: {[key: string]: Types.TeamOperations} = {}
 const _canUserPerformCacheKey = (t: Types.TeamRoleAndDetails) => t.role + t.implicitAdmin
 const deriveCanPerform = (roleAndDetails?: Types.TeamRoleAndDetails): Types.TeamOperations => {