🔨 rename isConnected to plotMarkersOnlyInLineChart

owid · Jan 9, 2025 · e7a9696 · e7a9696
1 parent 3aee00f
commit e7a9696
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/adminSiteClient/DimensionCard.tsx b/adminSiteClient/DimensionCard.tsx
@@ -51,8 +51,8 @@ export class DimensionCard<
         this.onChange()
     }
 
-    @action.bound onIsConnected(value: boolean) {
-        this.props.dimension.display.isConnected = value
+    @action.bound onPlotMarkersOnly(value: boolean) {
+        this.props.dimension.display.plotMarkersOnlyInLineChart = value
         this.onChange()
     }
 
@@ -259,9 +259,12 @@ export class DimensionCard<
                         )}
                         {grapher.isLineChart && (
                             <Toggle
-                                label="Is connected"
-                                value={column.display?.isConnected ?? true}
-                                onValue={this.onIsConnected}
+                                label="Plot markers only"
+                                value={
+                                    column.display
+                                        ?.plotMarkersOnlyInLineChart ?? false
+                                }
+                                onValue={this.onPlotMarkersOnly}
                             />
                         )}
                         <hr className="ui divider" />

diff --git a/packages/@ourworldindata/grapher/src/lineCharts/LineChart.tsx b/packages/@ourworldindata/grapher/src/lineCharts/LineChart.tsx
@@ -1316,7 +1316,7 @@ export class LineChart
             points,
             seriesName,
             isProjection: column.isProjection,
-            isConnected: column.display?.isConnected ?? true,
+            isConnected: !column.display?.plotMarkersOnlyInLineChart,
             color: seriesColor,
         }
     }

diff --git a/packages/@ourworldindata/grapher/src/schema/grapher-schema.006.yaml b/packages/@ourworldindata/grapher/src/schema/grapher-schema.006.yaml
@@ -266,11 +266,11 @@ properties:
                             description: |
                                 Indicates if this time series is a forward projection (if yes then this is rendered
                                 differently in e.g. line charts)
-                        isConnected:
+                        plotMarkersOnlyInLineChart:
                             type: boolean
                             default: false
                             description: |
-                                Indicates if this time series should be connected with a line. Only relevant for line charts.
+                                Indicates if data points should be connected with a line in a line chart
                         name:
                             type: string
                             description: The display string for this variable

diff --git a/packages/@ourworldindata/types/src/OwidVariableDisplayConfigInterface.ts b/packages/@ourworldindata/types/src/OwidVariableDisplayConfigInterface.ts
@@ -21,7 +21,7 @@ export interface OwidVariableDisplayConfigInterface {
     includeInTable?: boolean
     tableDisplay?: OwidVariableDataTableConfigInterface
     color?: string
-    isConnected?: boolean
+    plotMarkersOnlyInLineChart?: boolean
 }
 
 // todo: flatten onto the above

diff --git a/packages/@ourworldindata/utils/src/OwidVariable.ts b/packages/@ourworldindata/utils/src/OwidVariable.ts
@@ -29,7 +29,7 @@ class OwidVariableDisplayConfigDefaults {
     @observable includeInTable? = true
     @observable tableDisplay?: OwidVariableDataTableConfigInterface
     @observable color?: string = undefined
-    @observable isConnected?: boolean = undefined
+    @observable plotMarkersOnlyInLineChart?: boolean = undefined
 }
 
 export class OwidVariableDisplayConfig