🐛 (explorer) merge configs despite different versions

owid · Nov 27, 2024 · 1ac45cb · 1ac45cb
1 parent 805bcbc
commit 1ac45cb
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 deletions.
diff --git a/packages/@ourworldindata/explorer/src/Explorer.tsx b/packages/@ourworldindata/explorer/src/Explorer.tsx
@@ -27,6 +27,7 @@ import {
     SlideShowManager,
     DEFAULT_GRAPHER_ENTITY_TYPE,
     GrapherAnalytics,
+    migrateGrapherConfigToLatestVersion,
 } from "@ourworldindata/grapher"
 import {
     Bounds,
@@ -285,14 +286,33 @@ export class Explorer
         this.grapher = grapher
     }
 
-    @computed get grapherConfigs() {
-        const arr = this.props.grapherConfigs || []
-        return new Map(arr.map((config) => [config.id!, config]))
+    @computed get validGrapherConfigs(): GrapherInterface[] {
+        const { grapherConfigs = [] } = this.props
+        return grapherConfigs.map((config) =>
+            migrateGrapherConfigToLatestVersion(config)
+        )
+    }
+
+    @computed get validPartialGrapherConfigs(): GrapherInterface[] {
+        const { partialGrapherConfigs = [] } = this.props
+        return partialGrapherConfigs.map((config) =>
+            migrateGrapherConfigToLatestVersion(config)
+        )
+    }
+
+    @computed get grapherConfigsById() {
+        return new Map(
+            this.validGrapherConfigs.map((config) => [config.id!, config])
+        )
     }
 
     @computed get partialGrapherConfigsByVariableId() {
-        const arr = this.props.partialGrapherConfigs || []
-        return new Map(arr.map((config) => [config.id!, config]))
+        return new Map(
+            this.validPartialGrapherConfigs.map((config) => [
+                config.id!,
+                config,
+            ])
+        )
     }
 
     private setUpIntersectionObserver(): void {
@@ -553,7 +573,7 @@ export class Explorer
         if (!grapher) return
 
         const { grapherId } = this.explorerProgram.explorerGrapherConfig
-        const grapherConfig = this.grapherConfigs.get(grapherId!) ?? {}
+        const grapherConfig = this.grapherConfigsById.get(grapherId!) ?? {}
 
         const config: GrapherProgrammaticInterface = {
             ...mergeGrapherConfigs(

diff --git a/site/multiembedder/MultiEmbedder.tsx b/site/multiembedder/MultiEmbedder.tsx
@@ -9,6 +9,7 @@ import {
     hydrateGlobalEntitySelectorIfAny,
     migrateSelectedEntityNamesParam,
     SelectionArray,
+    migrateGrapherConfigToLatestVersion,
 } from "@ourworldindata/grapher"
 import {
     fetchText,
@@ -199,8 +200,11 @@ class MultiEmbedder {
             } else {
                 configUrl = `${GRAPHER_DYNAMIC_CONFIG_URL}/${slug}.config.json`
             }
-            const grapherPageConfig = await fetch(configUrl).then((res) =>
-                res.json()
+            const fetchedGrapherPageConfig = await fetch(configUrl).then(
+                (res) => res.json()
+            )
+            const grapherPageConfig = migrateGrapherConfigToLatestVersion(
+                fetchedGrapherPageConfig
             )
 
             const figureConfigAttr = figure.getAttribute(