From a9eb181022601d4719651b7bf1c2c8f0783d75b1 Mon Sep 17 00:00:00 2001 From: "Kavanagh, Luke" Date: Tue, 2 Oct 2018 17:31:24 +0100 Subject: [PATCH] =?UTF-8?q?Add=20displayConcept.isDisplayTag=20to=20GraphQ?= =?UTF-8?q?L=20queries=20and=20test=20fixtures=20=20=F0=9F=90=BF=20v2.10.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demos/fixtures/fixures-live-blog-closed.json | 1 + demos/fixtures/fixures-live-blog.json | 1 + src/data-model/es.js | 1 + src/data-model/fragments.js | 1 + tests/fixtures/article-brand-fixture.json | 1 + tests/fixtures/article-opinion-author-fixture.json | 1 + tests/fixtures/article-package-fixture.json | 3 ++- tests/fixtures/article-standard-fixture.json | 1 + tests/fixtures/video-es-fixture.json | 3 ++- tests/fixtures/video-fixture.json | 3 ++- 10 files changed, 13 insertions(+), 3 deletions(-) diff --git a/demos/fixtures/fixures-live-blog-closed.json b/demos/fixtures/fixures-live-blog-closed.json index 280f297..96b1282 100644 --- a/demos/fixtures/fixures-live-blog-closed.json +++ b/demos/fixtures/fixures-live-blog-closed.json @@ -59,6 +59,7 @@ "displayConcept": { "prefLabel": "EU Economy", "relativeUrl": "/eu-economy", + "isDisplayTag": true, "latestContent": [ { "type": "Article", diff --git a/demos/fixtures/fixures-live-blog.json b/demos/fixtures/fixures-live-blog.json index 36f06a3..57c816e 100644 --- a/demos/fixtures/fixures-live-blog.json +++ b/demos/fixtures/fixures-live-blog.json @@ -59,6 +59,7 @@ "displayConcept": { "prefLabel": "EU Economy", "relativeUrl": "/eu-economy", + "isDisplayTag": true, "latestContent": [ { "type": "Article", diff --git a/src/data-model/es.js b/src/data-model/es.js index 76d0047..f922f80 100644 --- a/src/data-model/es.js +++ b/src/data-model/es.js @@ -27,6 +27,7 @@ module.exports = [ 'displayConcept.prefLabel', 'displayConcept.relativeUrl', 'displayConcept.directType', + 'displayConcept.isDisplayTag', 'brandConcept.id', 'brandConcept.prefLabel', diff --git a/src/data-model/fragments.js b/src/data-model/fragments.js index 215664d..ef80b4f 100644 --- a/src/data-model/fragments.js +++ b/src/data-model/fragments.js @@ -64,6 +64,7 @@ module.exports = { displayConcept { prefLabel relativeUrl + isDisplayTag } ...on Video { duration diff --git a/tests/fixtures/article-brand-fixture.json b/tests/fixtures/article-brand-fixture.json index 984f97c..b70e995 100644 --- a/tests/fixtures/article-brand-fixture.json +++ b/tests/fixtures/article-brand-fixture.json @@ -25,6 +25,7 @@ "displayConcept": { "prefLabel": "FT View", "relativeUrl": "/comment/ft-view", + "isDisplayTag": true, "latestContent": [ { "type": "Article", diff --git a/tests/fixtures/article-opinion-author-fixture.json b/tests/fixtures/article-opinion-author-fixture.json index 1b2df2d..9b74cf8 100644 --- a/tests/fixtures/article-opinion-author-fixture.json +++ b/tests/fixtures/article-opinion-author-fixture.json @@ -28,6 +28,7 @@ "displayConcept": { "prefLabel": "Global politics", "relativeUrl": "/topics/themes/Global_politics", + "isDisplayTag": true, "latestContent": [ { "type": "Article", diff --git a/tests/fixtures/article-package-fixture.json b/tests/fixtures/article-package-fixture.json index fb67588..9b655d9 100644 --- a/tests/fixtures/article-package-fixture.json +++ b/tests/fixtures/article-package-fixture.json @@ -22,7 +22,8 @@ "id": "3a34141d-e886-3c6f-8985-551ed91e994a", "prefLabel": "Equality in workplace", "directType": "http://www.ft.com/ontology/Topic", - "url": "https://www.ft.com/stream/3a34141d-e886-3c6f-8985-551ed91e994a" + "url": "https://www.ft.com/stream/3a34141d-e886-3c6f-8985-551ed91e994a", + "isDisplayTag": true }, "brand": { "idV1": "fb491676-5024-3111-a959-1fbce2fbecc1", diff --git a/tests/fixtures/article-standard-fixture.json b/tests/fixtures/article-standard-fixture.json index 1f1375e..34f56b3 100644 --- a/tests/fixtures/article-standard-fixture.json +++ b/tests/fixtures/article-standard-fixture.json @@ -40,6 +40,7 @@ "displayConcept": { "prefLabel": "UK Politics & Policy", "relativeUrl": "/world/uk/politics", + "isDisplayTag": true, "latestContent": [ { "type": "Article", diff --git a/tests/fixtures/video-es-fixture.json b/tests/fixtures/video-es-fixture.json index 212b0d6..54b58a3 100644 --- a/tests/fixtures/video-es-fixture.json +++ b/tests/fixtures/video-es-fixture.json @@ -12,7 +12,8 @@ }, "displayConcept": { "prefLabel": "Week Ahead", - "relativeUrl": "/stream/c24d6335-076a-366a-98e2-500bb26401d6" + "relativeUrl": "/stream/c24d6335-076a-366a-98e2-500bb26401d6", + "isDisplayTag": true }, "attachments": [ { diff --git a/tests/fixtures/video-fixture.json b/tests/fixtures/video-fixture.json index 44ee6dc..62e4998 100644 --- a/tests/fixtures/video-fixture.json +++ b/tests/fixtures/video-fixture.json @@ -12,7 +12,8 @@ }, "displayConcept": { "prefLabel": "Week Ahead", - "relativeUrl": "/stream/c24d6335-076a-366a-98e2-500bb26401d6" + "relativeUrl": "/stream/c24d6335-076a-366a-98e2-500bb26401d6", + "isDisplayTag": true }, "duration": 270655, "formattedDuration": "4:30"