From 850b9db8744c47b3f42b877078678f62ce77e38d Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Wed, 13 Mar 2019 21:16:02 +0100 Subject: webui: Use Timeline API instead of raw operations --- webui/src/bug/LabelChange.js | 4 ++-- webui/src/bug/Message.js | 14 +++++++------- webui/src/bug/SetStatus.js | 4 ++-- webui/src/bug/SetTitle.js | 4 ++-- webui/src/bug/Timeline.js | 10 +++++----- webui/src/bug/TimelineQuery.js | 10 +++++----- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/webui/src/bug/LabelChange.js b/webui/src/bug/LabelChange.js index b1bed4a5..9b19959e 100644 --- a/webui/src/bug/LabelChange.js +++ b/webui/src/bug/LabelChange.js @@ -36,8 +36,8 @@ const LabelChange = ({ op, classes }) => { }; LabelChange.fragment = gql` - fragment LabelChange on Operation { - ... on LabelChangeOperation { + fragment LabelChange on TimelineItem { + ... on LabelChangeTimelineItem { date author { name diff --git a/webui/src/bug/Message.js b/webui/src/bug/Message.js index a4e3eeb0..e858e003 100644 --- a/webui/src/bug/Message.js +++ b/webui/src/bug/Message.js @@ -32,7 +32,7 @@ const Message = ({ op, classes }) => (
commented - +
{op.message} @@ -41,9 +41,9 @@ const Message = ({ op, classes }) => ( ); Message.createFragment = gql` - fragment Create on Operation { - ... on CreateOperation { - date + fragment Create on TimelineItem { + ... on CreateTimelineItem { + createdAt author { name email @@ -55,9 +55,9 @@ Message.createFragment = gql` `; Message.commentFragment = gql` - fragment Comment on Operation { - ... on AddCommentOperation { - date + fragment AddComment on TimelineItem { + ... on AddCommentTimelineItem { + createdAt author { name email diff --git a/webui/src/bug/SetStatus.js b/webui/src/bug/SetStatus.js index 332c8352..4e03fff7 100644 --- a/webui/src/bug/SetStatus.js +++ b/webui/src/bug/SetStatus.js @@ -21,8 +21,8 @@ const SetStatus = ({ op, classes }) => { }; SetStatus.fragment = gql` - fragment SetStatus on Operation { - ... on SetStatusOperation { + fragment SetStatus on TimelineItem { + ... on SetStatusTimelineItem { date author { name diff --git a/webui/src/bug/SetTitle.js b/webui/src/bug/SetTitle.js index 5b17c431..a32cf791 100644 --- a/webui/src/bug/SetTitle.js +++ b/webui/src/bug/SetTitle.js @@ -27,8 +27,8 @@ const SetTitle = ({ op, classes }) => { }; SetTitle.fragment = gql` - fragment SetTitle on Operation { - ... on SetTitleOperation { + fragment SetTitle on TimelineItem { + ... on SetTitleTimelineItem { date author { name diff --git a/webui/src/bug/Timeline.js b/webui/src/bug/Timeline.js index d331d11d..f5990711 100644 --- a/webui/src/bug/Timeline.js +++ b/webui/src/bug/Timeline.js @@ -27,15 +27,15 @@ class Timeline extends React.Component {
{ops.map((op, index) => { switch (op.__typename) { - case 'CreateOperation': + case 'CreateTimelineItem': return ; - case 'AddCommentOperation': + case 'AddCommentTimelineItem': return ; - case 'LabelChangeOperation': + case 'LabelChangeTimelineItem': return ; - case 'SetTitleOperation': + case 'SetTitleTimelineItem': return ; - case 'SetStatusOperation': + case 'SetStatusTimelineItem': return ; default: diff --git a/webui/src/bug/TimelineQuery.js b/webui/src/bug/TimelineQuery.js index 78658a6f..ebb20f9d 100644 --- a/webui/src/bug/TimelineQuery.js +++ b/webui/src/bug/TimelineQuery.js @@ -12,13 +12,13 @@ const QUERY = gql` query($id: String!, $first: Int = 10, $after: String) { defaultRepository { bug(prefix: $id) { - operations(first: $first, after: $after) { + timeline(first: $first, after: $after) { nodes { - ...Create - ...Comment ...LabelChange - ...SetTitle ...SetStatus + ...SetTitle + ...AddComment + ...Create } pageInfo { hasNextPage @@ -42,7 +42,7 @@ const TimelineQuery = ({ id }) => ( if (error) return

Error: {error}

; return ( ); -- cgit