Skip to content

Commit

Permalink
[issue_tracker] Improve readability of comments and history (aces#6138)
Browse files Browse the repository at this point in the history
The comments and history were jumbled together in a way that made
it very difficult to determine what was a comment and what was an
item being changed. This updates the display in a way that is
much more readable and should make it possible to follow the conversation
of what is happening in an issue.
  • Loading branch information
driusan authored and AlexandraLivadas committed Jun 29, 2021
1 parent a75ce7d commit 9d5cfa6
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 14 deletions.
7 changes: 4 additions & 3 deletions modules/issue_tracker/css/issue_tracker.css
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,11 @@ h3 {
margin: 25px 0;
}

.history-item-label > span {
font-weight: bold;
}

.history-item-changes {
margin-left: 2em;
}

.history-item-user {
font-weight: bold;
}
46 changes: 35 additions & 11 deletions modules/issue_tracker/jsx/CommentList.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,41 +22,65 @@ class CommentList extends Component {
const changes = this.props.commentHistory.reduce(function(carry, item) {
let label = item.dateAdded.concat(' - ', item.addedBy);
if (!carry[label]) {
carry[label] = {};
carry[label] = {
data: {},
user: item.addedBy,
date: new Date(item.dateAdded),
};
}
carry[label][item.fieldChanged] = item.newValue;
carry[label].data[item.fieldChanged] = item.newValue;
return carry;
}, {});

const history = Object.keys(changes).sort().reverse().map(function(key, i) {
const textItems = Object.keys(changes[key]).map(function(index, j) {
let comment;
const item = changes[key];
const textItems = Object.keys(item.data).map(function(index, j) {
if (index == 'comment') {
comment = <div style={{marginTop: '1em'}}><Markdown content={item.data[index]} /></div>;
return;
}
return (
<div key={j} className='row'>
<li key={j} className='row' style={{color: 'rgb(149, 149, 149)'}}>
<div className='col-md-2'>
<div className='col-md-8'><b>{index}</b></div>
<div className='col-md-8'><strong>{index}</strong></div>
<div className='col-md-4'> to </div>
</div>
<div className='col-md-10'><i>{changes[key][index]}</i></div>
</div>
<div className='col-md-10'><i>{item.data[index]}</i></div>
</li>
);
}, this);

let now = new Date();
const datediffSec = (now.getTime() - item.date.getTime()) / 1000;
let timestr;
if (datediffSec < 60) {
timestr = <span> {Math.round(datediffSec)} seconds ago</span>;
} else if (datediffSec < 60*60) {
timestr = <span> {Math.round(datediffSec / 60)} minutes ago</span>;
} else if (datediffSec < 60*60*24) {
timestr = <span> {Math.round(datediffSec / (60*60))} hours ago</span>;
} else {
timestr = <span> on {item.date.toLocaleDateString()} at {item.date.toTimeString()}</span>;
}

return (
<div key={i}>
<hr/>
<div className='history-item-label'>
<span>{key}</span> updated :
Updated by <span className="history-item-user">{item.user}</span>{timestr}:
</div>
<div className='history-item-changes'>
<ul className='history-item-changes'>
{textItems}
</div>
</ul>
{comment}
</div>
);
}, this);

return (
<div id='comment-history'>
<h3>Comment History</h3>
<h3>Comments and History</h3>
{history}
</div>
);
Expand Down

0 comments on commit 9d5cfa6

Please sign in to comment.