Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/components/FileList/FileList.scss
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,17 @@
font-size: 15px;
color: $tc-gray-60;
margin-left: auto;
text-align: right;

.Tooltip {
line-height: 100%;
}

.date {
font-size: 9px;
line-height: normal;
margin-top: 5px;
}
}

.edit-icons {
Expand Down
20 changes: 18 additions & 2 deletions src/components/FileList/FileListItem.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import _ from 'lodash'
import React, {PropTypes} from 'react'
import filesize from 'filesize'
import { Icons } from 'appirio-tech-react-components'
import moment from 'moment'
import { Icons, Tooltip } from 'appirio-tech-react-components'
import UserWithName from '../User/UserWithName'
import { TOOLTIP_DEFAULT_DELAY } from '../../config/constants'

const { TrashIcon, CloseIcon, EditIcon, SaveIcon } = Icons

Expand Down Expand Up @@ -88,13 +91,22 @@ export default class FileListItem extends React.Component {
}

renderReadOnly() {
const {title, downloadUrl, description, size, isEditable} = this.props
const {title, downloadUrl, description, size, isEditable, updatedAt, createdAt, createdByUser, updatedByUser} = this.props

return (
<div>
<div className="title">
<h4><a href={downloadUrl} target="_blank" rel="noopener noreferrer">{title}</a></h4>
<div className="size">
{filesize(size)}
<Tooltip theme="light" tooltipDelay={TOOLTIP_DEFAULT_DELAY}>
<div className="tooltip-target">
<p className="date">{moment(updatedAt || createdAt).format('MMM DD, YYYY')}</p>
</div>
<div className="tooltip-body">
<UserWithName {...(updatedByUser || createdByUser)} />
</div>
</Tooltip>
</div>
{isEditable && <div className="edit-icons">
<i className="icon-edit" onClick={this.startEdit}><EditIcon /></i>
Expand Down Expand Up @@ -136,6 +148,10 @@ FileListItem.propTypes = {
size: PropTypes.number.isRequired,
contentType: PropTypes.string,
isEditable: PropTypes.bool,
updatedAt: PropTypes.string,
createdAt: PropTypes.string.isRequired,
updatedByUser: PropTypes.object,
createdByUser: PropTypes.object.isRequired,

/**
* Callback fired when a save button is clicked
Expand Down
5 changes: 4 additions & 1 deletion src/config/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -264,4 +264,7 @@ export const NEW_PROJECT_PATH = '/new-project'

// Analytics constants
export const GA_CLICK_ID = '_gclid'
export const GA_CLIENT_ID = '_gacid'
export const GA_CLIENT_ID = '_gacid'

// ToolTip
export const TOOLTIP_DEFAULT_DELAY = 300 // in ms
22 changes: 19 additions & 3 deletions src/projects/detail/components/FileListContainer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,18 @@ class FileListContainer extends Component {
}

render() {
const { files, projectId } = this.props
const { files, projectId, allMembers } = this.props
const storePath = `${PROJECT_ATTACHMENTS_FOLDER}/${projectId}/`
files.forEach(file => {
if (allMembers[file.updatedBy]) {
file.updatedByUser = allMembers[file.updatedBy]
}

if (allMembers[file.createdBy]) {
file.createdByUser = allMembers[file.createdBy]
}
})

return (
<div>
<FileList files={files} onDelete={ this.deleteFile } onSave={ this.updateFile } />
Expand All @@ -51,10 +61,16 @@ class FileListContainer extends Component {

const mapDispatchToProps = {addProjectAttachment, updateProjectAttachment, removeProjectAttachment}

const mapStateToProps = ({ members }) => {
return {
allMembers : members.members
}
}

FileListContainer.propTypes = {
projectId: PropTypes.number.isRequired,
files: PropTypes.arrayOf(PropTypes.object).isRequired
files: PropTypes.arrayOf(PropTypes.object).isRequired,
allMembers: PropTypes.object.isRequired
}

export default connect(null, mapDispatchToProps)(FileListContainer)
export default connect(mapStateToProps, mapDispatchToProps)(FileListContainer)