Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ disallow log y-scale for discrete bar charts / TAS-802 #4436

Merged
merged 1 commit into from
Jan 14, 2025
Merged

✨ disallow log y-scale for discrete bar charts / TAS-802 #4436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 30 additions & 26 deletions adminSiteClient/EditorCustomizeTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,19 +619,21 @@ export class EditorCustomizeTab<
/>
</FieldsRow>
)}
<FieldsRow>
<Toggle
label={`Enable log/linear selector`}
value={
yAxisConfig.canChangeScaleType ||
false
}
onValue={(value) =>
(yAxisConfig.canChangeScaleType =
value || undefined)
}
/>
</FieldsRow>
{features.canEnableLogLinearToggle && (
<FieldsRow>
<Toggle
label={`Enable log/linear selector`}
value={
yAxisConfig.canChangeScaleType ||
false
}
onValue={(value) =>
(yAxisConfig.canChangeScaleType =
value || undefined)
}
/>
</FieldsRow>
)}
</React.Fragment>
)}
{features.canCustomizeYAxisLabel && (
Expand Down Expand Up @@ -704,19 +706,21 @@ export class EditorCustomizeTab<
/>
</FieldsRow>
)}
<FieldsRow>
<Toggle
label={`Enable log/linear selector`}
value={
xAxisConfig.canChangeScaleType ||
false
}
onValue={(value) =>
(xAxisConfig.canChangeScaleType =
value || undefined)
}
/>
</FieldsRow>
{features.canEnableLogLinearToggle && (
<FieldsRow>
<Toggle
label={`Enable log/linear selector`}
value={
xAxisConfig.canChangeScaleType ||
false
}
onValue={(value) =>
(xAxisConfig.canChangeScaleType =
value || undefined)
}
/>
</FieldsRow>
)}
</React.Fragment>
)}
{features.canCustomizeXAxisLabel && (
Expand Down
4 changes: 4 additions & 0 deletions adminSiteClient/EditorFeatures.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ export class EditorFeatures {
return this.grapher.isScatter
}

@computed get canEnableLogLinearToggle() {
return !this.grapher.isDiscreteBar && !this.grapher.isStackedDiscreteBar
}

@computed get timeDomain() {
return !this.grapher.isDiscreteBar
}
Expand Down
41 changes: 15 additions & 26 deletions packages/@ourworldindata/grapher/src/barCharts/DiscreteBarChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,6 @@ export class DiscreteBarChart
// TODO: remove this filter once we don't have mixed type columns in datasets
table = table.replaceNonNumericCellsWithErrorValues(this.yColumnSlugs)

if (this.isLogScale)
table = table.replaceNonPositiveCellsForLogScale(this.yColumnSlugs)

table = table.dropRowsWithErrorValuesForAllColumns(this.yColumnSlugs)

this.yColumnSlugs.forEach((slug) => {
Expand Down Expand Up @@ -162,10 +159,6 @@ export class DiscreteBarChart
return this.manager.endTime
}

@computed private get isLogScale(): boolean {
return this.yAxisConfig.scaleType === ScaleType.log
}

@computed private get bounds(): Bounds {
return (this.props.bounds ?? DEFAULT_BOUNDS).padRight(10)
}
Expand Down Expand Up @@ -253,10 +246,7 @@ export class DiscreteBarChart
}

@computed private get x0(): number {
if (!this.isLogScale) return 0

const minValue = min(this.series.map((d) => d.value))
return minValue !== undefined ? Math.min(1, minValue) : 1
return 0
}

// Now we can work out the main x axis scale
Expand Down Expand Up @@ -294,6 +284,7 @@ export class DiscreteBarChart
const axis = this.yAxisConfig.toHorizontalAxis()
axis.updateDomainPreservingUserSettings(this.xDomainDefault)

axis.scaleType = ScaleType.linear
axis.formatColumn = this.yColumns[0] // todo: does this work for columns as series?
axis.range = this.xRange
axis.label = ""
Expand Down Expand Up @@ -520,21 +511,19 @@ export class DiscreteBarChart
{this.showColorLegend && (
<HorizontalNumericColorLegend manager={this} />
)}
{!this.isLogScale && (
<HorizontalAxisZeroLine
horizontalAxis={yAxis}
bounds={innerBounds}
strokeWidth={axisLineWidth}
// if the chart doesn't have negative values, then we
// move the zero line a little to the left to avoid
// overlap with the bars
align={
this.hasNegative
? HorizontalAlign.center
: HorizontalAlign.right
}
/>
)}
<HorizontalAxisZeroLine
horizontalAxis={yAxis}
bounds={innerBounds}
strokeWidth={axisLineWidth}
// if the chart doesn't have negative values, then we
// move the zero line a little to the left to avoid
// overlap with the bars
align={
this.hasNegative
? HorizontalAlign.center
: HorizontalAlign.right
}
/>
{this.renderBars()}
{this.renderValueLabels()}
{this.renderEntityLabels()}
Expand Down
11 changes: 10 additions & 1 deletion packages/@ourworldindata/grapher/src/controls/SettingsMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ export interface SettingsMenuManager
isOnMapTab?: boolean
isOnChartTab?: boolean
isOnTableTab?: boolean
isLineChartThatTurnedIntoDiscreteBar?: boolean

// linear/log scales
yAxis: AxisConfig
Expand Down Expand Up @@ -121,8 +122,16 @@ export class SettingsMenu extends React.Component<{
@computed get showYScaleToggle(): boolean | undefined {
if (this.manager.hideYScaleToggle) return false
if (this.manager.isRelativeMode) return false
if ([StackedArea, StackedBar].includes(this.chartType as any))
if (
[
GRAPHER_CHART_TYPES.StackedArea,
GRAPHER_CHART_TYPES.StackedBar,
GRAPHER_CHART_TYPES.DiscreteBar,
GRAPHER_CHART_TYPES.StackedDiscreteBar,
].includes(this.chartType as any)
)
return false // We currently do not have these charts with log scale
if (this.manager.isLineChartThatTurnedIntoDiscreteBar) return false
return this.manager.yAxis.canChangeScaleType
}

Expand Down
2 changes: 2 additions & 0 deletions packages/@ourworldindata/grapher/src/stackedCharts/StackedDiscreteBarChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import {
ColorSchemeName,
FacetStrategy,
MissingDataStrategy,
ScaleType,
SeriesName,
VerticalAlign,
} from "@ourworldindata/types"
Expand Down Expand Up @@ -324,6 +325,7 @@ export class StackedDiscreteBarChart
const axis = this.yAxisConfig.toHorizontalAxis()
axis.updateDomainPreservingUserSettings(this.xDomainDefault)

axis.scaleType = ScaleType.linear
axis.formatColumn = this.yColumns[0] // todo: does this work for columns as series?
axis.range = this.xRange
axis.label = ""
Expand Down
Loading