✨ (grapher) disallow switching to a slope chart for projections

owid · Nov 21, 2024 · bbf1d39 · bbf1d39
1 parent 60d5738
commit bbf1d39
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 10 deletions.
diff --git a/packages/@ourworldindata/grapher/src/chart/ChartUtils.tsx b/packages/@ourworldindata/grapher/src/chart/ChartUtils.tsx
@@ -1,5 +1,5 @@
 import React from "react"
-import { Box, getCountryByName } from "@ourworldindata/utils"
+import { areSetsEqual, Box, getCountryByName } from "@ourworldindata/utils"
 import {
     SeriesStrategy,
     EntityName,
@@ -15,6 +15,7 @@ import {
     GRAPHER_SIDE_PANEL_CLASS,
     GRAPHER_TIMELINE_CLASS,
     GRAPHER_SETTINGS_CLASS,
+    validChartTypeCombinations,
 } from "../core/GrapherConstants"
 
 export const autoDetectYColumnSlugs = (manager: ChartManager): string[] => {
@@ -175,3 +176,15 @@ export function mapChartTypeNameToQueryParam(
             return GRAPHER_TAB_QUERY_PARAMS.marimekko
     }
 }
+
+export function findValidChartTypeCombination(
+    chartTypes: GrapherChartType[]
+): GrapherChartType[] | undefined {
+    const chartTypeSet = new Set(chartTypes)
+    for (const validCombination of validChartTypeCombinations) {
+        const validCombinationSet = new Set(validCombination)
+        if (areSetsEqual(chartTypeSet, validCombinationSet))
+            return validCombination
+    }
+    return undefined
+}
diff --git a/packages/@ourworldindata/grapher/src/core/Grapher.tsx b/packages/@ourworldindata/grapher/src/core/Grapher.tsx
@@ -66,7 +66,6 @@ import {
     extractDetailsFromSyntax,
     omit,
     isTouchDevice,
-    areSetsEqual,
 } from "@ourworldindata/utils"
 import {
     MarkdownTextWrap,
@@ -138,7 +137,6 @@ import {
     GRAPHER_FRAME_PADDING_HORIZONTAL,
     GRAPHER_FRAME_PADDING_VERTICAL,
     latestGrapherConfigSchema,
-    validChartTypeCombinations,
 } from "../core/GrapherConstants"
 import { loadVariableDataAndMetadata } from "./loadVariable"
 import Cookies from "js-cookie"
@@ -200,6 +198,7 @@ import { ScatterPlotManager } from "../scatterCharts/ScatterPlotChartConstants"
 import {
     autoDetectSeriesStrategy,
     autoDetectYColumnSlugs,
+    findValidChartTypeCombination,
     mapChartTypeNameToQueryParam,
     mapQueryParamToChartTypeName,
 } from "../chart/ChartUtils"
@@ -1525,21 +1524,31 @@ export class Grapher
         })
     }
 
+    @computed get hasProjectedData(): boolean {
+        return this.inputTable.numericColumnSlugs.some(
+            (slug) => this.inputTable.get(slug).isProjection
+        )
+    }
+
     @computed get validChartTypes(): GrapherChartType[] {
         const { chartTypes } = this
 
         // all single-chart Graphers are valid
         if (chartTypes.length <= 1) return chartTypes
 
-        const chartTypeSet = new Set(chartTypes)
-        for (const validCombination of validChartTypeCombinations) {
-            const validCombinationSet = new Set(validCombination)
-            if (areSetsEqual(chartTypeSet, validCombinationSet))
-                return validCombination
-        }
+        // find valid combination in a pre-defined list
+        const validChartTypes = findValidChartTypeCombination(chartTypes)
 
         // if the given combination is not valid, then ignore all but the first chart type
-        return chartTypes.slice(0, 1)
+        if (!validChartTypes) return chartTypes.slice(0, 1)
+
+        // projected data is only supported for line charts
+        const isLineChart = validChartTypes[0] === GRAPHER_CHART_TYPES.LineChart
+        if (isLineChart && this.hasProjectedData) {
+            return [GRAPHER_CHART_TYPES.LineChart]
+        }
+
+        return validChartTypes
     }
 
     @computed get validChartTypeSet(): Set<GrapherChartType> {