From aa8953ca1a06fa00bc46a3751237369c78a8d79b Mon Sep 17 00:00:00 2001 From: John Shaver Date: Thu, 6 Jul 2017 15:56:50 -0700 Subject: [PATCH] Added connection lists to scout query --- src/components/ScoutOverview.js | 10 +++++----- src/containers/ScoutOverview.js | 33 +++++++++++++++++++++++++-------- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/src/components/ScoutOverview.js b/src/components/ScoutOverview.js index 5efed7a..ffbefc8 100644 --- a/src/components/ScoutOverview.js +++ b/src/components/ScoutOverview.js @@ -1,13 +1,13 @@ import React from "react"; -export default ScoutOverview = ( - {scoutID, +export default ({ + scoutID, displayName, advancementDeadline, completedAdventures, - completedAchievements} -) => { - console.log(data); + completedAchievements +}) => { + console.log(displayName) return (
{displayName} diff --git a/src/containers/ScoutOverview.js b/src/containers/ScoutOverview.js index d0fa6e0..1d1325c 100644 --- a/src/containers/ScoutOverview.js +++ b/src/containers/ScoutOverview.js @@ -6,16 +6,33 @@ export default graphql(gql` getScout(id: $scoutID){ displayName, advancementDeadline, - adventures, - acheivments, + adventures { + edges { + node { + name + } + } + }, + achievements { + edges { + node { + name + } + } + } } } `,{ options : ({scoutID}) => ({variables: {scoutID}}), - props: ({ ownProps, data }) => { - scoutID: ownProps.scoutID, - displayName: data.getScout.displayName, - completedAdventures: data.getScout.adventures, - completedAchievements: data.getScout.achievements, - advancementDeadline: data.getScout.advancementDeadline + props: ({ ownProps, data }) => ( + data.getScout ? { + scoutID: ownProps.scoutID, + displayName: data.getScout.displayName, + completedAdventures: data.getScout.adventures, + completedAchievements: data.getScout.achievements, + advancementDeadline: data.getScout.advancementDeadline + } : { + scoutID: ownProps.scoutID + } + ) });