fix(multi-dim): handle missing indicators gracefully

owid · Jul 29, 2024 · 8b77661 · 8b77661
1 parent 0faa6fd
commit 8b77661
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/adminSiteServer/mockSiteRouter.tsx b/adminSiteServer/mockSiteRouter.tsx
@@ -217,7 +217,7 @@ getPlainRouteNonIdempotentWithRWTransaction(
     "/grapher/:slug",
     async (req, res, trx) => {
         const chartRow = await getChartConfigBySlug(trx, req.params.slug).catch(
-            noop
+            console.error
         )
         if (chartRow) {
             // XXX add dev-prod parity for this
@@ -231,7 +231,7 @@ getPlainRouteNonIdempotentWithRWTransaction(
             const page = await renderMultiDimDataPageBySlug(
                 trx,
                 req.params.slug
-            ).catch(noop)
+            ).catch(console.error)
             if (page) {
                 res.send(page)
                 return

diff --git a/baker/MultiDimBaker.tsx b/baker/MultiDimBaker.tsx
@@ -46,10 +46,11 @@ const resolveMultiDimDataPageCatalogPathsToIndicatorIds = async (
 ): Promise<MultiDimDataPageConfigPreProcessed> => {
     const allCatalogPaths = rawConfig.views
         .flatMap((view) =>
-            Object.values(view.indicators).flatMap((indicatorOrIndicators) =>
-                Array.isArray(indicatorOrIndicators)
-                    ? indicatorOrIndicators
-                    : [indicatorOrIndicators]
+            Object.values(view.indicators ?? {}).flatMap(
+                (indicatorOrIndicators) =>
+                    Array.isArray(indicatorOrIndicators)
+                        ? indicatorOrIndicators
+                        : [indicatorOrIndicators]
             )
         )
         .filter((indicator) => typeof indicator === "string")
@@ -95,12 +96,13 @@ const resolveMultiDimDataPageCatalogPathsToIndicatorIds = async (
     }
 
     for (const view of rawConfig.views) {
-        view.indicators = Object.fromEntries(
-            Object.entries(view.indicators).map(([key, value]) => [
-                key,
-                resolveField(value),
-            ])
-        ) as any
+        if (view.indicators)
+            view.indicators = Object.fromEntries(
+                Object.entries(view.indicators).map(([key, value]) => [
+                    key,
+                    resolveField(value),
+                ])
+            ) as any
     }
 
     return rawConfig as MultiDimDataPageConfigPreProcessed

diff --git a/public/multi-dim/energy.yml b/public/multi-dim/energy.yml
@@ -71,25 +71,25 @@ views:
           source: all
           metric: total
       indicators:
-          y: 900831
+          y: grapher/energy/2024-05-08/primary_energy_consumption/primary_energy_consumption#primary_energy_consumption__twh
     - dimensions:
           source: all
           metric: per_capita
       indicators:
-          y: 900839
+          y: grapher/energy/2024-05-08/primary_energy_consumption/primary_energy_consumption#primary_energy_consumption_per_capita__kwh
     - dimensions:
           source: all
           metric: share_total
     - dimensions:
           source: all
           metric: proportional_change
       indicators:
-          y: 900830
+          y: grapher/energy/2024-05-08/primary_energy_consumption/primary_energy_consumption#annual_change_in_primary_energy_consumption__pct
     - dimensions:
           source: all
           metric: absolute_change
       indicators:
-          y: 900832
+          y: grapher/energy/2024-05-08/primary_energy_consumption/primary_energy_consumption#annual_change_in_primary_energy_consumption__twh
 
     - dimensions:
           source: fossil

diff --git a/site/multiDim/MultiDimDataPageContent.tsx b/site/multiDim/MultiDimDataPageContent.tsx
@@ -216,7 +216,7 @@ export const MultiDimDataPageContent = ({
 
     useEffect(() => {
         setDatapageDataFromVar(null)
-        const yIndicatorOrIndicators = currentView?.indicators["y"]
+        const yIndicatorOrIndicators = currentView?.indicators?.["y"]
         const variableId = Array.isArray(yIndicatorOrIndicators)
             ? yIndicatorOrIndicators[0]
             : yIndicatorOrIndicators