scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-02 13:12:13 +08:00
Code Issues Projects Releases Packages Wiki Activity

Code refactoring [SCI-1869]

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2018-01-04 14:56:16 +01:00
parent 2e275d6d67
commit 53f4db9352
1 changed files with 34 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
app/javascript/src/components/Navigation/components/ActivityElement.jsx
View file

@ -38,6 +38,39 @@ const TextSpan = styled.span`
padding: 3px 10px; padding: 3px 10px;
text-align: justify; text-align: justify;
` `
function truncatedTooltip(id, text) {
return (
<OverlayTrigger overlay={(
<Tooltip id={id}>
{text}
</Tooltip>
)} placement="bottom">
<span>
{text.substring(0, NAME_TRUNCATION_LENGTH)}...
</span>
</OverlayTrigger>
);
}
function taskPath(activity) {
return (
<span>&nbsp;
[&nbsp;<FormattedMessage id="general.project" />:&nbsp;
{activity.project.length > NAME_TRUNCATION_LENGTH ? (
truncatedTooltip('activity_modal.long_project_tooltip', activity.project)
):(
<span>{activity.project}</span>
)},&nbsp;
<FormattedMessage id="general.task" />:&nbsp;
{activity.task.length > NAME_TRUNCATION_LENGTH ? (
truncatedTooltip('activity_modal.long_task_tooltip', activity.task)
):(
<span>{activity.task}</span>
)}&nbsp;]
</span>
);
}
const ActivityElement = ({ activity }) => const ActivityElement = ({ activity }) =>
<StyledLi> <StyledLi>
@ -48,38 +81,7 @@ const ActivityElement = ({ activity }) =>
</TimeSpan> </TimeSpan>
<TextSpan> <TextSpan>
<span dangerouslySetInnerHTML={{ __html: activity.message }} /> <span dangerouslySetInnerHTML={{ __html: activity.message }} />
{activity.task && {activity.task && taskPath(activity)}
<span>&nbsp;
[&nbsp;<FormattedMessage id="general.project" />:&nbsp;
{activity.project.length > NAME_TRUNCATION_LENGTH ? (
<OverlayTrigger overlay={(
<Tooltip id="activity_modal.long_project_tooltip">
{activity.project}
</Tooltip>
)} placement="bottom">
<span>
{activity.project.substring(0, NAME_TRUNCATION_LENGTH)}...
</span>
</OverlayTrigger>
):(
<span>{activity.project}</span>
)},&nbsp;
<FormattedMessage id="general.task" />:&nbsp;
{activity.task.length > NAME_TRUNCATION_LENGTH ? (
<OverlayTrigger overlay={(
<Tooltip id="activity_modal.long_task_tooltip">
{activity.task}
</Tooltip>
)} placement="bottom">
<span>
{activity.task.substring(0, NAME_TRUNCATION_LENGTH)}...
</span>
</OverlayTrigger>
):(
<span>{activity.task}</span>
)}&nbsp;]
</span>
}
</TextSpan> </TextSpan>
</StyledLi>; </StyledLi>;