Merge pull request #91 from guardian/pf/add-ap-newswires-to-mapping

Add our own AP & Reuters feeds to API/UI
guardian · Jan 16, 2025 · 1c747df · 1c747df
2 parents 84f5ffb + f61f6e8
commit 1c747df
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 7 deletions.
diff --git a/newswires/app/conf/SourceFeedSupplierMapping.scala b/newswires/app/conf/SourceFeedSupplierMapping.scala
@@ -15,6 +15,7 @@ object SourceFeedSupplierMapping {
 
   private val lookup = Map(
     "REUTERS" -> List("REUTERS"),
+    "GUREUTERS" -> List("Reuters-Newswires"),
     "AAP" -> List("AAP"),
     "AP" -> List(
       "ADVIS",
@@ -62,6 +63,9 @@ object SourceFeedSupplierMapping {
       "WEATHER",
       "WORLD"
     ),
+    "GUAP" -> List( // for feeds coming from our own poller
+      "AP-Newswires"
+    ),
     "PA" -> List(
       "PA",
       "PA ACCESSWIRE",

diff --git a/newswires/app/db/FingerpostWireEntry.scala b/newswires/app/db/FingerpostWireEntry.scala
@@ -48,7 +48,8 @@ case class FingerpostWire(
     language: Option[String],
     usage: Option[String],
     location: Option[String],
-    bodyText: Option[String]
+    bodyText: Option[String],
+    ednote: Option[String]
 )
 object FingerpostWire {
   // rename a couple of fields

diff --git a/newswires/client/src/SideNav.tsx b/newswires/client/src/SideNav.tsx
@@ -16,7 +16,7 @@ import { css } from '@emotion/react';
 import { useCallback, useMemo, useState } from 'react';
 import { useSearch } from './context/SearchContext.tsx';
 import { SearchBox } from './SearchBox';
-import { brandColours } from './sharedStyles';
+import { AAPBrand, APBrand, PABrand, reutersBrand } from './sharedStyles';
 import type { Query } from './sharedTypes';
 
 function decideLabelForQueryBadge(query: Query): string {
@@ -28,7 +28,36 @@ function decideLabelForQueryBadge(query: Query): string {
 	return labels.filter((label) => label.length > 0).join(' ');
 }
 
-const recognisedSuppliers = ['REUTERS', 'AP', 'AAP', 'PA'];
+const supplierData: Record<
+	string,
+	{
+		label: string;
+		colour: string;
+	}
+> = {
+	REUTERS: { label: 'Reuters', colour: reutersBrand },
+	AP: {
+		label: 'AP',
+		colour: APBrand,
+	},
+	AAP: {
+		label: 'AAP',
+		colour: AAPBrand,
+	},
+	PA: {
+		label: 'PA',
+		colour: PABrand,
+	},
+	GuAP: {
+		label: 'AP (Gu)',
+		colour: APBrand,
+	},
+	GuReuters: {
+		label: 'Reuters (Gu)',
+		colour: reutersBrand,
+	},
+};
+const recognisedSuppliers = Object.keys(supplierData);
 const buckets = [
 	{ id: 'no-sports', name: 'No Sports' },
 	{ id: 'pa-home', name: 'PA Home' },
@@ -98,11 +127,11 @@ export const SideNav = () => {
 				onClick: () => handleEnterQuery({ ...config.query, supplier: [] }),
 				colour: 'black',
 			},
-			...recognisedSuppliers.map((supplier) => ({
-				label: supplier,
+			...Object.entries(supplierData).map(([supplier, { label, colour }]) => ({
+				label,
 				isActive:
 					activeSuppliers.includes(supplier) || activeSuppliers.length === 0,
-				colour: brandColours.get(supplier) ?? 'black',
+				colour: colour,
 				onClick: () => toggleSupplier(supplier),
 			})),
 		],

diff --git a/newswires/client/src/WireDetail.tsx b/newswires/client/src/WireDetail.tsx
@@ -23,7 +23,7 @@ export const WireDetail = ({
 	isShowingJson: boolean;
 }) => {
 	const theme = useEuiTheme();
-	const { byline, keywords, usage } = wire.content;
+	const { byline, keywords, usage, ednote } = wire.content;
 
 	const safeBodyText = useMemo(() => {
 		return wire.content.bodyText
@@ -74,6 +74,18 @@ export const WireDetail = ({
 							}
 						`}
 					>
+						{ednote && (
+							<p
+								css={css`
+									border: 1px solid;
+									padding: ${theme.euiTheme.size.s};
+									margin-bottom: ${theme.euiTheme.size.s};
+									font-weight: ${theme.euiTheme.font.weight.bold};
+								`}
+							>
+								{ednote}
+							</p>
+						)}
 						{byline && (
 							<>
 								<EuiDescriptionListTitle>Byline</EuiDescriptionListTitle>
@@ -112,6 +124,11 @@ export const WireDetail = ({
 								<EuiDescriptionListDescription>
 									<article
 										dangerouslySetInnerHTML={{ __html: bodyTextContent }}
+										css={css`
+											& p {
+												margin-bottom: ${theme.euiTheme.size.s};
+											}
+										`}
 										data-pinboard-selection-target
 									/>
 								</EuiDescriptionListDescription>

diff --git a/newswires/client/src/sharedTypes.ts b/newswires/client/src/sharedTypes.ts
@@ -23,6 +23,7 @@ const FingerpostContentSchema = z
 		usage: z.string(),
 		location: z.string(),
 		bodyText: z.string(),
+		ednote: z.string(),
 	})
 	.partial();