enhance(grapher): only run transforms for tableForSelection if necessary

owid · Oct 17, 2023 · 994659e · 994659e
1 parent 8845200
commit 994659e
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 22 deletions.
diff --git a/packages/@ourworldindata/grapher/src/barCharts/DiscreteBarChart.tsx b/packages/@ourworldindata/grapher/src/barCharts/DiscreteBarChart.tsx
@@ -139,11 +139,13 @@ export class DiscreteBarChart
     }
 
     transformTableForSelection(table: OwidTable): OwidTable {
-        table = table
-            .replaceNonNumericCellsWithErrorValues(this.yColumnSlugs)
-            .dropRowsWithErrorValuesForAllColumns(this.yColumnSlugs)
-
+        // if entities with partial data are not plotted,
+        // make sure they don't show up in the entity selector
         if (this.missingDataStrategy === MissingDataStrategy.hide) {
+            table = table
+                .replaceNonNumericCellsWithErrorValues(this.yColumnSlugs)
+                .dropRowsWithErrorValuesForAllColumns(this.yColumnSlugs)
+
             const groupedByEntity = table.groupBy("entityName").map((t) => {
                 if (t.hasAnyColumnNoValidValue(this.yColumnSlugs)) {
                     t = t.dropAllRows()

diff --git a/packages/@ourworldindata/grapher/src/lineCharts/LineChart.tsx b/packages/@ourworldindata/grapher/src/lineCharts/LineChart.tsx
@@ -301,9 +301,13 @@ export class LineChart
     }
 
     transformTableForSelection(table: OwidTable): OwidTable {
-        table = table.replaceNonNumericCellsWithErrorValues(this.yColumnSlugs)
-
+        // if entities with partial data are not plotted,
+        // make sure they don't show up in the entity selector
         if (this.missingDataStrategy === MissingDataStrategy.hide) {
+            table = table.replaceNonNumericCellsWithErrorValues(
+                this.yColumnSlugs
+            )
+
             const groupedByEntity = table.groupBy("entityName").map((t) => {
                 if (t.hasAnyColumnNoValidValue(this.yColumnSlugs)) {
                     t = t.dropAllRows()

diff --git a/packages/@ourworldindata/grapher/src/stackedCharts/AbstractStackedChart.tsx b/packages/@ourworldindata/grapher/src/stackedCharts/AbstractStackedChart.tsx
@@ -85,17 +85,19 @@ export class AbstractStackedChart
     }
 
     transformTableForSelection(table: OwidTable): OwidTable {
-        table = table
-            .replaceNonNumericCellsWithErrorValues(this.yColumnSlugs)
-            .dropRowsWithErrorValuesForAllColumns(this.yColumnSlugs)
+        // if entities with partial data are not plotted,
+        // make sure they don't show up in the entity selector
+        if (this.missingDataStrategy !== MissingDataStrategy.show) {
+            table = table
+                .replaceNonNumericCellsWithErrorValues(this.yColumnSlugs)
+                .dropRowsWithErrorValuesForAllColumns(this.yColumnSlugs)
 
-        if (this.shouldRunLinearInterpolation) {
-            this.yColumnSlugs.forEach((slug) => {
-                table = table.interpolateColumnLinearly(slug)
-            })
-        }
+            if (this.shouldRunLinearInterpolation) {
+                this.yColumnSlugs.forEach((slug) => {
+                    table = table.interpolateColumnLinearly(slug)
+                })
+            }
 
-        if (this.missingDataStrategy !== MissingDataStrategy.show) {
             const groupedByEntity = table
                 .groupBy("entityName")
                 .map((t: OwidTable) =>

diff --git a/packages/@ourworldindata/grapher/src/stackedCharts/StackedDiscreteBarChart.tsx b/packages/@ourworldindata/grapher/src/stackedCharts/StackedDiscreteBarChart.tsx
@@ -143,15 +143,17 @@ export class StackedDiscreteBarChart
     }
 
     transformTableForSelection(table: OwidTable): OwidTable {
-        table = table
-            .replaceNonNumericCellsWithErrorValues(this.yColumnSlugs)
-            .dropRowsWithErrorValuesForAllColumns(this.yColumnSlugs)
+        // if entities with partial data are not plotted,
+        // make sure they don't show up in the entity selector
+        if (this.missingDataStrategy === MissingDataStrategy.hide) {
+            table = table
+                .replaceNonNumericCellsWithErrorValues(this.yColumnSlugs)
+                .dropRowsWithErrorValuesForAllColumns(this.yColumnSlugs)
 
-        this.yColumnSlugs.forEach((slug) => {
-            table = table.interpolateColumnWithTolerance(slug)
-        })
+            this.yColumnSlugs.forEach((slug) => {
+                table = table.interpolateColumnWithTolerance(slug)
+            })
 
-        if (this.missingDataStrategy === MissingDataStrategy.hide) {
             const groupedByEntity = table.groupBy("entityName").map((t) => {
                 if (t.hasAnyColumnNoValidValue(this.yColumnSlugs)) {
                     t = t.dropAllRows()