Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxceem merged 6 commits into from
Sep 30, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fe250b1
bug #3273 Show Created By for files and links list in Assets Library
jacky-zhangjb Sep 19, 2019
850bda7
bug #3273 Show Created By for files and links list in Assets Library 2
jacky-zhangjb Sep 21, 2019
d16dd9b
bug #3273 Show Created By for files and links list in Assets Library 3
jacky-zhangjb Sep 22, 2019
074f8e2
bug #3273 Show Created By for files and links list in Assets Library 4
jacky-zhangjb Sep 29, 2019
568c5f4
bug #3273 Show Created By for files and links list in Assets Library 5
jacky-zhangjb Sep 29, 2019
865349c
bug #3273 Show Created By for files and links list in Assets Library 6
jacky-zhangjb Sep 30, 2019
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
15 changes: 15 additions & 0 deletions src/components/AssetsLibrary/FilesGridView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import DeleteFileLinkModal from '../LinksMenu/DeleteFileLinkModal'
import EditFileAttachment from '../LinksMenu/EditFileAttachment'
import SubFolder from './SubFolder'
import ItemOperations from './ItemOperations'
import UserTooltip from '../User/UserTooltip'

import FolderIcon from '../../assets/icons/v.2.5/icon-folder-small.svg'

Expand All @@ -28,6 +29,7 @@ const FilesGridView = ({
title,
selectedUsers,
onAddAttachment,
assetsMembers,
isSharingAttachment,
discardAttachments,
onChangePermissions,
Expand Down Expand Up @@ -78,6 +80,7 @@ const FilesGridView = ({
link={ subFolderContent }
renderLink={ renderLink }
goBack={goBack}
assetsMembers={assetsMembers}
onDeletePostAttachment={onDeletePostAttachment}
loggedInUser={loggedInUser}
formatModifyDate={formatModifyDate}
Expand All @@ -99,6 +102,7 @@ const FilesGridView = ({
<li styleName="assets-gridview-header" key="assets-gridview-header">
<div styleName="flex-item-title item-type">Type</div>
<div styleName="flex-item-title item-name">Name</div>
<div styleName="flex-item-title item-created-by">Created By</div>
<div styleName="flex-item-title item-modified">Modified</div>
<div styleName="flex-item-title item-action"/>
</li>
Expand All @@ -119,12 +123,14 @@ const FilesGridView = ({
const canEdit = `${link.createdBy}` === `${loggedInUser.userId}`

const changeSubFolder = () => onChangeSubFolder(link)
const owner = _.find(assetsMembers, m => m.userId === _.parseInt(link.createdBy))

if (Array.isArray(link.children) && link.children.length > 0) {
return (
<li styleName="assets-gridview-row" onClick={changeSubFolder} key={'assets-gridview-folder-' + idx}>
<div styleName="flex-item item-type"><FolderIcon /></div>
<div styleName="flex-item item-name hand"><p>{formatFolderTitle(link.title)}</p></div>
<div styleName="flex-item item-created-by">—</div>
<div styleName="flex-item item-modified">{formatModifyDate(link)}</div>
<div styleName="flex-item item-action"/>
</li>)
Expand Down Expand Up @@ -161,6 +167,15 @@ const FilesGridView = ({
<img width={42} height={42} src={iconPath} />
</div>
<div styleName="flex-item item-name"><p>{renderLink(link)}</p></div>
<div styleName="flex-item item-created-by">
{!owner && (<div className="user-block txt-italic">Unknown</div>)}
{owner && (
<div className="spacing">
<div className="user-block">
<UserTooltip usr={owner} id={idx} size={35} />
</div>
</div>)}
</div>
<div styleName="flex-item item-modified">{formatModifyDate(link)}</div>
<div styleName="flex-item item-action">
{canEdit && (
Expand Down
9 changes: 8 additions & 1 deletion src/components/AssetsLibrary/GridView.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
}
}

.item-modified {
.item-modified, .item-created-by {
-webkit-box-flex: 0;
-ms-flex: none;
flex: none;
Expand Down Expand Up @@ -134,4 +134,11 @@

.assets-gridview-container-active {
position: relative;
}

:global {
.user-block .tooltip-container {
text-align: left;
line-height: 20px;
}
}
16 changes: 16 additions & 0 deletions src/components/AssetsLibrary/LinksGridView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import DeleteLinkModal from '../LinksMenu/DeleteLinkModal'
import EditLinkModal from '../LinksMenu/EditLinkModal'
import SubFolder from './SubFolder'
import ItemOperations from './ItemOperations'
import UserTooltip from '../User/UserTooltip'

import FolderIcon from '../../assets/icons/v.2.5/icon-folder-small.svg'
import LinkIcon from '../../assets/icons/link-12.svg'
Expand All @@ -28,6 +29,7 @@ const LinksGridView = ({
title,
formatModifyDate,
formatFolderTitle,
assetsMembers,
}) => {
const renderLink = (link) => {
if (link.onClick) {
Expand Down Expand Up @@ -59,6 +61,7 @@ const LinksGridView = ({
renderLink={ renderLink }
goBack={goBack}
formatModifyDate={formatModifyDate}
assetsMembers={assetsMembers}
isLinkSubFolder
/>)}
{(!subFolderContent) && (
Expand All @@ -69,6 +72,7 @@ const LinksGridView = ({
<li styleName="assets-gridview-header" key="assets-gridview-header">
<div styleName="flex-item-title item-type">Type</div>
<div styleName="flex-item-title item-name">Name</div>
<div styleName="flex-item-title item-created-by">Created By</div>
<div styleName="flex-item-title item-modified">Modified</div>
<div styleName="flex-item-title item-action"/>
</li>
Expand All @@ -87,12 +91,14 @@ const LinksGridView = ({
const onEditCancel = () => onEditIntent(-1)
const handleEditClick = () => onEditIntent(idx)
const changeSubFolder = () => onChangeSubFolder(link)
const owner = _.find(assetsMembers, m => m.userId === _.parseInt(link.createdBy))

if (Array.isArray(link.children) && link.children.length > 0) {
return (
<li styleName="assets-gridview-row" onClick={changeSubFolder} key={'assets-gridview-folder-' + idx}>
<div styleName="flex-item item-type"><FolderIcon /></div>
<div styleName="flex-item item-name hand"><p>{formatFolderTitle(link.title)}</p></div>
<div styleName="flex-item item-created-by">—</div>
<div styleName="flex-item item-modified">{formatModifyDate(link)}</div>
<div styleName="flex-item item-action"/>
</li>)
Expand All @@ -119,6 +125,16 @@ const LinksGridView = ({
<li styleName="assets-gridview-row" key={'assets-gridview-item-' +idx}>
<div styleName="flex-item item-type"><LinkIcon/></div>
<div styleName="flex-item item-name"><p>{renderLink(link)}</p></div>
<div styleName="flex-item item-created-by">
{!owner && !link.createdBy && (<div className="user-block">—</div>)}
{!owner && link.createdBy && (<div className="user-block txt-italic">Unknown</div>)}
{owner && (
<div className="spacing">
<div className="user-block">
<UserTooltip usr={owner} id={idx} size={35} />
</div>
</div>)}
</div>
<div styleName="flex-item item-modified">{formatModifyDate(link)}</div>
<div styleName="flex-item item-action">
{(canEdit || canDelete) && (
Expand Down
17 changes: 16 additions & 1 deletion src/components/AssetsLibrary/SubFolder.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import React from 'react'
import PropTypes from 'prop-types'
import _ from 'lodash'
import cn from 'classnames'

import DeleteFileLinkModal from '../LinksMenu/DeleteFileLinkModal'
import ItemOperations from './ItemOperations'
import UserTooltip from '../User/UserTooltip'
import FolderIcon from '../../assets/icons/v.2.5/icon-folder-small.svg'

import './GridView.scss'
Expand Down Expand Up @@ -54,7 +56,7 @@ class SubFolder extends React.Component {
}

render() {
const { link, renderLink, goBack, formatModifyDate, isLinkSubFolder } = this.props
const { link, renderLink, goBack, formatModifyDate, isLinkSubFolder, assetsMembers } = this.props
const { linkToDelete } = this.state
return (
<div styleName={cn({'assets-gridview-container-active': (linkToDelete >= 0)}, '')}>
Expand All @@ -64,17 +66,20 @@ class SubFolder extends React.Component {
<li styleName="assets-gridview-header" key="assets-gridview-header">
<div styleName="flex-item-title item-type">Type</div>
<div styleName="flex-item-title item-name">Name</div>
<div styleName="flex-item-title item-created-by">Created By</div>
<div styleName="flex-item-title item-modified">Modified</div>
<div styleName="flex-item-title item-action"/>
</li>
<li styleName="assets-gridview-row" key="assets-gridview-subfolder" onClick={goBack}>
<div styleName="flex-item item-type"><FolderIcon /></div>
<div styleName="flex-item item-name hand">..</div>
<div styleName="flex-item item-created-by"/>
<div styleName="flex-item item-modified"/>
<div styleName="flex-item item-action"/>
</li>
{
link.children.map((childLink, i) => {
const owner = _.find(assetsMembers, m => m.userId === _.parseInt(childLink.createdBy))
if (linkToDelete === i) {
return (
<li styleName="delete-confirmation-modal" key={'delete-confirmation-post-attachment-' + i}>
Expand All @@ -100,6 +105,16 @@ class SubFolder extends React.Component {
return (<li styleName="assets-gridview-row" key={`childlink-${childLink.address}-${i}`}>
<div styleName="flex-item item-type"><img width={42} height={42} src={ iconPath } /></div>
<div styleName="flex-item item-name"><p>{renderLink(childLink)}</p></div>
<div styleName="flex-item item-created-by">
{!owner && childLink.createdBy !== 'CoderBot' && (<div className="user-block txt-italic">Unknown</div>)}
{!owner && childLink.createdBy === 'CoderBot' && (<div className="user-block">CoderBot</div>)}
{owner && (
<div className="spacing">
<div className="user-block">
<UserTooltip usr={owner} id={i} size={35} />
</div>
</div>)}
</div>
<div styleName="flex-item item-modified">{formatModifyDate(childLink)}</div>
<div styleName="flex-item item-action">
{childLink.deletable && this.hasAccess(childLink.createdBy) && (
Expand Down
Loading