From 1b49c813224c475019cad63751450ef5a271e8e9 Mon Sep 17 00:00:00 2001 From: Sarah Mogin Date: Tue, 16 Jan 2018 18:31:11 -0500 Subject: [PATCH 1/2] wip --- packages/gatsby-source-contentful/src/normalize.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/gatsby-source-contentful/src/normalize.js b/packages/gatsby-source-contentful/src/normalize.js index 4d56b94bb35c3..f39f64cb7fdce 100644 --- a/packages/gatsby-source-contentful/src/normalize.js +++ b/packages/gatsby-source-contentful/src/normalize.js @@ -238,6 +238,7 @@ exports.createContentTypeNodes = ({ Object.keys(entryItemFields).forEach(entryItemFieldKey => { if (entryItemFields[entryItemFieldKey]) { const entryItemFieldValue = entryItemFields[entryItemFieldKey] + if (Array.isArray(entryItemFieldValue)) { if ( entryItemFieldValue[0].sys && @@ -263,6 +264,12 @@ exports.createContentTypeNodes = ({ entryItemFieldValue.sys.id ) delete entryItemFields[entryItemFieldKey] + } else if ( + entryItemFieldValue && + entryItemFieldValue.sys && + entryItemFieldValue.sys.type === `Link` + ) { + delete entryItemFields[entryItemFieldKey] } } }) From cec84a8d9bb1c23d9531015ca66608f453adfd3c Mon Sep 17 00:00:00 2001 From: Sarah Mogin Date: Wed, 17 Jan 2018 18:31:52 -0500 Subject: [PATCH 2/2] [gatsby-source-contentful] Delete original link regardless of presence of resolvable ID --- .../gatsby-source-contentful/src/normalize.js | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/packages/gatsby-source-contentful/src/normalize.js b/packages/gatsby-source-contentful/src/normalize.js index f39f64cb7fdce..df5ee6b5cd35e 100644 --- a/packages/gatsby-source-contentful/src/normalize.js +++ b/packages/gatsby-source-contentful/src/normalize.js @@ -238,7 +238,6 @@ exports.createContentTypeNodes = ({ Object.keys(entryItemFields).forEach(entryItemFieldKey => { if (entryItemFields[entryItemFieldKey]) { const entryItemFieldValue = entryItemFields[entryItemFieldKey] - if (Array.isArray(entryItemFieldValue)) { if ( entryItemFieldValue[0].sys && @@ -257,18 +256,13 @@ exports.createContentTypeNodes = ({ entryItemFieldValue && entryItemFieldValue.sys && entryItemFieldValue.sys.type && - entryItemFieldValue.sys.id && - resolvable.has(entryItemFieldValue.sys.id) - ) { - entryItemFields[`${entryItemFieldKey}___NODE`] = mId( - entryItemFieldValue.sys.id - ) - delete entryItemFields[entryItemFieldKey] - } else if ( - entryItemFieldValue && - entryItemFieldValue.sys && - entryItemFieldValue.sys.type === `Link` + entryItemFieldValue.sys.id ) { + if (resolvable.has(entryItemFieldValue.sys.id)) { + entryItemFields[`${entryItemFieldKey}___NODE`] = mId( + entryItemFieldValue.sys.id + ) + } delete entryItemFields[entryItemFieldKey] } }