From b7d311367780246c203f3700ba8cb6371b6fb0ff Mon Sep 17 00:00:00 2001 From: riley Date: Tue, 2 May 2017 15:18:48 -0600 Subject: [PATCH] apparently you can't make a fragment on RootQuery --- .../src/containers/Dashboard/FlagWidget.js | 2 +- .../fragments/assetMetricsView.graphql | 1 - .../src/graphql/fragments/counts.graphql | 22 ------------------ .../graphql/queries/getQueueCounts.graphql | 23 ++++++++++++++++--- .../src/graphql/queries/modQueueQuery.graphql | 22 ++++++++++++++++-- .../src/services/fragmentMatcher.js | 2 ++ test/server/graph/loaders/metrics.js | 1 - 7 files changed, 43 insertions(+), 30 deletions(-) delete mode 100644 client/coral-admin/src/graphql/fragments/counts.graphql diff --git a/client/coral-admin/src/containers/Dashboard/FlagWidget.js b/client/coral-admin/src/containers/Dashboard/FlagWidget.js index 92de6c4d2..ea72cddc6 100644 --- a/client/coral-admin/src/containers/Dashboard/FlagWidget.js +++ b/client/coral-admin/src/containers/Dashboard/FlagWidget.js @@ -21,7 +21,7 @@ const FlagWidget = ({assets}) => { ? assets.map(asset => { let flagSummary = null; if (asset.action_summaries) { - flagSummary = asset.action_summaries.find(s => s.type === 'FlagAssetActionSummary'); + flagSummary = asset.action_summaries.find(s => s.__typename === 'FlagAssetActionSummary'); } return ( diff --git a/client/coral-admin/src/graphql/fragments/assetMetricsView.graphql b/client/coral-admin/src/graphql/fragments/assetMetricsView.graphql index c77fbc32b..726194143 100644 --- a/client/coral-admin/src/graphql/fragments/assetMetricsView.graphql +++ b/client/coral-admin/src/graphql/fragments/assetMetricsView.graphql @@ -6,7 +6,6 @@ fragment metrics on Asset { created_at commentCount action_summaries { - type: __typename actionCount actionableItemCount } diff --git a/client/coral-admin/src/graphql/fragments/counts.graphql b/client/coral-admin/src/graphql/fragments/counts.graphql deleted file mode 100644 index eb00be4da..000000000 --- a/client/coral-admin/src/graphql/fragments/counts.graphql +++ /dev/null @@ -1,22 +0,0 @@ -fragment counts on RootQuery { - allCount: commentCount(query: { - asset_id: $asset_id - }) - acceptedCount: commentCount(query: { - statuses: [ACCEPTED], - asset_id: $asset_id - }) - premodCount: commentCount(query: { - statuses: [PREMOD], - asset_id: $asset_id - }) - rejectedCount: commentCount(query: { - statuses: [REJECTED], - asset_id: $asset_id - }) - flaggedCount: commentCount(query: { - action_type: FLAG, - asset_id: $asset_id, - statuses: [NONE, PREMOD] - }) -} diff --git a/client/coral-admin/src/graphql/queries/getQueueCounts.graphql b/client/coral-admin/src/graphql/queries/getQueueCounts.graphql index a527c2538..4a7c00d87 100644 --- a/client/coral-admin/src/graphql/queries/getQueueCounts.graphql +++ b/client/coral-admin/src/graphql/queries/getQueueCounts.graphql @@ -1,5 +1,22 @@ -#import "../fragments/counts.graphql" - query Counts ($asset_id: ID) { - ...counts + allCount: commentCount(query: { + asset_id: $asset_id + }) + acceptedCount: commentCount(query: { + statuses: [ACCEPTED], + asset_id: $asset_id + }) + premodCount: commentCount(query: { + statuses: [PREMOD], + asset_id: $asset_id + }) + rejectedCount: commentCount(query: { + statuses: [REJECTED], + asset_id: $asset_id + }) + flaggedCount: commentCount(query: { + action_type: FLAG, + asset_id: $asset_id, + statuses: [NONE, PREMOD] + }) } diff --git a/client/coral-admin/src/graphql/queries/modQueueQuery.graphql b/client/coral-admin/src/graphql/queries/modQueueQuery.graphql index 9250ba793..80dec5ff7 100644 --- a/client/coral-admin/src/graphql/queries/modQueueQuery.graphql +++ b/client/coral-admin/src/graphql/queries/modQueueQuery.graphql @@ -1,5 +1,4 @@ #import "../fragments/commentView.graphql" -#import "../fragments/counts.graphql" query ModQueue ($asset_id: ID, $sort: SORT_ORDER) { all: comments(query: { @@ -43,5 +42,24 @@ query ModQueue ($asset_id: ID, $sort: SORT_ORDER) { title url } - ...counts + allCount: commentCount(query: { + asset_id: $asset_id + }) + acceptedCount: commentCount(query: { + statuses: [ACCEPTED], + asset_id: $asset_id + }) + premodCount: commentCount(query: { + statuses: [PREMOD], + asset_id: $asset_id + }) + rejectedCount: commentCount(query: { + statuses: [REJECTED], + asset_id: $asset_id + }) + flaggedCount: commentCount(query: { + action_type: FLAG, + asset_id: $asset_id, + statuses: [NONE, PREMOD] + }) } diff --git a/client/coral-admin/src/services/fragmentMatcher.js b/client/coral-admin/src/services/fragmentMatcher.js index afb87d445..c825ff5b5 100644 --- a/client/coral-admin/src/services/fragmentMatcher.js +++ b/client/coral-admin/src/services/fragmentMatcher.js @@ -37,6 +37,7 @@ const fm = new IntrospectionFragmentMatcher({ kind: 'INTERFACE', name: 'Action', possibleTypes: [ + {name: 'DefaultAction'}, {name: 'FlagAction'}, {name: 'LikeAction'}, {name: 'DontAgreeAction'} @@ -46,6 +47,7 @@ const fm = new IntrospectionFragmentMatcher({ kind: 'INTERFACE', name: 'ActionSummary', possibleTypes: [ + {name: 'DefaultActionSummary'}, {name: 'FlagActionSummary'}, {name: 'LikeActionSummary'}, {name: 'DontAgreeActionSummary'} diff --git a/test/server/graph/loaders/metrics.js b/test/server/graph/loaders/metrics.js index f095e201f..2e2408615 100644 --- a/test/server/graph/loaders/metrics.js +++ b/test/server/graph/loaders/metrics.js @@ -78,7 +78,6 @@ describe('graph.loaders.Metrics', () => { fragment metrics on Asset { id action_summaries { - type: __typename actionCount actionableItemCount }