Merge pull request #3926 from rashmi73/issue_3858

issue #3858 fix

Author: maxceem

docs/permissions.html

@@ -48,6 +48,17 @@ <h2>Project Plan</h2>
                 <span class="badge badge-success" title="Allowed Topcoder Role">Connect Admin</span>
             </div>
           </div>
+          <div class="row border-top">
+            <div class="col py-2">
+              Manage asset libraries files and links
+              <div><small><code>MANAGE_NOT_OWN_ATTACHEMENT</code></small></div>
+              <div class="text-black-50 small-text"></div>
+            </div>
+            <div class="col-9 py-2">
+                <span class="badge badge-success" title="Allowed Topcoder Role">administrator</span>
+                <span class="badge badge-success" title="Allowed Topcoder Role">Connect Admin</span>
+            </div>
+          </div>
           <div class="row border-top">
             <div class="col py-2">
               Manage completed phases

src/components/AssetsLibrary/FilesGridView.jsx

@@ -24,6 +24,8 @@ import {
   PROJECT_ASSETS_SHARED_WITH_TOPCODER_MEMBERS,
   PROJECT_FEED_TYPE_MESSAGES
 } from '../../config/constants'
+import { hasPermission } from '../../helpers/permissions'
+import PERMISSIONS from '../../config/permissions'
 
 let selectedLink
 let clearing = false
@@ -251,7 +253,7 @@ const FilesGridView = ({
               }
               const onEditCancel = () => onEditIntent(-1)
               const handleEditClick = () => onEditIntent(idx)
-              const canEdit = `${link.createdBy}` === `${loggedInUser.userId}`
+              const canEdit = `${link.createdBy}` === `${loggedInUser.userId}` || (hasPermission(PERMISSIONS.MANAGE_NOT_OWN_ATTACHEMENT))
 
               const changeSubFolder = () => {
                 onChangeSubFolder(link)

src/components/AssetsLibrary/LinksGridView.jsx

@@ -21,13 +21,13 @@ import {
   PROJECT_FEED_TYPE_MESSAGES
 } from '../../config/constants'
 import FilterColHeader from './FilterColHeader'
+import { hasPermission } from '../../helpers/permissions'
+import PERMISSIONS from '../../config/permissions'
 
 let selectedLink
 let clearing = false
 
 const LinksGridView = ({
-  canDelete,
-  canEdit,
   links,
   linkToDelete,
   linkToEdit,
@@ -38,6 +38,7 @@ const LinksGridView = ({
   onEdit,
   onEditIntent,
   title,
+  loggedInUser,
   formatModifyDate,
   formatFolderTitle,
   assetsMembers,
@@ -201,7 +202,7 @@ const LinksGridView = ({
                 selectedLink = link
               }
               const owner = _.find(assetsMembers, m => m.userId === _.parseInt(link.createdBy))
-
+              const canEdit = `${link.createdBy}` === `${loggedInUser.userId}` || (hasPermission(PERMISSIONS.MANAGE_NOT_OWN_ATTACHEMENT))
               if (Array.isArray(link.children) && link.children.length > 0) {
                 return (
                   <li styleName="assets-gridview-row" onClick={changeSubFolder} key={'assets-gridview-folder-' + idx}>
@@ -275,10 +276,10 @@ const LinksGridView = ({
                     </div>
                     <div styleName="flex-item item-modified">{formatModifyDate(link)}</div>
                     <div styleName="flex-item item-action">
-                      {(canEdit || canDelete) && (
+                      {(canEdit) && (
                         <ItemOperations
                           canEdit={canEdit}
-                          canDelete={canDelete}
+                          canDelete={canEdit}
                           handleEditClick={handleEditClick}
                           handleDeleteClick={handleDeleteClick}
                         />)}
@@ -299,6 +300,7 @@ LinksGridView.propTypes = {
   onChangeSubFolder: PropTypes.func,
   onDelete: PropTypes.func,
   title: PropTypes.string,
+  loggedInUser: PropTypes.object.isRequired,
   formatModifyDate: PropTypes.func.isRequired,
   formatFolderTitle: PropTypes.func.isRequired,
   setFilter: PropTypes.func.isRequired,

src/config/permissions.js

@@ -160,6 +160,16 @@ export default {
     ],
   },
 
+  MANAGE_NOT_OWN_ATTACHEMENT: {
+    _meta: {
+      group: 'Project Plan',
+      title: 'Manage asset libraries files and links',
+    },
+    topcoderRoles: [
+      ...TOPCODER_ADMINS,
+    ]
+  },
+
   MANAGE_COMPLETED_PHASE: {
     _meta: {
       group: 'Project Plan',

src/projects/detail/containers/AssetsInfoContainer.jsx

@@ -896,6 +896,7 @@ class AssetsInfoContainer extends React.Component {
                 canEdit={canManageLinks}
                 onDelete={this.removeAttachment}
                 onEdit={this.onEditLink}
+                loggedInUser={loggedInUser}
                 formatModifyDate={formatModifyDate}
                 formatFolderTitle={formatFolderTitle}
                 setFilter={this.setFilter}