Merge pull request #3230 from owid/fix-key-indicator-title-in-collection

🐛 (key-indicator) make sure title matches the datapage title
owid · Feb 22, 2024 · edc93b1 · edc93b1
2 parents 8fbf4ab + 6fb716b
commit edc93b1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/baker/SiteBaker.tsx b/baker/SiteBaker.tsx
@@ -346,15 +346,19 @@ export class SiteBaker {
             )
             const publishedChartsBySlug = keyBy(publishedCharts, "originalSlug")
 
-            const datapageIndicatorIds = excludeUndefined(
-                publishedCharts.map((chart) => chart.indicatorId)
+            const publishedChartsWithIndicatorIds = publishedCharts.filter(
+                (chart) => chart.indicatorId
             )
+
             const datapageIndicators: LinkedIndicator[] = await Promise.all(
-                datapageIndicatorIds.map(async (indicatorId: number) => {
+                publishedChartsWithIndicatorIds.map(async (linkedChart) => {
+                    const indicatorId = linkedChart.indicatorId as number
                     const metadata = await getVariableMetadata(indicatorId)
                     return {
                         id: indicatorId,
-                        ...grabMetadataForGdocLinkedIndicator(metadata),
+                        ...grabMetadataForGdocLinkedIndicator(metadata, {
+                            chartConfigTitle: linkedChart.title,
+                        }),
                     }
                 })
             )

diff --git a/db/model/Gdoc/GdocBase.ts b/db/model/Gdoc/GdocBase.ts
@@ -650,7 +650,9 @@ export class GdocBase extends BaseEntity implements OwidGdocBaseInterface {
                 )
                 const linkedIndicator: LinkedIndicator = {
                     id: linkedChart.indicatorId,
-                    ...grabMetadataForGdocLinkedIndicator(metadata),
+                    ...grabMetadataForGdocLinkedIndicator(metadata, {
+                        chartConfigTitle: linkedChart.title,
+                    }),
                 }
                 return linkedIndicator
             })

diff --git a/packages/@ourworldindata/utils/src/metadataHelpers.ts b/packages/@ourworldindata/utils/src/metadataHelpers.ts
@@ -276,11 +276,13 @@ export const formatSourceDate = (
 }
 
 export function grabMetadataForGdocLinkedIndicator(
-    metadata: OwidVariableWithSourceAndDimension
+    metadata: OwidVariableWithSourceAndDimension,
+    { chartConfigTitle }: { chartConfigTitle: string }
 ): Omit<LinkedIndicator, "id"> {
     return {
         title:
             metadata.presentation?.titlePublic ||
+            chartConfigTitle ||
             metadata.presentation?.grapherConfigETL?.title ||
             metadata.display?.name ||
             metadata.name ||