🎉 (slope) feature parity with line charts / TAS-708

adminSiteClient/EditorBasicTab.tsx

@@ -109,7 +109,7 @@ class DimensionSlotView<
         const { selection } = grapher
         const { availableEntityNames, availableEntityNameSet } = selection
 
-        if (grapher.isScatter || grapher.isSlopeChart || grapher.isMarimekko) {
+        if (grapher.isScatter || grapher.isMarimekko) {
             // chart types that display all entities by default shouldn't select any by default
             selection.clearSelection()
         } else if (
@@ -372,8 +372,8 @@ export class EditorBasicTab<
             grapher.stackMode = StackMode.relative
         }
 
-        // Give scatterplots and slope charts a default color dimension if they don't have one
-        if (grapher.isScatter || grapher.isSlopeChart) {
+        // Give scatterplots a default color and size dimensions
+        if (grapher.isScatter) {
             const hasColor = grapher.dimensions.find(
                 (d) => d.property === DimensionProperty.color
             )
@@ -382,10 +382,7 @@ export class EditorBasicTab<
                     variableId: CONTINENTS_INDICATOR_ID,
                     property: DimensionProperty.color,
                 })
-        }
 
-        // Give scatterplots a default size dimension if they don't have one
-        if (grapher.isScatter) {
             const hasSize = grapher.dimensions.find(
                 (d) => d.property === DimensionProperty.size
             )

adminSiteClient/EditorFeatures.tsx

@@ -62,6 +62,7 @@ export class EditorFeatures {
     @computed get hideLegend() {
         return (
             this.grapher.isLineChart ||
+            this.grapher.isSlopeChart ||
             this.grapher.isStackedArea ||
             this.grapher.isStackedDiscreteBar
         )
@@ -77,6 +78,7 @@ export class EditorFeatures {
             this.grapher.isStackedBar ||
             this.grapher.isStackedDiscreteBar ||
             this.grapher.isLineChart ||
+            this.grapher.isSlopeChart ||
             this.grapher.isScatter ||
             this.grapher.isMarimekko
         )
@@ -118,9 +120,9 @@ export class EditorFeatures {
             return true
         }
 
-        // for line charts, specifying a missing data strategy only makes sense
+        // for line and slope charts, specifying a missing data strategy only makes sense
         // if there are multiple entities
-        if (this.grapher.isLineChart) {
+        if (this.grapher.isLineChart || this.grapher.isSlopeChart) {
             return (
                 this.grapher.canChangeEntity ||
                 this.grapher.canSelectMultipleEntities
@@ -132,7 +134,7 @@ export class EditorFeatures {
 
     @computed get showChangeInPrefixToggle() {
         return (
-            this.grapher.isLineChart &&
+            (this.grapher.isLineChart || this.grapher.isSlopeChart) &&
             (this.grapher.isRelativeMode || this.grapher.canToggleRelativeMode)
         )
     }

baker/updateChartEntities.ts

@@ -106,7 +106,7 @@ const obtainAvailableEntitiesForGrapherConfig = async (
 
         // In these chart types, an unselected entity is still shown
         const chartTypeShowsUnselectedEntities =
-            grapher.isScatter || grapher.isSlopeChart || grapher.isMarimekko
+            grapher.isScatter || grapher.isMarimekko
 
         if (canChangeEntities || chartTypeShowsUnselectedEntities)
             return grapher.tableForSelection.availableEntityNames as string[]

db/migration/1732195571407-RemoveColorDimensionFromSlopeCharts.ts

@@ -0,0 +1,32 @@
+import { MigrationInterface, QueryRunner } from "typeorm"
+
+export class RemoveColorDimensionFromSlopeCharts1732195571407
+    implements MigrationInterface
+{
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        // remove color dimension for all slope charts
+        // the y-dimension always comes first and the color dimension second,
+        // so it's safe to keep the first dimension only
+        await queryRunner.query(`
+            -- sql
+            UPDATE chart_configs
+            SET
+                patch = JSON_REPLACE(patch, '$.dimensions', JSON_ARRAY(patch -> '$.dimensions[0]')),
+                full = JSON_REPLACE(full, '$.dimensions', JSON_ARRAY(full -> '$.dimensions[0]'))
+            WHERE
+                chartType = 'SlopeChart'
+        `)
+
+        // remove the color dimension for slope charts from the chart_dimensions table
+        await queryRunner.query(`
+            -- sql
+            DELETE cd FROM chart_dimensions cd
+            JOIN charts c ON c.id = cd.chartId
+            JOIN chart_configs cc ON c.configId = cc.id
+            WHERE cc.chartType = 'SlopeChart' AND cd.property = 'color'
+        `)
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    public async down(): Promise<void> {}
+}