Cherry pick of #23920 on release-7.8 (#12416)

* cherry pick for #23920 * cherry pick for #23920
mattermost · Aug 8, 2023 · 99c0709 · 99c0709
1 parent 65aaab5
commit 99c0709
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/components/admin_console/system_users/system_users_dropdown/system_users_dropdown.tsx b/components/admin_console/system_users/system_users_dropdown/system_users_dropdown.tsx
@@ -565,6 +565,15 @@ export default class SystemUsersDropdown extends React.PureComponent<Props, Stat
 
     render() {
         const {currentUser, user, isLicensed, config} = this.props;
+
+        let isDisabled = this.props.isDisabled;
+        if (!isDisabled) {
+            // if not already disabled,
+            // disable if SystemAdmin being edited by non SystemAdmin
+            // ie, userManager with EditOtherUsers permissions
+            isDisabled = UserUtils.isSystemAdmin(user.roles) && !UserUtils.isSystemAdmin(currentUser.roles);
+        }
+
         const isGuest = UserUtils.isGuest(user.roles);
         if (!user) {
             return <div/>;
@@ -635,12 +644,14 @@ export default class SystemUsersDropdown extends React.PureComponent<Props, Stat
                 {demoteToGuestModal}
                 {createGroupSyncablesMembershipsModal}
                 <MenuWrapper
-                    isDisabled={this.props.isDisabled}
+                    isDisabled={isDisabled}
                 >
                     <div className='text-right'>
                         <a>
                             <span>{currentRoles} </span>
-                            <span className='caret'/>
+                            {!isDisabled &&
+                                <span className='caret'/>
+                            }
                         </a>
                         {this.renderAccessToken()}
                     </div>