Merge branch 'master' into featured-tag-on-replies

This commit is contained in:
Kim Gardner
2017-07-21 09:19:21 -04:00
committed by GitHub
2 changed files with 15 additions and 1 deletions
@@ -31,6 +31,20 @@ export default withFragments({
name
}
}
##
# TODO: Remove this when we have the IntrospectionFragmentMatcher.
# Currently without this loading more featured comments
# brings apollo into an inconsistent state.
action_summaries {
__typename
count
current_user {
id
}
}
##
user {
id
username
@@ -47,7 +47,7 @@ class TabPaneContainer extends React.Component {
}
const LOAD_MORE_QUERY = gql`
query CoralEmbedStream_LoadMoreComments($limit: Int = 5, $cursor: Date, $asset_id: ID, $sort: SORT_ORDER, $excludeIgnored: Boolean) {
query TalkFeaturedComments_LoadMoreComments($limit: Int = 5, $cursor: Date, $asset_id: ID, $sort: SORT_ORDER, $excludeIgnored: Boolean) {
comments(query: {limit: $limit, cursor: $cursor, tags: ["FEATURED"], asset_id: $asset_id, sort: $sort, excludeIgnored: $excludeIgnored}) {
nodes {
...${getDefinitionName(Comment.fragments.comment)}