hide manage bot functionality for non-admins

go/teams/service_helper.go

@@ -1898,6 +1898,7 @@ func CanUserPerform(ctx context.Context, g *libkb.GlobalContext, teamname string
 	ret.ChangeOpenTeam = isAdmin || isImplicitAdmin
 	ret.ChangeTarsDisabled = isAdmin || isImplicitAdmin
 	ret.EditTeamDescription = isAdmin || isImplicitAdmin
+	ret.ManageBots = isAdmin || isImplicitAdmin
 	ret.SetMemberShowcase, err = canMemberShowcase()
 	if err != nil {
 		return ret, err

protocol/avdl/keybase1/teams.avdl

@@ -1341,6 +1341,7 @@ protocol teams {
     boolean deleteOtherMessages;
     boolean deleteTeam;
     boolean pinMessage;
+    boolean manageBots;
   }
 
   record ProfileTeamLoadRes {

shared/chat/conversation/bot/install.tsx

@@ -8,6 +8,7 @@ import * as Chat2Gen from '../../../actions/chat2-gen'
 import * as WaitingGen from '../../../actions/waiting-gen'
 import * as Types from '../../../constants/types/chat2'
 import * as TeamTypes from '../../../constants/types/teams'
+import * as TeamConstants from '../../../constants/teams'
 import * as Constants from '../../../constants/chat2'
 import * as RPCTypes from '../../../constants/types/rpc-gen'
 
@@ -56,11 +57,16 @@ const InstallBotPopup = (props: Props) => {
   const [installWithCommands, setInstallWithCommands] = React.useState(true)
   const [installWithMentions, setInstallWithMentions] = React.useState(true)
   const [installWithRestrict, setInstallWithRestrict] = React.useState(true)
-  const {commands, featured, inTeam, inTeamUnrestricted, settings} = Container.useSelector(
+  const {commands, featured, inTeam, inTeamUnrestricted, readOnly, settings} = Container.useSelector(
     (state: Container.TypedState) => {
       let inTeam: boolean | undefined
       let teamRole: TeamTypes.TeamRoleType | null | undefined
+      let readOnly = false
       if (conversationIDKey) {
+        const meta = state.chat2.metaMap.get(conversationIDKey)
+        if (meta && meta.teamname) {
+          readOnly = !TeamConstants.getCanPerform(state, meta.teamname).manageBots
+        }
         teamRole = state.chat2.botTeamRoleInConvMap.get(conversationIDKey)?.get(botUsername)
         if (teamRole !== undefined) {
           inTeam = !!teamRole
@@ -71,6 +77,7 @@ const InstallBotPopup = (props: Props) => {
         featured: state.chat2.featuredBotsMap.get(botUsername),
         inTeam,
         inTeamUnrestricted: inTeam && teamRole === 'bot',
+        readOnly,
         settings: conversationIDKey
           ? state.chat2.botSettings.get(conversationIDKey)?.get(botUsername) ?? undefined
           : undefined,
@@ -150,7 +157,7 @@ const InstallBotPopup = (props: Props) => {
     }
   }, [conversationIDKey, inTeam])
 
-  const restrictPicker = !inTeam && (
+  const restrictPicker = !inTeam && !readOnly && (
     <Kb.Box2 direction="vertical" fullWidth={true} gap="tiny">
       <Kb.Text type="BodyBigExtrabold">Install as:</Kb.Text>
       <Kb.Box2 direction="vertical" fullWidth={true} gap="tiny">
@@ -348,37 +355,41 @@ const InstallBotPopup = (props: Props) => {
       header={{
         leftButton: (
           <Kb.Text type="BodyBigLink" onClick={onClose}>
-            {installScreen ? 'Back' : inTeam ? 'Close' : 'Cancel'}
+            {installScreen ? 'Back' : inTeam || readOnly ? 'Close' : 'Cancel'}
           </Kb.Text>
         ),
         title: '',
       }}
-      footer={{
-        content: enabled && (
-          <Kb.Box2 direction="vertical" gap="tiny" fullWidth={true}>
-            <Kb.ButtonBar direction="column">
-              {editButton}
-              {saveButton}
-              {reviewButton}
-              {installButton}
-              {removeButton}
-            </Kb.ButtonBar>
-            {!!error && (
-              <Kb.Text type="Body" style={{color: Styles.globalColors.redDark}}>
-                {'Something went wrong! Please try again, or send '}
-                <Kb.Text
-                  type="Body"
-                  style={{color: Styles.globalColors.redDark}}
-                  underline={true}
-                  onClick={onFeedback}
-                >
-                  {'feedback'}
-                </Kb.Text>
-              </Kb.Text>
-            )}
-          </Kb.Box2>
-        ),
-      }}
+      footer={
+        enabled && !readOnly
+          ? {
+              content: (
+                <Kb.Box2 direction="vertical" gap="tiny" fullWidth={true}>
+                  <Kb.ButtonBar direction="column">
+                    {editButton}
+                    {saveButton}
+                    {reviewButton}
+                    {installButton}
+                    {removeButton}
+                  </Kb.ButtonBar>
+                  {!!error && (
+                    <Kb.Text type="Body" style={{color: Styles.globalColors.redDark}}>
+                      {'Something went wrong! Please try again, or send '}
+                      <Kb.Text
+                        type="Body"
+                        style={{color: Styles.globalColors.redDark}}
+                        underline={true}
+                        onClick={onFeedback}
+                      >
+                        {'feedback'}
+                      </Kb.Text>
+                    </Kb.Text>
+                  )}
+                </Kb.Box2>
+              ),
+            }
+          : undefined
+      }
     >
       <Kb.Box2 direction="vertical" style={styles.outerContainer} fullWidth={true}>
         {enabled ? content : <Kb.ProgressIndicator />}

shared/chat/conversation/info-panel/container.tsx

@@ -55,15 +55,18 @@ const ConnectedInfoPanel = Container.connect(
     let canSetMinWriterRole = false
     let canSetRetention = false
     let canDeleteHistory = false
+    let canManageBots = false
     if (meta.teamname) {
       const yourOperations = TeamConstants.getCanPerformByID(state, meta.teamID)
       admin = yourOperations.manageMembers
       canEditChannel = yourOperations.editTeamDescription
       canSetMinWriterRole = yourOperations.setMinWriterRole
       canSetRetention = yourOperations.setRetentionPolicy
       canDeleteHistory = yourOperations.deleteChatHistory && !meta.cannotWrite
+      canManageBots = yourOperations.manageBots
     } else {
       canDeleteHistory = true
+      canManageBots = true
     }
     const isPreview = meta.membershipType === 'youArePreviewing'
     const selectedTab = ownProps.selectedTab || (meta.teamname ? 'members' : 'attachments')
@@ -88,6 +91,7 @@ const ConnectedInfoPanel = Container.connect(
       attachmentsLoading,
       canDeleteHistory,
       canEditChannel,
+      canManageBots,
       canSetMinWriterRole,
       canSetRetention,
       channelname: meta.channelname,
@@ -269,6 +273,7 @@ const ConnectedInfoPanel = Container.connect(
       attachmentsLoading: stateProps.attachmentsLoading,
       canDeleteHistory: stateProps.canDeleteHistory,
       canEditChannel: stateProps.canEditChannel,
+      canManageBots: stateProps.canManageBots,
       canSetMinWriterRole: stateProps.canSetMinWriterRole,
       canSetRetention: stateProps.canSetRetention,
       channelname: stateProps.channelname,

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

@@ -129,6 +129,7 @@ export type InfoPanelProps = {
   onJoinChannel: () => void
 
   // Used for bots
+  canManageBots: boolean
   loadedAllBots: boolean
   onSearchFeaturedBots: (username: string) => void
   onLoadMoreBots: () => void
@@ -428,7 +429,9 @@ class _InfoPanel extends React.PureComponent<InfoPanelProps> {
           }
         }
 
-        tabsSection.data.push(addBotButton)
+        if (this.props.canManageBots) {
+          tabsSection.data.push(addBotButton)
+        }
         if (this.props.installedBots.length > 0) {
           tabsSection.data.push(inThisChannelHeader)
         }

shared/constants/teams.tsx

@@ -739,6 +739,7 @@ const deriveCanPerform = (roleAndDetails?: Types.TeamRoleAndDetails): Types.Team
     editTeamDescription: isAdminOrAbove || implicitAdmin,
     joinTeam: role === 'none' && implicitAdmin,
     listFirst: implicitAdmin,
+    manageBots: isAdminOrAbove || implicitAdmin,
     manageMembers: isAdminOrAbove || implicitAdmin,
     manageSubteams: isAdminOrAbove || implicitAdmin,
     pinMessage: isWriterOrAbove,

shared/teams/team/rows/index.tsx

@@ -56,7 +56,9 @@ const makeRows = (
         // loading
         rows.push({key: 'loading', type: 'loading'})
       }
-      rows.push({key: 'bot:install-more', type: 'bot-add'})
+      if (yourOperations.manageBots) {
+        rows.push({key: 'bot:install-more', type: 'bot-add'})
+      }
       if (bots.length === 0) {
         rows.push({key: 'bot:none', type: 'bot-none'})
       }