🔨 fix some issues

owid · Dec 23, 2024 · a4d3539 · a4d3539
1 parent 6c220d3
commit a4d3539
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/packages/@ourworldindata/grapher/src/core/Grapher.tsx b/packages/@ourworldindata/grapher/src/core/Grapher.tsx
@@ -191,7 +191,11 @@ import {
     DefaultChartClass,
 } from "../chart/ChartTypeMap"
 import { Entity, SelectionArray } from "../selection/SelectionArray"
-import { legacyToOwidTableAndDimensions } from "./LegacyToOwidTable"
+import {
+    addSelectedEntityColorsToTable,
+    computeActualDimensions,
+    legacyToOwidTableAndDimensions,
+} from "./LegacyToOwidTable"
 import { ScatterPlotManager } from "../scatterCharts/ScatterPlotChartConstants"
 import {
     autoDetectSeriesStrategy,
@@ -1155,7 +1159,9 @@ export class Grapher
                   legacyConfig.selectedEntityColors
               )
             : table
-        const dimensions = legacyConfig.dimensions ?? []
+        const dimensions = legacyConfig.dimensions
+            ? computeActualDimensions(legacyConfig.dimensions)
+            : []
         this.createPerformanceMeasurement(
             "legacyToOwidTableAndDimensions",
             startMark

diff --git a/packages/@ourworldindata/grapher/src/core/LegacyToOwidTable.ts b/packages/@ourworldindata/grapher/src/core/LegacyToOwidTable.ts
@@ -61,12 +61,7 @@ export const legacyToOwidTableAndDimensions = (
 
     // We need to create a column for each unique [variable, targetTime] pair. So there can be
     // multiple columns for a single variable.
-    const newDimensions = dimensions.map((dimension) => ({
-        ...dimension,
-        slug: dimension.targetYear
-            ? `${dimension.variableId}-${dimension.targetYear}`
-            : `${dimension.variableId}`,
-    }))
+    const newDimensions = computeActualDimensions(dimensions)
     const dimensionColumns = uniqBy(newDimensions, (dim) => dim.slug)
 
     const variableTablesToJoinByYear: OwidTable[] = []
@@ -333,16 +328,16 @@ export const legacyToOwidTableAndDimensions = (
 
 export const addSelectedEntityColorsToTable = (
     table: OwidTable,
-    selectedEntityColors: { [entityName: string]: string }
+    selectedEntityColors: { [entityName: string]: string | undefined }
 ): OwidTable => {
     const entityColorColumnSlug = OwidTableSlugs.entityColor
 
     const valueFn = (entityId: EntityId | undefined) => {
-        // see comment above about entityMetaById[id]
         if (!entityId) return ErrorValueTypes.UndefinedButShouldBeString
         const entityName = table.entityIdToNameMap.get(entityId)
         return entityName && selectedEntityColors
-            ? selectedEntityColors[entityName]
+            ? (selectedEntityColors[entityName] ??
+                  ErrorValueTypes.UndefinedButShouldBeString)
             : ErrorValueTypes.UndefinedButShouldBeString
     }
 
@@ -743,6 +738,17 @@ const annotationsToMap = (annotations: string): Map<string, string> => {
     return entityAnnotationsMap
 }
 
+export function computeActualDimensions(
+    dimensions: OwidChartDimensionInterface[]
+): OwidChartDimensionInterface[] {
+    return dimensions.map((dimension) => ({
+        ...dimension,
+        slug: dimension.targetYear
+            ? `${dimension.variableId}-${dimension.targetYear}`
+            : `${dimension.variableId}`,
+    }))
+}
+
 /**
  * Loads a single variable into an OwidTable.
  */