Merge pull request #74 from swcarlosrj/develop

Update source code based on the latest docs

Author: Carlos Rufo

package.json

@@ -3,17 +3,17 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "apollo-boost": "^0.1.4",
-    "apollo-link-context": "^1.0.7",
-    "apollo-link-ws": "^1.0.7",
-    "graphql": "^0.13.1",
-    "react": "^16.2.0",
-    "react-apollo": "^2.1.0",
-    "react-dom": "^16.2.0",
-    "react-router": "^4.2.0",
-    "react-router-dom": "^4.2.2",
+    "apollo-boost": "0.1.4",
+    "apollo-link-context": "1.0.7",
+    "apollo-link-ws": "1.0.7",
+    "graphql": "0.13.1",
+    "react": "16.2.0",
+    "react-apollo": "2.1.0",
+    "react-dom": "16.2.0",
+    "react-router": "4.2.0",
+    "react-router-dom": "4.2.2",
     "react-scripts": "1.1.1",
-    "subscriptions-transport-ws": "^0.9.7"
+    "subscriptions-transport-ws": "0.9.7"
   },
   "scripts": {
     "start": "react-scripts start",

server/src/generated/prisma-client/index.d.ts

@@ -1,12 +1,16 @@
-// Code generated by Prisma (prisma@1.22.2). DO NOT EDIT.
+// Code generated by Prisma (prisma@1.23.0). DO NOT EDIT.
 // Please don't change this file manually but run `prisma generate` to update it.
 // For more information, please read the docs: https://www.prisma.io/docs/prisma-client/
 
-import { DocumentNode, GraphQLSchema } from "graphql";
-import { makePrismaClientClass, BaseClientOptions } from "prisma-client-lib";
+import { DocumentNode } from "graphql";
+import {
+  makePrismaClientClass,
+  BaseClientOptions,
+  Model
+} from "prisma-client-lib";
 import { typeDefs } from "./prisma-schema";
 
-type AtLeastOne<T, U = { [K in keyof T]: Pick<T, K> }> = Partial<T> &
+export type AtLeastOne<T, U = { [K in keyof T]: Pick<T, K> }> = Partial<T> &
   U[keyof U];
 
 export interface Exists {
@@ -785,7 +789,10 @@ export interface VotePreviousValuesSubscription
   id: () => Promise<AsyncIterator<ID_Output>>;
 }
 
-export interface UserConnection {}
+export interface UserConnection {
+  pageInfo: PageInfo;
+  edges: UserEdge[];
+}
 
 export interface UserConnectionPromise
   extends Promise<UserConnection>,
@@ -803,7 +810,10 @@ export interface UserConnectionSubscription
   aggregate: <T = AggregateUserSubscription>() => T;
 }
 
-export interface LinkConnection {}
+export interface LinkConnection {
+  pageInfo: PageInfo;
+  edges: LinkEdge[];
+}
 
 export interface LinkConnectionPromise
   extends Promise<LinkConnection>,
@@ -946,6 +956,7 @@ export interface AggregateVoteSubscription
 }
 
 export interface LinkEdge {
+  node: Link;
   cursor: String;
 }
 
@@ -961,7 +972,10 @@ export interface LinkEdgeSubscription
   cursor: () => Promise<AsyncIterator<String>>;
 }
 
-export interface VoteConnection {}
+export interface VoteConnection {
+  pageInfo: PageInfo;
+  edges: VoteEdge[];
+}
 
 export interface VoteConnectionPromise
   extends Promise<VoteConnection>,
@@ -981,7 +995,9 @@ export interface VoteConnectionSubscription
 
 export interface UserSubscriptionPayload {
   mutation: MutationType;
-  updatedFields?: String[];
+  node: User;
+  updatedFields: String[];
+  previousValues: UserPreviousValues;
 }
 
 export interface UserSubscriptionPayloadPromise
@@ -1003,6 +1019,7 @@ export interface UserSubscriptionPayloadSubscription
 }
 
 export interface UserEdge {
+  node: User;
   cursor: String;
 }
 
@@ -1063,7 +1080,9 @@ export interface LinkPreviousValuesSubscription
 
 export interface LinkSubscriptionPayload {
   mutation: MutationType;
-  updatedFields?: String[];
+  node: Link;
+  updatedFields: String[];
+  previousValues: LinkPreviousValues;
 }
 
 export interface LinkSubscriptionPayloadPromise
@@ -1156,7 +1175,9 @@ export interface PageInfoSubscription
 
 export interface VoteSubscriptionPayload {
   mutation: MutationType;
-  updatedFields?: String[];
+  node: Vote;
+  updatedFields: String[];
+  previousValues: VotePreviousValues;
 }
 
 export interface VoteSubscriptionPayloadPromise
@@ -1210,6 +1231,7 @@ export interface AggregateUserSubscription
 }
 
 export interface VoteEdge {
+  node: Vote;
   cursor: String;
 }
 
@@ -1262,7 +1284,7 @@ export type Boolean = boolean;
  * Model Metadata
  */
 
-export const models = [
+export const models: Model[] = [
   {
     name: "Link",
     embedded: false

server/src/resolvers/Mutation.js

@@ -3,11 +3,9 @@ const jwt = require('jsonwebtoken')
 const { APP_SECRET, getUserId } = require('../utils')
 
 function post(parent, args, context) {
-  const userId = getUserId(context)
   return context.prisma.createLink({
     url: args.url,
     description: args.description,
-    postedBy: { connect: { id: userId } },
   })
 }
 

src/components/LinkList.js

@@ -31,20 +31,18 @@ export const FEED_QUERY = gql`
 const NEW_LINKS_SUBSCRIPTION = gql`
   subscription {
     newLink {
-      node {
+      id
+      url
+      description
+      createdAt
+      postedBy {
         id
-        url
-        description
-        createdAt
-        postedBy {
-          id
-          name
-        }
-        votes {
+        name
+      }
+      votes {
+        id
+        user {
           id
-          user {
-            id
-          }
         }
       }
     }
@@ -54,28 +52,26 @@ const NEW_LINKS_SUBSCRIPTION = gql`
 const NEW_VOTES_SUBSCRIPTION = gql`
   subscription {
     newVote {
-      node {
+      id
+      link {
         id
-        link {
+        url
+        description
+        createdAt
+        postedBy {
           id
-          url
-          description
-          createdAt
-          postedBy {
-            id
-            name
-          }
-          votes {
-            id
-            user {
-              id
-            }
-          }
+          name
         }
-        user {
+        votes {
           id
+          user {
+            id
+          }
         }
       }
+      user {
+        id
+      }
     }
   }
 `
@@ -90,7 +86,7 @@ class LinkList extends Component {
     const orderBy = isNewPage ? 'createdAt_DESC' : null
     const data = store.readQuery({
       query: FEED_QUERY,
-      variables: { first, skip, orderBy }
+      variables: { first, skip, orderBy },
     })
 
     const votedLink = data.feed.links.find(link => link.id === linkId)
@@ -103,25 +99,26 @@ class LinkList extends Component {
       document: NEW_LINKS_SUBSCRIPTION,
       updateQuery: (prev, { subscriptionData }) => {
         if (!subscriptionData.data) return prev
-        const newLink = subscriptionData.data.newLink.node
+        const newLink = subscriptionData.data.newLink
+        const exists = prev.feed.links.find(({ id }) => id === newLink.id)
+        if (exists) return prev
 
         return Object.assign({}, prev, {
           feed: {
             links: [newLink, ...prev.feed.links],
             count: prev.feed.links.length + 1,
-            __typename: prev.feed.__typename
-          }
+            __typename: prev.feed.__typename,
+          },
         })
-      }
+      },
     })
   }
 
   _subscribeToNewVotes = subscribeToMore => {
     subscribeToMore({
-      document: NEW_VOTES_SUBSCRIPTION
+      document: NEW_VOTES_SUBSCRIPTION,
     })
   }
-
   _getQueryVariables = () => {
     const isNewPage = this.props.location.pathname.includes('new')
     const page = parseInt(this.props.match.params.page, 10)
@@ -141,7 +138,6 @@ class LinkList extends Component {
     rankedLinks.sort((l1, l2) => l2.votes.length - l1.votes.length)
     return rankedLinks
   }
-
   _nextPage = data => {
     const page = parseInt(this.props.match.params.page, 10)
     if (page <= data.feed.count / LINKS_PER_PAGE) {
@@ -202,4 +198,4 @@ class LinkList extends Component {
   }
 }
 
-export default LinkList
+export default LinkList

src/index.js

@@ -2,14 +2,14 @@ import React from 'react'
 import ReactDOM from 'react-dom'
 import './styles/index.css'
 import App from './components/App'
-import registerServiceWorker from './registerServiceWorker'
+import * as serviceWorker from './serviceWorker'
 import { ApolloProvider } from 'react-apollo'
 import { ApolloClient } from 'apollo-client'
 import { createHttpLink } from 'apollo-link-http'
 import { InMemoryCache } from 'apollo-cache-inmemory'
 import { BrowserRouter } from 'react-router-dom'
-import { AUTH_TOKEN } from './constants'
 import { setContext } from 'apollo-link-context'
+import { AUTH_TOKEN } from './constants'
 import { split } from 'apollo-link'
 import { WebSocketLink } from 'apollo-link-ws'
 import { getMainDefinition } from 'apollo-utilities'
@@ -60,4 +60,4 @@ ReactDOM.render(
   </BrowserRouter>,
   document.getElementById('root'),
 )
-registerServiceWorker()
+serviceWorker.unregister()