bug #3273 Show Created By for files and links list in Assets Library 4

Author: jacky-zhangjb

src/components/AssetsLibrary/GridView.scss

@@ -134,4 +134,11 @@
 
 .assets-gridview-container-active {
   position: relative;
+}
+
+:global {
+  .user-block .tooltip-container {
+    text-align: left;
+    line-height: 20px;
+  }
 }

src/config/constants.js

@@ -328,11 +328,6 @@ export const LOAD_MEMBERS_PENDING     = 'LOAD_MEMBERS_PENDING'
 export const LOAD_MEMBERS_SUCCESS     = 'LOAD_MEMBERS_SUCCESS'
 export const LOAD_MEMBERS_FAILURE     = 'LOAD_MEMBERS_FAILURE'
 
-export const LOAD_ASSETS_MEMBERS             = 'LOAD_ASSETS_MEMBERS'
-export const LOAD_ASSETS_MEMBERS_PENDING     = 'LOAD_ASSETS_MEMBERS_PENDING'
-export const LOAD_ASSETS_MEMBERS_SUCCESS     = 'LOAD_ASSETS_MEMBERS_SUCCESS'
-export const LOAD_ASSETS_MEMBERS_FAILURE     = 'LOAD_ASSETS_MEMBERS_FAILURE'
-
 export const LOAD_MEMBER_SUGGESTIONS             = 'LOAD_MEMBER_SUGGESTIONS'
 export const LOAD_MEMBER_SUGGESTIONS_PENDING     = 'LOAD_MEMBER_SUGGESTIONS_PENDING'
 export const LOAD_MEMBER_SUGGESTIONS_SUCCESS     = 'LOAD_MEMBER_SUGGESTIONS_SUCCESS'

src/projects/actions/project.js

@@ -21,7 +21,6 @@ import {
 import {
   createTimeline,
 } from '../../api/timelines'
-import { getMembersById } from '../../api/projectMembers'
 // import { loadProductTimelineWithMilestones } from './productsTimelines'
 import {
   LOAD_PROJECT,
@@ -45,7 +44,6 @@ import {
   PHASE_STATUS_ACTIVE,
   PHASE_DIRTY,
   PHASE_DIRTY_UNDO,
-  LOAD_ASSETS_MEMBERS,
   PROJECT_STATUS_IN_REVIEW,
   PHASE_STATUS_REVIEWED,
   PROJECT_STATUS_REVIEWED,
@@ -333,25 +331,6 @@ export function updateProject(projectId, updatedProps, updateExisting = false) {
   }
 }
 
-export function loadAssetsMembers(userIds) {
-  return (dispatch, getState) => {
-    // check if we need to request data from server
-    const assetsMembers = getState().projectState.assetsMembers
-    // this returns ids from userIds that are not in store (members)
-    const missingUsers = _.difference(userIds, _.keys(assetsMembers))
-    // dispatch request to load members if we are missing data
-    if (missingUsers.length) {
-      return dispatch({
-        type: LOAD_ASSETS_MEMBERS,
-        payload: getMembersById(userIds)
-      })
-    } else {
-      // returns empty resolved promise to avoid error when we call then on this action
-      return Promise.resolve()
-    }
-  }
-}
-
 export function createScopeChangeRequest(projectId, request) {
   const flatNewScope = flatten(request.newScope, { safe: true })
   const emptyKeys = _.keys(flatNewScope).filter(key => {

src/projects/detail/containers/AssetsInfoContainer.jsx

@@ -9,7 +9,8 @@ import moment from 'moment'
 import LinksGridView from '../../../components/AssetsLibrary/LinksGridView'
 import FilesGridView from '../../../components/AssetsLibrary/FilesGridView'
 import AssetsStatistics from '../../../components/AssetsLibrary/AssetsStatistics'
-import { updateProject, deleteProject, loadAssetsMembers } from '../../actions/project'
+import { updateProject, deleteProject } from '../../actions/project'
+import { loadMembers } from '../../../actions/members'
 import { loadDashboardFeeds, loadProjectMessages } from '../../actions/projectTopics'
 import { loadTopic } from '../../../actions/topics'
 import { loadProjectPlan } from '../../actions/projectPlan'
@@ -397,7 +398,7 @@ class AssetsInfoContainer extends React.Component {
     const { project, currentMemberRole, isSuperUser, phases, feeds,
       isManageUser, phasesTopics, projectTemplates, hideLinks,
       attachmentsAwaitingPermission, addProjectAttachment, discardAttachments, attachmentPermissions,
-      changeAttachmentPermission, projectMembers, loggedInUser, isSharingAttachment, canAccessPrivatePosts, loadAssetsMembers, assetsMembers } = this.props
+      changeAttachmentPermission, projectMembers, loggedInUser, isSharingAttachment, canAccessPrivatePosts, loadMembers, assetsMembers } = this.props
     const { ifModalOpen } = this.state
 
     const canManageLinks = !!currentMemberRole || isSuperUser
@@ -503,7 +504,7 @@ class AssetsInfoContainer extends React.Component {
       userIds = _.union(userIds, [_.parseInt(userId)])
     })
     _.remove(userIds, i => !i)
-    loadAssetsMembers(userIds)
+    loadMembers(userIds)
 
     const assetsData = []
     enableFileUpload && assetsData.push({name: 'Files', total: _.toString(attachments.length)})
@@ -673,13 +674,13 @@ const mapStateToProps = ({ templates, projectState, members, loadUser }) => {
     attachmentPermissions: projectState.attachmentPermissions,
     isSharingAttachment: projectState.processingAttachments,
     projectMembers:  _.keyBy(projectMembers, 'userId'),
-    assetsMembers: _.keyBy(projectState.assetsMembers, 'userId'),
+    assetsMembers: _.keyBy(members.members, 'userId'),
     loggedInUser: loadUser.user,
     canAccessPrivatePosts
   })
 }
 
-const mapDispatchToProps = { updateProject, deleteProject, loadAssetsMembers, addProjectAttachment, updateProjectAttachment,
+const mapDispatchToProps = { updateProject, deleteProject, loadMembers, addProjectAttachment, updateProjectAttachment,
   loadProjectMessages, discardAttachments, uploadProjectAttachments, loadDashboardFeeds, loadTopic, changeAttachmentPermission,
   removeProjectAttachment, loadProjectPlan, saveFeedComment }
 

src/projects/reducers/project.js

@@ -23,7 +23,6 @@ import {
   ACCEPT_OR_REFUSE_INVITE_SUCCESS, ACCEPT_OR_REFUSE_INVITE_FAILURE, ACCEPT_OR_REFUSE_INVITE_PENDING, RELOAD_PROJECT_MEMBERS_SUCCESS,
   UPLOAD_PROJECT_ATTACHMENT_FILES, DISCARD_PROJECT_ATTACHMENT, CHANGE_ATTACHMENT_PERMISSION,
   CREATE_SCOPE_CHANGE_REQUEST_SUCCESS, APPROVE_SCOPE_CHANGE_SUCCESS, REJECT_SCOPE_CHANGE_SUCCESS, CANCEL_SCOPE_CHANGE_SUCCESS, ACTIVATE_SCOPE_CHANGE_SUCCESS,
-  LOAD_ASSETS_MEMBERS_SUCCESS, LOAD_ASSETS_MEMBERS_PENDING, LOAD_ASSETS_MEMBERS_FAILURE, CONNECT_USER, CONNECT_USER_HANDLE
 } from '../../config/constants'
 import _ from 'lodash'
 import update from 'react-addons-update'
@@ -441,25 +440,6 @@ export const projectState = function (state=initialState, action) {
     })
   }
 
-  case LOAD_ASSETS_MEMBERS_SUCCESS: {
-    const _members = _.map(_.filter(action.payload, m => m.userId), m => {
-      if (m.handle) {
-        return m
-      }
-      return { userId: m.userId, ...CONNECT_USER, handle: CONNECT_USER_HANDLE }
-    })
-    const userMap = _.keyBy(_members, 'userId')
-    // merge the 2 data sets
-    return Object.assign({}, state, {
-      processing: false,
-      assetsMembers: update(state.assetsMembers, {$merge: userMap}),
-    })
-  }
-
-  case LOAD_ASSETS_MEMBERS_PENDING:
-  case LOAD_ASSETS_MEMBERS_FAILURE:
-    return state
-
   case DELETE_PROJECT_PHASE_SUCCESS: {
     const { phaseId } = action.payload