Comment fixes

- Add title to placeholder config - Add 'kind' to playlist items
bbc · Oct 3, 2024 · 7c8fb79 · 7c8fb79
1 parent b6e8b86
commit 7c8fb79
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 19 deletions.
diff --git a/src/app/components/MediaLoader/configs/legacyMedia.ts b/src/app/components/MediaLoader/configs/legacyMedia.ts
@@ -1,3 +1,4 @@
+import { MediaOverrides } from '#app/models/types/media';
 import filterForBlockType from '#lib/utilities/blockHandlers';
 import {
   LegacyMediaBlock,
@@ -14,6 +15,9 @@ export default ({
   const legacyMediaBlock: LegacyMediaBlock =
     filterForBlockType(blocks, 'legacyMedia') ?? {};
 
+  const { model: mediaOverrides }: MediaOverrides =
+    filterForBlockType(blocks, 'mediaOverrides') || {};
+
   const { image, format, playlist } = legacyMediaBlock?.content ?? {};
 
   const placeholderConfig = buildPlaceholderConfig({
@@ -25,14 +29,14 @@ export default ({
 
   const mp4Items = playlist
     ?.filter(item => item.format === 'mp4')
-    ?.map(item => ({ href: item.url }));
+    ?.map(item => ({ href: item.url, kind: 'programme' }));
 
   return {
     mediaType: format || 'video',
     playerConfig: {
       ...basePlayerConfig,
       playlistObject: {
-        title: '',
+        title: mediaOverrides?.pageTitleOverride || '',
         holdingImageURL: image?.href,
         items: mp4Items,
       },

diff --git a/src/app/components/MediaLoader/types.ts b/src/app/components/MediaLoader/types.ts
@@ -65,6 +65,7 @@ export type PlaylistItem = {
 
 export type LegacyPlayListItem = {
   href: string;
+  kind: string;
 };
 
 export type ConfigBuilderProps = {

diff --git a/src/app/components/MediaLoader/utils/buildSettings.test.ts b/src/app/components/MediaLoader/utils/buildSettings.test.ts
@@ -305,9 +305,18 @@ describe('buildSettings', () => {
     });
 
     it('Should process a LegacyMediaBlock into a valid playlist item for a "MAP" page', () => {
+      const legacyMediaOverrides = {
+        model: {
+          pageTitleOverride: 'Legacy Media Page Title',
+        },
+        type: 'mediaOverrides',
+      };
+
       const result = buildSettings({
         ...baseSettings,
-        blocks: legacyMediaBlock as MediaBlock[],
+        service: 'arabic',
+        counterName: 'arabic.multimedia.2013.12.131208_iraq_blast_.page',
+        blocks: [legacyMediaBlock, legacyMediaOverrides] as MediaBlock[],
       });
 
       expect(result).toStrictEqual({
@@ -320,22 +329,25 @@ describe('buildSettings', () => {
             producer: 'SERBIAN',
           },
           enableToucan: true,
-          appName: 'news-serbian',
+          appName: 'news-arabic',
           appType: 'responsive',
-          counterName: 'live_coverage.testID.page',
+          counterName: 'arabic.multimedia.2013.12.131208_iraq_blast_.page',
           playlistObject: {
-            title: '',
+            title: 'Legacy Media Page Title',
             holdingImageURL:
               'http://a.files.bbci.co.uk/worldservice/live/assets/images/2013/12/08/131208135805_iraq_blast_640x360_bbc_nocredit.jpg',
             items: [
               {
                 href: 'https://wsodprogrf.akamaized.net/arabic/dps/2013/12/iraqblast_16x9_lo.mp4',
+                kind: 'programme',
               },
               {
                 href: 'https://wsodprogrf.akamaized.net/arabic/dps/2013/12/iraqblast_16x9_med.mp4',
+                kind: 'programme',
               },
               {
                 href: 'https://wsodprogrf.akamaized.net/arabic/dps/2013/12/iraqblast_16x9_hi.mp4',
+                kind: 'programme',
               },
             ],
           },

diff --git a/src/app/models/types/media.ts b/src/app/models/types/media.ts
@@ -78,9 +78,9 @@ export type LiveRadioBlock = {
 
 export type MediaOverrides = {
   model: {
-    language: string;
-    pageIdentifierOverride: string;
-    pageTitleOverride: string;
+    language?: string;
+    pageIdentifierOverride?: string;
+    pageTitleOverride?: string;
   };
   type: 'mediaOverrides';
 };
diff --git a/src/app/pages/MediaArticlePage/MediaArticlePage.tsx b/src/app/pages/MediaArticlePage/MediaArticlePage.tsx
@@ -9,6 +9,7 @@ import { ARTICLE_PAGE, MEDIA_ASSET_PAGE } from '#app/routes/utils/pageTypes';
 import { Tag } from '#app/components/LinkedData/types';
 import { Article, OptimoBylineBlock } from '#app/models/types/optimo';
 import { RequestContext } from '#app/contexts/RequestContext';
+import { MediaOverrides } from '#app/models/types/media';
 import useToggle from '../../hooks/useToggle';
 import {
   getArticleId,
@@ -182,16 +183,23 @@ const MediaArticlePage = ({ pageData }: { pageData: Article }) => {
         )}
       </div>
     ),
-    legacyMedia: (props: ComponentToRenderProps) => (
-      <div
-        css={({ spacings }: Theme) => [
-          `padding-top: ${spacings.TRIPLE}rem`,
-          isCpsMap && styles.cafMediaPlayer,
-        ]}
-      >
-        <MediaLoader blocks={[props] as unknown as MediaBlock[]} />
-      </div>
-    ),
+    legacyMedia: (props: ComponentToRenderProps) => {
+      const mediaOverrides: MediaOverrides = {
+        model: { pageTitleOverride: headline },
+        type: 'mediaOverrides',
+      };
+
+      return (
+        <div
+          css={({ spacings }: Theme) => [
+            `padding-top: ${spacings.TRIPLE}rem`,
+            isCpsMap && styles.cafMediaPlayer,
+          ]}
+        >
+          <MediaLoader blocks={[props, mediaOverrides] as MediaBlock[]} />
+        </div>
+      );
+    },
     text,
     byline: () =>
       hasByline ? (