fix: fix rebase issue regarding source metadata

owid · Nov 16, 2023 · 289d052 · 289d052
1 parent 972e45f
commit 289d052
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/packages/@ourworldindata/core-table/src/CoreColumnDef.ts b/packages/@ourworldindata/core-table/src/CoreColumnDef.ts
@@ -74,7 +74,12 @@ export interface CoreColumnDef extends ColumnColorScale {
     color?: Color // A column can have a fixed color for use in charts where the columns are series
 
     // Source information used for display only
-    source?: OwidSource
+    sourceName?: string
+    sourceLink?: string
+    dataPublishedBy?: string
+    dataPublisherSource?: string
+    retrievedDate?: string
+    additionalInfo?: string
     timespan?: string
 
     // Metadata v2

diff --git a/packages/@ourworldindata/grapher/src/core/LegacyToOwidTable.ts b/packages/@ourworldindata/grapher/src/core/LegacyToOwidTable.ts
@@ -588,7 +588,12 @@ const columnDefFromOwidVariable = (
         datasetName,
         display,
         nonRedistributable,
-        source,
+        sourceLink: source?.link,
+        sourceName: source?.name,
+        dataPublishedBy: source?.dataPublishedBy,
+        dataPublisherSource: source?.dataPublisherSource,
+        retrievedDate: source?.retrievedDate,
+        additionalInfo: source?.additionalInfo,
         timespan,
         origins,
         presentation,

diff --git a/packages/@ourworldindata/grapher/src/modal/SourcesModal.tsx b/packages/@ourworldindata/grapher/src/modal/SourcesModal.tsx
@@ -9,6 +9,7 @@ import {
     splitSourceTextIntoFragments,
     DisplaySource,
     prepareSourcesForDisplay,
+    OwidSource,
 } from "@ourworldindata/utils"
 import {
     IndicatorKeyData,
@@ -91,6 +92,10 @@ export class Source extends React.Component<{
         return this.props.column.def
     }
 
+    @computed private get source(): OwidSource {
+        return this.props.column.source ?? {}
+    }
+
     @computed private get title(): string {
         return this.def.display?.name || this.def.name || ""
     }
@@ -134,12 +139,12 @@ export class Source extends React.Component<{
         return (
             (this.def.descriptionKey && this.def.descriptionKey.length > 0) ||
             !!this.def.descriptionFromProducer ||
-            !!this.def.source?.additionalInfo
+            !!this.source.additionalInfo
         )
     }
 
     @computed private get sourceLinks(): string[] {
-        return splitSourceTextIntoFragments(this.def.source?.link)
+        return splitSourceTextIntoFragments(this.source.link)
     }
 
     @computed private get sourcesForDisplay(): DisplaySource[] {
@@ -181,7 +186,7 @@ export class Source extends React.Component<{
                         attributionShort={
                             this.def.presentation?.attributionShort
                         }
-                        additionalInfo={this.def.source?.additionalInfo}
+                        additionalInfo={this.source.additionalInfo}
                         isEmbeddedInADataPage={this.props.isEmbeddedInADataPage}
                     />
                 )}