From adfe46d21bd01356f89ed3413103917f2f4324ae Mon Sep 17 00:00:00 2001
From: Jonathan Roebuck <roebuj02@mc-n358713.local>
Date: Wed, 7 Aug 2019 09:45:37 +0100
Subject: [PATCH] mv title/subtitle translations to pageData payload

services affected include Afaan Oromoo, Amharic, Indonesian, Korean, Tigrinya
---
 .../bbc_afaanoromo_radio/liveradio.json       | 29 ----------
 .../bbc_afaanoromoo_radio/liveradio.json      | 31 ++++++++++
 data/amharic/bbc_amharic_radio/liveradio.json | 56 ++++++++++---------
 .../bbc_indonesian_radio/liveradio.json       | 56 ++++++++++---------
 data/korean/bbc_korean_radio/liveradio.json   | 56 ++++++++++---------
 .../bbc_tigrinya_radio/liveradio.json         | 56 ++++++++++---------
 src/app/containers/MediaPageMain/index.jsx    | 13 +++--
 .../containers/MediaPageMain/index.test.jsx   |  4 ++
 src/app/lib/config/services/afaanoromoo.js    |  8 ---
 src/app/lib/config/services/amharic.js        |  4 --
 src/app/lib/config/services/indonesia.js      |  5 --
 src/app/lib/config/services/korean.js         |  4 --
 src/app/lib/config/services/tigrinya.js       |  4 --
 13 files changed, 158 insertions(+), 168 deletions(-)
 delete mode 100644 data/afaanoromoo/bbc_afaanoromo_radio/liveradio.json
 create mode 100644 data/afaanoromoo/bbc_afaanoromoo_radio/liveradio.json

diff --git a/data/afaanoromoo/bbc_afaanoromo_radio/liveradio.json b/data/afaanoromoo/bbc_afaanoromo_radio/liveradio.json
deleted file mode 100644
index 23a819ff82c..00000000000
--- a/data/afaanoromoo/bbc_afaanoromo_radio/liveradio.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "metadata": {
-        "id": "urn:bbc:ares::asset:afaanoromo/bbc_afaanoromo_radio/liveradio",
-        "tags": {}
-    },
-    "content": {
-        "blocks": [
-            {
-                "id": "liveradio",
-                "type": "media",
-                "format": "audio",
-                "title": "TODO",
-                "caption": "TODO",
-                "versions": [
-                    {
-                        "versionId": "liveradio"
-                    }
-                ]
-            }
-        ]
-    },
-    "promo": {
-        "subType": "IDX",
-        "name": "TODO: Afaanoromo Live Radio",
-        "uri": "/afaanoromo/bbc_afaanoromo_radio/liveradio",
-        "id": "TODO",
-        "type": "simple"
-    }
-}
\ No newline at end of file
diff --git a/data/afaanoromoo/bbc_afaanoromoo_radio/liveradio.json b/data/afaanoromoo/bbc_afaanoromoo_radio/liveradio.json
new file mode 100644
index 00000000000..4a9a7189193
--- /dev/null
+++ b/data/afaanoromoo/bbc_afaanoromoo_radio/liveradio.json
@@ -0,0 +1,31 @@
+{
+  "metadata": {
+    "id": "urn:bbc:ares::asset:afaanoromo/bbc_afaanoromo_radio/liveradio",
+    "tags": {}
+  },
+  "content": {
+    "title": "Dhaggeeffadhaa",
+    "subtitle": "Sagantaawwan keenya",
+    "blocks": [
+      {
+        "id": "liveradio",
+        "type": "media",
+        "format": "audio",
+        "title": "TODO",
+        "caption": "TODO",
+        "versions": [
+          {
+            "versionId": "liveradio"
+          }
+        ]
+      }
+    ]
+  },
+  "promo": {
+    "subType": "IDX",
+    "name": "TODO: Afaanoromo Live Radio",
+    "uri": "/afaanoromo/bbc_afaanoromo_radio/liveradio",
+    "id": "TODO",
+    "type": "simple"
+  }
+}
diff --git a/data/amharic/bbc_amharic_radio/liveradio.json b/data/amharic/bbc_amharic_radio/liveradio.json
index 6549f6be9fc..feac53a6b0d 100644
--- a/data/amharic/bbc_amharic_radio/liveradio.json
+++ b/data/amharic/bbc_amharic_radio/liveradio.json
@@ -1,29 +1,31 @@
 {
-    "metadata": {
-        "id": "urn:bbc:ares::asset:amharic/bbc_amharic_radio/liveradio",
-        "tags": {}
-    },
-    "content": {
-        "blocks": [
-            {
-                "id": "liveradio",
-                "type": "media",
-                "format": "audio",
-                "title": "TODO",
-                "caption": "TODO",
-                "versions": [
-                    {
-                        "versionId": "liveradio"
-                    }
-                ]
-            }
+  "metadata": {
+    "id": "urn:bbc:ares::asset:amharic/bbc_amharic_radio/liveradio",
+    "tags": {}
+  },
+  "content": {
+    "title": "ያድምጡ",
+    "subtitle": "ዝግጅቶቻችንን",
+    "blocks": [
+      {
+        "id": "liveradio",
+        "type": "media",
+        "format": "audio",
+        "title": "TODO",
+        "caption": "TODO",
+        "versions": [
+          {
+            "versionId": "liveradio"
+          }
         ]
-    },
-    "promo": {
-        "subType": "IDX",
-        "name": "TODO: Amharic Live Radio",
-        "uri": "/amharic/bbc_amharic_radio/liveradio",
-        "id": "TODO",
-        "type": "simple"
-    }
-}
\ No newline at end of file
+      }
+    ]
+  },
+  "promo": {
+    "subType": "IDX",
+    "name": "TODO: Amharic Live Radio",
+    "uri": "/amharic/bbc_amharic_radio/liveradio",
+    "id": "TODO",
+    "type": "simple"
+  }
+}
diff --git a/data/indonesia/bbc_indonesian_radio/liveradio.json b/data/indonesia/bbc_indonesian_radio/liveradio.json
index a7008ce0622..766c72f0d96 100644
--- a/data/indonesia/bbc_indonesian_radio/liveradio.json
+++ b/data/indonesia/bbc_indonesian_radio/liveradio.json
@@ -1,29 +1,31 @@
 {
-    "metadata": {
-        "id": "urn:bbc:ares::asset:indonesia/bbc_indonesian_radio/liveradio",
-        "tags": {}
-    },
-    "content": {
-        "blocks": [
-            {
-                "id": "liveradio",
-                "type": "media",
-                "format": "audio",
-                "title": "TODO",
-                "caption": "TODO",
-                "versions": [
-                    {
-                        "versionId": "liveradio"
-                    }
-                ]
-            }
+  "metadata": {
+    "id": "urn:bbc:ares::asset:indonesia/bbc_indonesian_radio/liveradio",
+    "tags": {}
+  },
+  "content": {
+    "title": "BBC Indonesia Radio",
+    "subtitle": "Berita dunia, ulasan, berita olahraga dan majalah mingguan dari BBC Indonesia Radio.",
+    "blocks": [
+      {
+        "id": "liveradio",
+        "type": "media",
+        "format": "audio",
+        "title": "TODO",
+        "caption": "TODO",
+        "versions": [
+          {
+            "versionId": "liveradio"
+          }
         ]
-    },
-    "promo": {
-        "subType": "IDX",
-        "name": "TODO: Indonesia Live Radio",
-        "uri": "/indonesia/bbc_indonesian_radio/liveradio",
-        "id": "TODO",
-        "type": "simple"
-    }
-}
\ No newline at end of file
+      }
+    ]
+  },
+  "promo": {
+    "subType": "IDX",
+    "name": "TODO: Indonesia Live Radio",
+    "uri": "/indonesia/bbc_indonesian_radio/liveradio",
+    "id": "TODO",
+    "type": "simple"
+  }
+}
diff --git a/data/korean/bbc_korean_radio/liveradio.json b/data/korean/bbc_korean_radio/liveradio.json
index 6858b840f89..5c70498ac8e 100644
--- a/data/korean/bbc_korean_radio/liveradio.json
+++ b/data/korean/bbc_korean_radio/liveradio.json
@@ -1,29 +1,31 @@
 {
-    "metadata": {
-        "id": "urn:bbc:ares::asset:korean/bbc_korean_radio/liveradio",
-        "tags": {}
-    },
-    "content": {
-        "blocks": [
-            {
-                "id": "liveradio",
-                "type": "media",
-                "format": "audio",
-                "title": "TODO",
-                "caption": "TODO",
-                "versions": [
-                    {
-                        "versionId": "liveradio"
-                    }
-                ]
-            }
+  "metadata": {
+    "id": "urn:bbc:ares::asset:korean/bbc_korean_radio/liveradio",
+    "tags": {}
+  },
+  "content": {
+    "title": "BBC 코리아 라디오",
+    "subtitle": "세계와 한반도 뉴스를 공정하고 객관적으로 전달해 드립니다",
+    "blocks": [
+      {
+        "id": "liveradio",
+        "type": "media",
+        "format": "audio",
+        "title": "TODO",
+        "caption": "TODO",
+        "versions": [
+          {
+            "versionId": "liveradio"
+          }
         ]
-    },
-    "promo": {
-        "subType": "IDX",
-        "name": "TODO: Korean Live Radio",
-        "uri": "/korean/bbc_korean_radio/liveradio",
-        "id": "TODO",
-        "type": "simple"
-    }
-}
\ No newline at end of file
+      }
+    ]
+  },
+  "promo": {
+    "subType": "IDX",
+    "name": "TODO: Korean Live Radio",
+    "uri": "/korean/bbc_korean_radio/liveradio",
+    "id": "TODO",
+    "type": "simple"
+  }
+}
diff --git a/data/tigrinya/bbc_tigrinya_radio/liveradio.json b/data/tigrinya/bbc_tigrinya_radio/liveradio.json
index 9937ebaff20..2f4871379eb 100644
--- a/data/tigrinya/bbc_tigrinya_radio/liveradio.json
+++ b/data/tigrinya/bbc_tigrinya_radio/liveradio.json
@@ -1,29 +1,31 @@
 {
-    "metadata": {
-        "id": "urn:bbc:ares::asset:tigrinya/bbc_tigrinya_radio/liveradio",
-        "tags": {}
-    },
-    "content": {
-        "blocks": [
-            {
-                "id": "liveradio",
-                "type": "media",
-                "format": "audio",
-                "title": "TODO",
-                "caption": "TODO",
-                "versions": [
-                    {
-                        "versionId": "liveradio"
-                    }
-                ]
-            }
+  "metadata": {
+    "id": "urn:bbc:ares::asset:tigrinya/bbc_tigrinya_radio/liveradio",
+    "tags": {}
+  },
+  "content": {
+    "title": "ስምዑ",
+    "subtitle": "መደባትና",
+    "blocks": [
+      {
+        "id": "liveradio",
+        "type": "media",
+        "format": "audio",
+        "title": "TODO",
+        "caption": "TODO",
+        "versions": [
+          {
+            "versionId": "liveradio"
+          }
         ]
-    },
-    "promo": {
-        "subType": "IDX",
-        "name": "TODO: Tigrinya Live Radio",
-        "uri": "/tigrinya/bbc_tigrinya_radio/liveradio",
-        "id": "TODO",
-        "type": "simple"
-    }
-}
\ No newline at end of file
+      }
+    ]
+  },
+  "promo": {
+    "subType": "IDX",
+    "name": "TODO: Tigrinya Live Radio",
+    "uri": "/tigrinya/bbc_tigrinya_radio/liveradio",
+    "id": "TODO",
+    "type": "simple"
+  }
+}
diff --git a/src/app/containers/MediaPageMain/index.jsx b/src/app/containers/MediaPageMain/index.jsx
index 25f2ba2008d..bc863cb4415 100644
--- a/src/app/containers/MediaPageMain/index.jsx
+++ b/src/app/containers/MediaPageMain/index.jsx
@@ -2,8 +2,6 @@ import React, { Fragment, useContext } from 'react';
 import { string, shape, object } from 'prop-types';
 import { Headline } from '@bbc/psammead-headings';
 import Paragraph from '@bbc/psammead-paragraph';
-import pathOr from 'ramda/src/pathOr';
-
 import MetadataContainer from '../Metadata';
 import { Grid, GridItemConstrainedMedium } from '../../lib/styledGrid';
 import { ServiceContext } from '../../contexts/ServiceContext';
@@ -11,13 +9,16 @@ import { ServiceContext } from '../../contexts/ServiceContext';
 const MediaPageMain = props => {
   const { pageData, service, match } = props;
   const { serviceId, mediaId } = match.params;
-  const { script, translations } = useContext(ServiceContext);
-
-  const { title, subtitle } = pathOr(null, ['media', serviceId], translations);
+  const { script } = useContext(ServiceContext);
+  const {
+    content: { title, subtitle },
+    promo,
+    metadata,
+  } = pageData;
 
   return (
     <Fragment>
-      <MetadataContainer metadata={pageData.metadata} promo={pageData.promo} />
+      <MetadataContainer metadata={metadata} promo={promo} />
       <main role="main">
         <Grid>
           <GridItemConstrainedMedium>
diff --git a/src/app/containers/MediaPageMain/index.test.jsx b/src/app/containers/MediaPageMain/index.test.jsx
index 3632c454a7a..75a64d5f248 100644
--- a/src/app/containers/MediaPageMain/index.test.jsx
+++ b/src/app/containers/MediaPageMain/index.test.jsx
@@ -10,6 +10,10 @@ const liveRadioScaffoldProps = {
       id: 'bbc_amharic_radio',
       tags: {},
     },
+    content: {
+      title: 'ያድምጡ',
+      subtitle: 'ዝግጅቶቻችንን',
+    },
     promo: {
       subType: 'IDX',
       name: 'BBC Amharic Radio',
diff --git a/src/app/lib/config/services/afaanoromoo.js b/src/app/lib/config/services/afaanoromoo.js
index 368e4bf9e74..ff7f1b30cd6 100644
--- a/src/app/lib/config/services/afaanoromoo.js
+++ b/src/app/lib/config/services/afaanoromoo.js
@@ -114,14 +114,6 @@ const service = {
       audio: 'Sagalee',
       photogallery: 'Kuusaa Fakkii',
       video: 'Viidiyoo',
-      bbc_oromo_radio: {
-        title: 'Dhaggeeffadhaa',
-        subtitle: 'Sagantaawwan keenya',
-      },
-      bbc_afaanoromoo_radio: {
-        title: 'Dhaggeeffadhaa',
-        subtitle: 'Sagantaawwan keenya',
-      },
     },
   },
   brandSVG,
diff --git a/src/app/lib/config/services/amharic.js b/src/app/lib/config/services/amharic.js
index 0b3b21769e3..e93d2f2363f 100644
--- a/src/app/lib/config/services/amharic.js
+++ b/src/app/lib/config/services/amharic.js
@@ -114,10 +114,6 @@ const service = {
       audio: 'ድምጽ',
       photogallery: 'የምስል ቋት',
       video: 'ተንቀሳቃሽ ምስል',
-      bbc_amharic_radio: {
-        title: 'ያድምጡ',
-        subtitle: 'ዝግጅቶቻችንን',
-      },
     },
   },
   brandSVG,
diff --git a/src/app/lib/config/services/indonesia.js b/src/app/lib/config/services/indonesia.js
index def00fdae8d..26831ad87ad 100644
--- a/src/app/lib/config/services/indonesia.js
+++ b/src/app/lib/config/services/indonesia.js
@@ -114,11 +114,6 @@ const service = {
       audio: 'Audio',
       photogallery: 'Galeri Foto',
       video: 'Video',
-      bbc_indonesian_radio: {
-        title: 'BBC Indonesia Radio',
-        subtitle:
-          'Berita dunia, ulasan, berita olahraga dan majalah mingguan dari BBC Indonesia Radio.',
-      },
     },
   },
   brandSVG,
diff --git a/src/app/lib/config/services/korean.js b/src/app/lib/config/services/korean.js
index b3a49c87985..54a49fdf856 100644
--- a/src/app/lib/config/services/korean.js
+++ b/src/app/lib/config/services/korean.js
@@ -114,10 +114,6 @@ const service = {
       audio: '오디오',
       photogallery: '이미지 갤러리',
       video: '비디오',
-      bbc_korean_radio: {
-        title: 'BBC 코리아 라디오',
-        subtitle: '세계와 한반도 뉴스를 공정하고 객관적으로 전달해 드립니다',
-      },
     },
   },
   brandSVG,
diff --git a/src/app/lib/config/services/tigrinya.js b/src/app/lib/config/services/tigrinya.js
index 53fa1b7bdea..e26d14969f2 100644
--- a/src/app/lib/config/services/tigrinya.js
+++ b/src/app/lib/config/services/tigrinya.js
@@ -113,10 +113,6 @@ const service = {
       audio: 'ድምፂ',
       photogallery: 'ማህደረ-ምስሊ',
       video: 'ቪድዮ',
-      bbc_tigrinya_radio: {
-        title: 'ስምዑ',
-        subtitle: 'መደባትና',
-      },
     },
   },
   brandSVG,