diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.js b/client/coral-admin/src/containers/Dashboard/Dashboard.js index 253c0980b..0cc015e00 100644 --- a/client/coral-admin/src/containers/Dashboard/Dashboard.js +++ b/client/coral-admin/src/containers/Dashboard/Dashboard.js @@ -11,7 +11,7 @@ class Dashboard extends React.Component { const {data} = this.props; console.log('data', data); - const {metrics: assets} = data; + const {assetsByLike, assetsByFlag} = data; if (data.loading) { return ; @@ -25,14 +25,14 @@ class Dashboard extends React.Component {

Top Ten Articles with the most flagged comments

- +

Top ten comments with the most likes

Top Ten Articles with the most likes

- +
); diff --git a/client/coral-admin/src/graphql/queries/metrics.graphql b/client/coral-admin/src/graphql/queries/assetsByFlag.graphql similarity index 51% rename from client/coral-admin/src/graphql/queries/metrics.graphql rename to client/coral-admin/src/graphql/queries/assetsByFlag.graphql index 2f9afe621..c6f0900ac 100644 --- a/client/coral-admin/src/graphql/queries/metrics.graphql +++ b/client/coral-admin/src/graphql/queries/assetsByFlag.graphql @@ -1,6 +1,10 @@ fragment metrics on Asset { id title + url + commentCount + author + created_at action_summaries { type: __typename actionCount @@ -9,16 +13,7 @@ fragment metrics on Asset { } query Metrics ($from: Date!, $to: Date!, $sort: ACTION_TYPE!) { - metrics(from: $from, to: $to, sort: $sort) { - id - title - url - commentCount - author - created_at - action_summaries { - actionCount - actionableItemCount - } + assetsByFlag: metrics(from: $from, to: $to, sort: $sort) { + ...metrics } } diff --git a/client/coral-admin/src/graphql/queries/assetsByLike.graphql b/client/coral-admin/src/graphql/queries/assetsByLike.graphql new file mode 100644 index 000000000..853afee41 --- /dev/null +++ b/client/coral-admin/src/graphql/queries/assetsByLike.graphql @@ -0,0 +1,19 @@ +fragment metrics on Asset { + id + title + url + commentCount + author + created_at + action_summaries { + type: __typename + actionCount + actionableItemCount + } +} + +query Metrics ($from: Date!, $to: Date!, $sort: ACTION_TYPE!) { + assetsByLike: metrics(from: $from, to: $to, sort: $sort) { + ...metrics + } +} diff --git a/client/coral-admin/src/graphql/queries/index.js b/client/coral-admin/src/graphql/queries/index.js index f98b40091..96cb319c9 100644 --- a/client/coral-admin/src/graphql/queries/index.js +++ b/client/coral-admin/src/graphql/queries/index.js @@ -1,9 +1,10 @@ import {graphql} from 'react-apollo'; -import METRICS from './metrics.graphql'; +import BY_LIKES from './assetsByLike.graphql'; +import BY_FLAGS from './assetsByFlag.graphql'; import MOD_QUEUE_QUERY from './modQueueQuery.graphql'; -export const mostFlags = graphql(METRICS, { +export const mostFlags = graphql(BY_FLAGS, { options: () => { // currently hard-coded per Greg's advice @@ -19,7 +20,7 @@ export const mostFlags = graphql(METRICS, { } }); -export const mostLikes = graphql(METRICS, { +export const mostLikes = graphql(BY_LIKES, { options: () => { const fiveMinutesAgo = new Date(); fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);