diff --git a/src/core/client/stream/tabs/profile/components/CommentsHistory.tsx b/src/core/client/stream/tabs/profile/components/CommentsHistory.tsx index dc833f077..228d48b4c 100644 --- a/src/core/client/stream/tabs/profile/components/CommentsHistory.tsx +++ b/src/core/client/stream/tabs/profile/components/CommentsHistory.tsx @@ -12,6 +12,9 @@ interface Me { readonly body: string | null; readonly createdAt: any; readonly replyCount: number | null; + readonly asset: { + readonly title: string | null; + }; }; }>; }; diff --git a/src/core/client/stream/tabs/profile/components/HistoryComment.css b/src/core/client/stream/tabs/profile/components/HistoryComment.css index 286faa81f..3d3af60dd 100644 --- a/src/core/client/stream/tabs/profile/components/HistoryComment.css +++ b/src/core/client/stream/tabs/profile/components/HistoryComment.css @@ -3,7 +3,8 @@ } .button, -.replies { +.replies, +.story { composes: button from "talk-ui/shared/typography.css"; } diff --git a/src/core/client/stream/tabs/profile/components/HistoryComment.tsx b/src/core/client/stream/tabs/profile/components/HistoryComment.tsx index d9520d112..c806a193b 100644 --- a/src/core/client/stream/tabs/profile/components/HistoryComment.tsx +++ b/src/core/client/stream/tabs/profile/components/HistoryComment.tsx @@ -17,6 +17,9 @@ export interface HistoryCommentProps { body: string | null; createdAt: string; replyCount: number | null; + asset: { + title: string | null; + }; }; onGoToConversation: () => void; } @@ -59,11 +62,27 @@ const HistoryComment: StatelessComponent = props => { className={styles.replies} > reply - - Replies {props.comment.replyCount} + + {"Replies {$replyCount}"} )} + + + {"Story: {$title}"} + + ); }; diff --git a/src/core/client/stream/tabs/profile/containers/CommentsHistoryContainer.tsx b/src/core/client/stream/tabs/profile/containers/CommentsHistoryContainer.tsx index 8eaa949fd..3c2110f62 100644 --- a/src/core/client/stream/tabs/profile/containers/CommentsHistoryContainer.tsx +++ b/src/core/client/stream/tabs/profile/containers/CommentsHistoryContainer.tsx @@ -40,6 +40,9 @@ const enhanced = withSetCommentIDMutation( body createdAt replyCount + asset { + title + } } } } diff --git a/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap index dbfdc3b88..7de9ffbaf 100644 --- a/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap +++ b/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap @@ -390,9 +390,32 @@ exports[`renders comment stream 1`] = ` Comments +
diff --git a/src/core/client/stream/test/comments/__snapshots__/postComment.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/postComment.spec.tsx.snap index 171e6aa3b..d4eac5d3a 100644 --- a/src/core/client/stream/test/comments/__snapshots__/postComment.spec.tsx.snap +++ b/src/core/client/stream/test/comments/__snapshots__/postComment.spec.tsx.snap @@ -30,9 +30,32 @@ exports[`post a comment: optimistic response 1`] = ` Comments +
@@ -472,9 +495,32 @@ exports[`post a comment: server response 1`] = ` Comments +
@@ -904,9 +950,32 @@ exports[`renders comment stream 1`] = ` Comments +
diff --git a/src/core/client/stream/test/comments/__snapshots__/postLocalReply.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/postLocalReply.spec.tsx.snap index 35948074c..80b26d147 100644 --- a/src/core/client/stream/test/comments/__snapshots__/postLocalReply.spec.tsx.snap +++ b/src/core/client/stream/test/comments/__snapshots__/postLocalReply.spec.tsx.snap @@ -2,727 +2,591 @@ exports[`post a reply: open reply form 1`] = `
-
+ + + +
- Signed in as - - Markus - - . -
-
- - Not you?  - - -
-
-
-
-
-
- -
-
-
- - - -
- -
-
-
-
-
+ Signed in as - Powered by - - ⁨The Coral Project⁩ - + Markus + .
- -
-
- -
-
-
-
-
-
+ Not you?  + +
-
-
- -
+ Sign Out +
-
-
-
+ +
-
- - Markus - -
- -
-
-
-
-
+ +
+ +
+ + Powered by + + ⁨The Coral Project⁩ + + +
+ +
+
+ +
+
+
+
+
+
-
-
+
+
-
-
- -
+ 2018-07-06T18:24:00.000Z +
+
+ +
+
+
+
+
+
+
+
-
-
+
+
-
-
- -
+ 2018-07-06T18:24:00.000Z +
+
+ +
+
+
+
+
+
+
+
-
-
+
+
-
-
- -
+ 2018-07-06T18:24:00.000Z +
+
+ +
+
+
+
+
+
+
+
-
-
+
+
-
-
- -
+ 2018-07-06T18:24:00.000Z +
-
+
+ +
+
+
+
+
+
+
+
-
-
-
+
`; exports[`post a reply: optimistic response 1`] = `
-
+ + + +
- Signed in as - - Markus - - . -
-
- - Not you?  - - -
-
-
-
-
-
- -
-
-
- - - -
- -
-
-
-
-
+ Signed in as - Powered by - - ⁨The Coral Project⁩ - + Markus + .
- -
-
- -
-
-
-
-
-
+ Not you?  + +
-
-
- -
+ Sign Out +
-
-
-
+ +
-
- - Markus - -
- -
-
-
-
-
+ +
+ +
+ + Powered by + + ⁨The Coral Project⁩ + + +
+ +
+
+ +
+
+
+
+
+
-
-
+
+
-
-
- -
+ 2018-07-06T18:24:00.000Z +
+
+ +
+
+
+
+
+
+
+
-
-
+
+
-
-
- -
+ 2018-07-06T18:24:00.000Z +
+
+ +
+
+
+
+
+
+
+
-
-
+
+
-
-
- -
+ 2018-07-06T18:24:00.000Z +
+
+ +
+
+
+
+
+
+
+
-
-
+
+
-
-
- -
+ 2018-07-06T18:24:00.000Z +
-
+
+ +
+
+
+
+
+
+
+
-
-
`; exports[`post a reply: server response 1`] = `
-
+ + + +
- Signed in as - - Markus - - . -
-
- - Not you?  - - -
-
-
-
-
-
- -
-
-
- - - -
- -
-
-
-
-
+ Signed in as - Powered by - - ⁨The Coral Project⁩ - + Markus + .
- -
-
- -
-
-
-
-
-
+ Not you?  + +
-
-
- -
+ Sign Out +
-
-
-
+ +
-
- - Markus - -
- -
-
-
-
-
+ +
+ +
+ + Powered by + + ⁨The Coral Project⁩ + + +
+ +
+
+ +
+
+
+
+
+
-
-
+
+
-
-
- -
+ 2018-07-06T18:24:00.000Z +
+
+ +
+
+
+
+
+
+
+
-
-
+
+
-
-
- -
+ 2018-07-06T18:24:00.000Z +
+
+ +
+
+
+
+
+
+
+
-
-
+
+
-
-
- -
+ 2018-07-06T18:24:00.000Z +
+
+ +
+
+
+
+
+
+
+
-
-
+
+
-
-
- -
+ 2018-07-06T18:24:00.000Z +
+
+ +
+
+
+
+
+
+
+
+ + Markus + +
+ +
+
+
+
+
+ +
+
+
+
+
+
+
+
+
-
- +
+
-
Hello world! (from server)", - } +
+
+ } + /> +
+ +
+
+
+
+
+
+
+
+ className="Comment-root" + role="article" + > +
+
+ + Markus + +
+ +
+
+
+
Hello world! (from server)", + } + } + /> +
+
@@ -2295,629 +2463,685 @@ exports[`post a reply: server response 1`] = `
-
+
`; exports[`renders comment stream 1`] = `
-
+ + + +
- Signed in as - - Markus - - . -
-
- - Not you?  - - -
-
-
-
-
-
- -
-
-
- - - -
- -
-
-
-
-
+ Signed in as - Powered by - - ⁨The Coral Project⁩ - + Markus + .
- -
-
- -
-
-
-
-
-
+ Not you?  + +
-
-
- -
+ Sign Out +
-
-
-
+ +
-
- - Markus - -
- -
-
-
-
-
+ +
+ +
+ + Powered by + + ⁨The Coral Project⁩ + + +
+ +
+
+ +
+
+
+
+
+
-
-
+
+
-
-
- -
+ 2018-07-06T18:24:00.000Z +
+
+ +
+
+
+
+
+
+
+
-
-
+
+
-
-
- -
+ 2018-07-06T18:24:00.000Z +
+
+ +
+
+
+
+
+
+
+
-
-
+
+
-
-
- -
+ 2018-07-06T18:24:00.000Z +
+
+ +
+
+
+
+
+
+
+
+ + Markus + +
+ +
+
+
+
+
+ +
+
+
+
+
+
+
+
+
-
- +
+
-
+
-
+
+ +
+
+
+
+
+
+
+
+
+
- - Reply - - +
+ + Markus + +
+ +
+
+
+
+
+ +
@@ -2934,6 +3158,6 @@ exports[`renders comment stream 1`] = `
-
+
`; diff --git a/src/core/client/stream/test/comments/__snapshots__/postReply.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/postReply.spec.tsx.snap index 8f2fc4fa6..2965c29b6 100644 --- a/src/core/client/stream/test/comments/__snapshots__/postReply.spec.tsx.snap +++ b/src/core/client/stream/test/comments/__snapshots__/postReply.spec.tsx.snap @@ -30,9 +30,32 @@ exports[`post a reply: open reply form 1`] = ` Comments +
@@ -519,9 +542,32 @@ exports[`post a reply: optimistic response 1`] = ` Comments +
@@ -1094,9 +1140,32 @@ exports[`post a reply: server response 1`] = ` Comments +
@@ -1532,9 +1601,32 @@ exports[`renders comment stream 1`] = ` Comments +
diff --git a/src/locales/en-US/stream.ftl b/src/locales/en-US/stream.ftl index 9875ee86c..d5b0fa249 100644 --- a/src/locales/en-US/stream.ftl +++ b/src/locales/en-US/stream.ftl @@ -71,5 +71,6 @@ comments-editedMarker-edited = Edited ## Profile Tab profile-historyComment-viewConversation = View Conversation -profile-historyComment-replies = Replies +profile-historyComment-replies = Replies {$replyCount} profile-historyComment-commentHistory = Comment History +profile-historyComment-story = Story {$title}