remove default graphQL typename, explicitly request for article IDs

app/app.jsx

@@ -16,6 +16,7 @@ import './assets/favicon.ico'
 
 const makeConfig = config => {
   config.cache = new InMemoryCache({
+    addTypename: false,
     typePolicies: {
       ArticleId: {
         keyFields: ['pubIdType', 'id'],

app/components/activity/MetaEdit.jsx

 import React from 'react'
-import { omit } from 'lodash'
 import { withTheme } from 'styled-components'
 import { Button } from '@pubsweet/ui'
 import { Portal, Buttons, CloseModal } from '../ui'
@@ -32,14 +31,7 @@ const MetaEdit = withTheme(
     ...props
   }) => {
     const { meta } = manuscript
-    const { fundingGroup: grants, releaseDelay, notes } = meta
-    const fundingGroup = grants
-      ? grants.map(g => {
-          const n = omit(g, '__typename')
-          n.pi = omit(g.pi, '__typename')
-          return n
-        })
-      : []
+    const { fundingGroup = [], releaseDelay, notes } = meta
 
     if (toEdit === 'dupes' && duplicates) {
       return (

app/components/dashboard/operations.js

@@ -71,6 +71,7 @@ const DashboardFragment = gql`
       articleIds {
         pubIdType
         id
+        __typename
       }
       publicationDates {
         type

app/components/operations.js

@@ -64,6 +64,7 @@ export const ManuscriptFragment = gql`
       articleIds {
         pubIdType
         id
+        __typename
       }
       publicationDates {
         type

app/components/submission-wizard/CreatePage.jsx

 import React from 'react'
 import { withRouter } from 'react-router'
 import { Query } from 'react-apollo'
-import { omit } from 'lodash'
 import { createBrowserHistory } from 'history'
 import styled, { createGlobalStyle } from 'styled-components'
 import { th } from '@pubsweet/ui-toolkit'
@@ -229,7 +228,7 @@ class Created extends React.Component {
     const { manuscript, history, changeNote, deleteNote, newNote } = this.props
     const { meta, journal, files: allfiles, teams, organization } = manuscript
     const preprint = organization.name === 'Europe PMC Preprints'
-    const { notes, fundingGroup: grants, articleIds } = meta
+    const { notes, fundingGroup = [], articleIds } = meta
     const files = allfiles
       ? allfiles.filter(
           file =>
@@ -239,13 +238,6 @@ class Created extends React.Component {
         )
       : []
     const pdfSend = allfiles && allfiles.find(f => f.type === 'pdf4load')
-    const fundingGroup = grants
-      ? grants.map(g => {
-          const n = omit(g, '__typename')
-          n.pi = omit(g.pi, '__typename')
-          return n
-        })
-      : []
     const reviewerNote = notes
       ? notes.find(n => n.notesType === 'selectedReviewer')
       : null

app/components/submission-wizard/EditFundingAccess.jsx

 import React from 'react'
-import { omit } from 'lodash'
 import styled from 'styled-components'
 import { th } from '@pubsweet/ui-toolkit'
 import { Button, Steps } from '@pubsweet/ui'
@@ -103,20 +102,7 @@ class EditFundingAccess extends React.Component {
       currentUser,
     } = this.props
     const { journal, meta, status } = manuscript
-    const {
-      articleIds,
-      releaseDelay,
-      title,
-      fundingGroup: grants,
-      notes,
-    } = meta
-    const fundingGroup = grants
-      ? grants.map(g => {
-          const n = omit(g, '__typename')
-          n.pi = omit(g.pi, '__typename')
-          return n
-        })
-      : []
+    const { articleIds, releaseDelay, title, fundingGroup = [], notes } = meta
     const planS = notes && notes.find(n => n.notesType === 'planS')
     const pmid = articleIds && articleIds.find(aid => aid.pubIdType === 'pmid')
     const pmcid =

app/components/submission-wizard/operations.js

@@ -22,6 +22,7 @@ export const CREATE_MANUSCRIPT = gql`
           articleIds {
             pubIdType
             id
+            __typename
           }
           publicationDates {
             type