Merge pull request #1467 from rgarmsen2295/plt-1088

PLT-1088 Fixes issue where an admin could not delete a root post in the RHS

web/react/components/rhs_root_post.jsx

@@ -38,7 +38,9 @@ export default class RhsRootPost extends React.Component {
     }
     render() {
         var post = this.props.post;
-        var isOwner = UserStore.getCurrentId() === post.user_id;
+        var currentUser = UserStore.getCurrentUser();
+        var isOwner = currentUser.id === post.user_id;
+        var isAdmin = utils.isAdmin(currentUser.roles);
         var timestamp = UserStore.getProfile(post.user_id).update_at;
         var channel = ChannelStore.get(post.channel_id);
 
@@ -61,21 +63,14 @@ export default class RhsRootPost extends React.Component {
             }
         }
 
-        var ownerOptions;
+        var dropdownContents = [];
+
         if (isOwner) {
-            ownerOptions = (
+            dropdownContents.push(
-                <div>
+                <li
-                    <a href='#'
+                    key='rhs-root-edit'
-                        className='post__dropdown dropdown-toggle'
+                    role='presentation'
-                        type='button'
-                        data-toggle='dropdown'
-                        aria-expanded='false'
-                    />
-                    <ul
-                        className='dropdown-menu'
-                        role='menu'
                 >
-                        <li role='presentation'>
                     <a
                         href='#'
                         role='menuitem'
@@ -90,7 +85,15 @@ export default class RhsRootPost extends React.Component {
                         {'Edit'}
                     </a>
                 </li>
-                        <li role='presentation'>
+            );
+        }
+
+        if (isOwner || isAdmin) {
+            dropdownContents.push(
+                <li
+                    key='rhs-root-delete'
+                    role='presentation'
+                >
                     <a
                         href='#'
                         role='menuitem'
@@ -99,6 +102,25 @@ export default class RhsRootPost extends React.Component {
                         {'Delete'}
                     </a>
                 </li>
+            );
+        }
+
+        var rootOptions = '';
+        if (dropdownContents.length > 0) {
+            rootOptions = (
+                <div className='dropdown'>
+                    <a
+                        href='#'
+                        className='post__dropdown dropdown-toggle'
+                        type='button'
+                        data-toggle='dropdown'
+                        aria-expanded='false'
+                    />
+                    <ul
+                        className='dropdown-menu'
+                        role='menu'
+                    >
+                        {dropdownContents}
                     </ul>
                 </div>
             );
@@ -166,7 +188,7 @@ export default class RhsRootPost extends React.Component {
                             </li>
                             <li className='col col__reply'>
                                 <div className='dropdown'>
-                                    {ownerOptions}
+                                    {rootOptions}
                                 </div>
                             </li>
                         </ul>