Remove the need of a viewer to wrap the query

lucasbento · Oct 23, 2016 · 64b1aaa · 64b1aaa
1 parent ce4aebf
commit 64b1aaa
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 30 deletions.
diff --git a/data/schema.graphql b/data/schema.graphql
@@ -86,11 +86,7 @@ type PokemonEvolutionRequirement {
 
 # Query any Pokémon by number or name
 type Query {
-  viewer: Viewer
-}
-
-# Query any Pokémon by number or name
-type Viewer {
+  query: Query
   pokemons(first: Int!): [Pokemon]
   pokemon(id: String, name: String): Pokemon
 }
diff --git a/data/schema.json b/data/schema.json
@@ -13,28 +13,17 @@
           "description": "Query any Pokémon by number or name",
           "fields": [
             {
-              "name": "viewer",
+              "name": "query",
               "description": null,
               "args": [],
               "type": {
                 "kind": "OBJECT",
-                "name": "Viewer",
+                "name": "Query",
                 "ofType": null
               },
               "isDeprecated": false,
               "deprecationReason": null
-            }
-          ],
-          "inputFields": null,
-          "interfaces": [],
-          "enumValues": null,
-          "possibleTypes": null
-        },
-        {
-          "kind": "OBJECT",
-          "name": "Viewer",
-          "description": "Query any Pokémon by number or name",
-          "fields": [
+            },
             {
               "name": "pokemons",
               "description": null,

diff --git a/src/AppRoute.js b/src/AppRoute.js
@@ -14,10 +14,10 @@ import PokemonDetail from './components/Pokemon/PokemonDetail';
 
 const appHistory = useRouterHistory(createHashHistory)({ queryKey: false });
 
-const ViewerQueries = {
-  viewer: () => Relay.QL`
+const RootQuery = {
+  query: () => Relay.QL`
     query {
-      viewer
+      query
     }
   `,
 };
@@ -32,12 +32,12 @@ const AppRoute = () => (
       <Route
         path="/"
         component={PokemonList}
-        queries={ViewerQueries}
+        queries={RootQuery}
       />
       <Route
         path=":id"
         component={PokemonDetail}
-        queries={ViewerQueries}
+        queries={RootQuery}
       />
     </Router>
   </App>

diff --git a/src/components/Pokemon/PokemonDetail.js b/src/components/Pokemon/PokemonDetail.js
@@ -17,7 +17,7 @@ class PokemonDetail extends Component {
       types,
       weaknesses,
       evolutions,
-    } = this.props.viewer.pokemon;
+    } = this.props.query.pokemon;
 
     return (
       <Card>
@@ -96,8 +96,8 @@ export default Relay.createContainer(withRouter(PokemonDetail), {
     id: null,
   },
   fragments: {
-    viewer: () => Relay.QL`
-      fragment on Viewer {
+    query: () => Relay.QL`
+      fragment on Query {
         pokemon(id: $id) {
           number
           name

diff --git a/src/components/Pokemon/PokemonList.js b/src/components/Pokemon/PokemonList.js
@@ -36,7 +36,7 @@ class PokemonList extends Component {
   componentWillUnmount = () => window.removeEventListener('scroll', this.handleScroll)
 
   render() {
-    const { pokemons } = this.props.viewer;
+    const { pokemons } = this.props.query;
 
     return (
       <div>
@@ -61,8 +61,8 @@ export default Relay.createContainer(PokemonList, {
     count: 20,
   },
   fragments: {
-    viewer: () => Relay.QL`
-      fragment on Viewer {
+    query: () => Relay.QL`
+      fragment on Query {
         pokemons(first: $count) {
           id
           ${PokemonRow.getFragment('pokemon')}