diff options
author | Michael Muré <batolettre@gmail.com> | 2021-03-21 12:22:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-21 12:22:24 +0100 |
commit | 6744cddaa6ed25b9f2c0c61ef9df1823b5e74e6e (patch) | |
tree | bc9439f3fd2abb8312768d246fa71182e93ed3e4 | |
parent | e0a7088ba0dca77f616af211a1f9e2158af502c3 (diff) | |
parent | b7ddb22558bd4b429e810157b343ee41a6575945 (diff) | |
download | git-bug-6744cddaa6ed25b9f2c0c61ef9df1823b5e74e6e.tar.gz |
Merge pull request #603 from GlancingMind/upstream-28-comment-counter-for-each-bug-on-buglist
Display count of comment for each bug on bug list
-rw-r--r-- | webui/src/pages/list/BugRow.graphql | 3 | ||||
-rw-r--r-- | webui/src/pages/list/BugRow.tsx | 16 |
2 files changed, 19 insertions, 0 deletions
diff --git a/webui/src/pages/list/BugRow.graphql b/webui/src/pages/list/BugRow.graphql index 547c09d8..e4e2760c 100644 --- a/webui/src/pages/list/BugRow.graphql +++ b/webui/src/pages/list/BugRow.graphql @@ -9,5 +9,8 @@ fragment BugRow on Bug { labels { ...Label } + comments { + totalCount + } ...authored } diff --git a/webui/src/pages/list/BugRow.tsx b/webui/src/pages/list/BugRow.tsx index 8d8fb5cb..1f5d22aa 100644 --- a/webui/src/pages/list/BugRow.tsx +++ b/webui/src/pages/list/BugRow.tsx @@ -6,6 +6,7 @@ import TableRow from '@material-ui/core/TableRow/TableRow'; import Tooltip from '@material-ui/core/Tooltip/Tooltip'; import { makeStyles } from '@material-ui/core/styles'; import CheckCircleOutline from '@material-ui/icons/CheckCircleOutline'; +import CommentOutlinedIcon from '@material-ui/icons/CommentOutlined'; import ErrorOutline from '@material-ui/icons/ErrorOutline'; import Date from 'src/components/Date'; @@ -74,6 +75,13 @@ const useStyles = makeStyles((theme) => ({ display: 'inline-block', }, }, + commentCount: { + fontSize: '1rem', + marginLeft: theme.spacing(0.5), + }, + commentCountCell: { + display: 'inline-flex', + }, })); type Props = { @@ -82,6 +90,8 @@ type Props = { function BugRow({ bug }: Props) { const classes = useStyles(); + // Subtract 1 from totalCount as 1 comment is the bug description + const commentCount = bug.comments.totalCount - 1; return ( <TableRow hover> <TableCell className={classes.cell}> @@ -105,6 +115,12 @@ function BugRow({ bug }: Props) { by {bug.author.displayName} </div> </div> + {commentCount > 0 && ( + <span className={classes.commentCountCell}> + <CommentOutlinedIcon aria-label="Comment count" /> + <span className={classes.commentCount}>{commentCount}</span> + </span> + )} </TableCell> </TableRow> ); |