Merge pull request #2849 from owid/data-page-improve-fallback-chains

✨ improve data page fallback chains
owid · Oct 25, 2023 · dfbff10 · dfbff10
2 parents eb22ba8 + 749f85d
commit dfbff10
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/datapage/Datapage.ts b/datapage/Datapage.ts
@@ -50,11 +50,10 @@ export const getDatapageDataV2 = async (
             title:
                 variableMetadata.presentation?.titlePublic ??
                 partialGrapherConfig.title ??
+                variableMetadata.display?.name ??
                 variableMetadata.name ??
                 "",
-            descriptionShort:
-                variableMetadata.descriptionShort ??
-                partialGrapherConfig.subtitle,
+            descriptionShort: variableMetadata.descriptionShort,
             descriptionFromProducer: variableMetadata.descriptionFromProducer,
             attributionShort: variableMetadata.presentation?.attributionShort,
             titleVariant: variableMetadata.presentation?.titleVariant,

diff --git a/packages/@ourworldindata/grapher/src/modal/SourcesModal.tsx b/packages/@ourworldindata/grapher/src/modal/SourcesModal.tsx
@@ -82,10 +82,7 @@ export class SourcesModal extends React.Component<{
                 maxTime
             )}`
 
-        const title =
-            column.def.titlePublic && column.def.titlePublic !== ""
-                ? column.def.titlePublic
-                : column.name
+        const title = column.displayName
 
         const retrievedDate =
             source.retrievedDate ??