diff --git a/adminSiteClient/EditorBasicTab.tsx b/adminSiteClient/EditorBasicTab.tsx index 04f05a9cead..1f48d420f64 100644 --- a/adminSiteClient/EditorBasicTab.tsx +++ b/adminSiteClient/EditorBasicTab.tsx @@ -13,6 +13,7 @@ import { StackMode, ALL_GRAPHER_CHART_TYPES, GrapherChartType, + GRAPHER_CHART_TYPES, } from "@ourworldindata/types" import { DimensionSlot, @@ -109,7 +110,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 ( @@ -367,13 +368,17 @@ export class EditorBasicTab< ? [] : [value as GrapherChartType] + if (grapher.isLineChart) { + this.addSlopeChart() + } + if (grapher.isMarimekko) { grapher.hideRelativeToggle = false 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 +387,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 ) @@ -417,6 +419,32 @@ export class EditorBasicTab< ] } + private addSlopeChart(): void { + const { grapher } = this.props.editor + if (grapher.hasSlopeChart) return + grapher.chartTypes = [ + ...grapher.chartTypes, + GRAPHER_CHART_TYPES.SlopeChart, + ] + } + + private removeSlopeChart(): void { + const { grapher } = this.props.editor + grapher.chartTypes = grapher.chartTypes.filter( + (type) => type !== GRAPHER_CHART_TYPES.SlopeChart + ) + } + + @action.bound toggleSecondarySlopeChart( + shouldHaveSlopeChart: boolean + ): void { + if (shouldHaveSlopeChart) { + this.addSlopeChart() + } else { + this.removeSlopeChart() + } + } + render() { const { editor } = this.props const { grapher } = editor @@ -441,6 +469,13 @@ export class EditorBasicTab< (grapher.hasMapTab = shouldHaveMapTab) } /> + {grapher.isLineChart && ( + + )} {!isIndicatorChart && ( diff --git a/adminSiteClient/EditorFeatures.tsx b/adminSiteClient/EditorFeatures.tsx index 2d9761add1c..70adfd194bf 100644 --- a/adminSiteClient/EditorFeatures.tsx +++ b/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 ) @@ -118,9 +119,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 diff --git a/baker/updateChartEntities.ts b/baker/updateChartEntities.ts index 49e582a71d8..cbaf6a74107 100644 --- a/baker/updateChartEntities.ts +++ b/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[] diff --git a/db/migration/1732195571407-RemoveColorDimensionFromSlopeCharts.ts b/db/migration/1732195571407-RemoveColorDimensionFromSlopeCharts.ts new file mode 100644 index 00000000000..1750d7e2576 --- /dev/null +++ b/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 { + // 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 {} +} diff --git a/db/migration/1732291572062-MigrateSlopeCharts.ts b/db/migration/1732291572062-MigrateSlopeCharts.ts new file mode 100644 index 00000000000..6fd86122128 --- /dev/null +++ b/db/migration/1732291572062-MigrateSlopeCharts.ts @@ -0,0 +1,156 @@ +import { MigrationInterface, QueryRunner } from "typeorm" + +export class MigrateSlopeCharts1732291572062 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + // create a temporary table that lists all slope charts and their + // corresponding line charts (there might be multiple) + await queryRunner.query(` + -- sql + CREATE TABLE slope_line_charts ( + variableId integer NOT NULL, + slopeChartId integer NOT NULL, + slopeChartConfigId varchar(255) NOT NULL, + slopeChartSelectedEntityNames JSON, + lineChartId integer, + lineChartConfigId varchar(255) + ) + `) + await queryRunner.query(` + INSERT INTO slope_line_charts ( + variableId, + slopeChartId, + slopeChartConfigId, + slopeChartSelectedEntityNames, + lineChartId, + lineChartConfigId + ) + SELECT * FROM ( + WITH line_charts AS ( + SELECT + c.id, + c.configId, + cc.full ->> '$.dimensions[0].variableId' as variableId + FROM charts c + JOIN chart_configs cc ON c.configId = cc.id + WHERE + cc.chartType = 'LineChart' + AND JSON_LENGTH(cc.full, '$.dimensions') = 1 + AND cc.full ->> '$.isPublished' = 'true' + ), slope_charts AS ( + SELECT + c.id, + c.configId, + cc.full ->> '$.dimensions[0].variableId' as variableId, + cc.full -> '$.selectedEntityNames' as selectedEntityNames + FROM charts c + JOIN chart_configs cc ON c.configId = cc.id + WHERE + cc.chartType = 'SlopeChart' + AND cc.full ->> '$.isPublished' = 'true' + ) + SELECT + sc.variableId AS variableId, + sc.id AS slopeChartId, + sc.configId AS slopeChartConfigId, + sc.selectedEntityNames AS slopeChartSelectedEntityNames, + lc.id AS lineChartId, + lc.configId AS lineChartConfigId + FROM slope_charts sc + LEFT JOIN line_charts lc ON lc.variableId = sc.variableId + ) AS derived_table; + `) + + // STAND-ALONE SLOPE CHARTS + + // make sure entity selection is not disabled + await queryRunner.query(` + -- sql + UPDATE chart_configs cc + JOIN slope_line_charts slc ON slc.slopeChartConfigId = cc.id + SET + cc.patch = JSON_SET(cc.patch, '$.addCountryMode', 'add-country'), + cc.full = JSON_SET(cc.full, '$.addCountryMode', 'add-country') + WHERE + slc.lineChartId IS NULL + AND ( + cc.full ->> '$.addCountryMode' = 'disabled' + OR cc.full ->> '$.addCountryMode' = 'change-country' + ) + `) + + // make sure the line legend isn't hidden + await queryRunner.query(` + -- sql + UPDATE chart_configs cc + JOIN slope_line_charts slc ON slc.slopeChartConfigId = cc.id + SET + cc.patch = JSON_SET(cc.patch, '$.hideLegend', false), + cc.full = JSON_SET(cc.full, '$.hideLegend', false) + WHERE + slc.lineChartId IS NULL + AND cc.full ->> '$.hideLegend' = 'true' + `) + + // for stand-alone slope charts that don't currently have any selected + // entities, just pick a random set of five entities. + // it's possible to end up with entities that don't have data for the + // selected years. after running the migration, I'll go through each + // slope chart and correct the selected entities manually if necessary. + await queryRunner.query(` + -- sql + WITH selected_entities AS ( + WITH ranked_entities AS ( + SELECT + slc.slopeChartId AS chartId, + slc.slopeChartConfigId AS configId, + cxe.entityId, + e.name AS entityName, + ROW_NUMBER() OVER (PARTITION BY chartId ORDER BY RAND()) AS randomIndex + FROM slope_line_charts slc + JOIN charts_x_entities cxe ON cxe.chartId = slc.slopeChartId + JOIN entities e ON e.id = cxe.entityId + WHERE + slc.lineChartId IS NULL + AND ( + slc.slopeChartSelectedEntityNames IS NULL + OR JSON_LENGTH(slc.slopeChartSelectedEntityNames) = 0 + ) + ) + SELECT chartId, configId, JSON_ARRAYAGG(entityName) as selectedEntityNames + FROM ranked_entities + WHERE randomIndex <= 4 + GROUP BY chartId, configId + ) + UPDATE chart_configs cc + JOIN selected_entities se ON se.configId = cc.id + SET + cc.patch = JSON_SET(cc.patch, '$.selectedEntityNames', se.selectedEntityNames), + cc.full = JSON_SET(cc.full, '$.selectedEntityNames', se.selectedEntityNames) + `) + + // LINE+SLOPE CHARTS + + // add a slope tab to all line charts that have a corresponding slope + // chart (excluded are slope charts that have been matched with more + // than one line chart) + await queryRunner.query(` + WITH deduped_slope_line_charts AS ( + SELECT slopeChartId, COUNT(*) count + FROM slope_line_charts + GROUP BY slopeChartId + HAVING count = 1 + ) + UPDATE chart_configs cc + JOIN slope_line_charts slc ON slc.lineChartConfigId = cc.id + JOIN deduped_slope_line_charts dslc ON dslc.slopeChartId = slc.slopeChartId + SET + cc.patch = JSON_SET(cc.patch, '$.chartTypes', JSON_ARRAY('LineChart', 'SlopeChart')), + cc.full = JSON_SET(cc.full, '$.chartTypes', JSON_ARRAY('LineChart', 'SlopeChart')) + `) + + await queryRunner.query(`DROP TABLE slope_line_charts`) + } + + // eslint-disable-next-line @typescript-eslint/no-empty-function + public async down(): Promise {} +} diff --git a/packages/@ourworldindata/core-table/src/CoreTableColumns.ts b/packages/@ourworldindata/core-table/src/CoreTableColumns.ts index 40da7cba3dc..64b355d867e 100644 --- a/packages/@ourworldindata/core-table/src/CoreTableColumns.ts +++ b/packages/@ourworldindata/core-table/src/CoreTableColumns.ts @@ -305,12 +305,22 @@ export abstract class AbstractCoreColumn { @imemo get displayName(): string { return ( this.display?.name ?? - this.def.presentation?.titlePublic ?? // this is a bit of an unusual fallback - if display.name is not given, titlePublic is the next best thing before name + // this is a bit of an unusual fallback - if display.name is not given, titlePublic is the next best thing before name + this.def.presentation?.titlePublic ?? this.name ?? "" ) } + @imemo get nonEmptyDisplayName(): string { + return ( + this.display?.name || + // this is a bit of an unusual fallback - if display.name is not given, titlePublic is the next best thing before name + this.def.presentation?.titlePublic || + this.nonEmptyName + ) + } + @imemo get titlePublicOrDisplayName(): IndicatorTitleWithFragments { return this.def.presentation?.titlePublic ? { @@ -526,14 +536,16 @@ export abstract class AbstractCoreColumn { // assumes table is sorted by time @imemo get owidRows(): OwidVariableRow[] { const entities = this.allEntityNames - const times = this.originalTimes + const times = this.allTimes const values = this.values + const originalTimes = this.originalTimes const originalValues = this.originalValues - return range(0, times.length).map((index) => { + return range(0, originalTimes.length).map((index) => { return omitUndefinedValues({ entityName: entities[index], time: times[index], value: values[index], + originalTime: originalTimes[index], originalValue: originalValues[index], }) }) @@ -552,6 +564,23 @@ export abstract class AbstractCoreColumn { return map } + // todo: remove? Should not be on CoreTable + @imemo get owidRowByEntityNameAndTime(): Map< + EntityName, + Map> + > { + const valueByEntityNameAndTime = new Map< + EntityName, + Map> + >() + this.owidRows.forEach((row) => { + if (!valueByEntityNameAndTime.has(row.entityName)) + valueByEntityNameAndTime.set(row.entityName, new Map()) + valueByEntityNameAndTime.get(row.entityName)!.set(row.time, row) + }) + return valueByEntityNameAndTime + } + // todo: remove? Should not be on CoreTable // NOTE: this uses the original times, so any tolerance is effectively unapplied. @imemo get valueByEntityNameAndOriginalTime(): Map< @@ -567,7 +596,7 @@ export abstract class AbstractCoreColumn { valueByEntityNameAndTime.set(row.entityName, new Map()) valueByEntityNameAndTime .get(row.entityName)! - .set(row.time, row.value) + .set(row.originalTime, row.value) }) return valueByEntityNameAndTime } diff --git a/packages/@ourworldindata/core-table/src/OwidTable.test.ts b/packages/@ourworldindata/core-table/src/OwidTable.test.ts index a58250a1ec7..32208310965 100755 --- a/packages/@ourworldindata/core-table/src/OwidTable.test.ts +++ b/packages/@ourworldindata/core-table/src/OwidTable.test.ts @@ -72,7 +72,7 @@ it("can parse data to Javascript data structures", () => { table.get("Population").owidRows.forEach((row) => { expect(typeof row.entityName).toBe("string") expect(row.value).toBeGreaterThan(100) - expect(row.time).toBeGreaterThan(1999) + expect(row.originalTime).toBeGreaterThan(1999) }) }) @@ -632,7 +632,7 @@ describe("tolerance", () => { }) }) -it("assigns originalTime as 'time' in owidRows", () => { +it("assigns originalTime as 'originalTime' in owidRows", () => { const csv = `gdp,year,entityName,entityId,entityCode 1000,2019,USA,, 1001,2020,UK,,` @@ -642,7 +642,7 @@ it("assigns originalTime as 'time' in owidRows", () => { expect.not.arrayContaining([ expect.objectContaining({ entityName: "USA", - time: 2020, + originalTime: 2020, value: 1000, }), ]) @@ -651,7 +651,7 @@ it("assigns originalTime as 'time' in owidRows", () => { expect.not.arrayContaining([ expect.objectContaining({ entityName: "UK", - time: 2019, + originalTime: 2019, value: 1001, }), ]) diff --git a/packages/@ourworldindata/explorer/src/GrapherGrammar.ts b/packages/@ourworldindata/explorer/src/GrapherGrammar.ts index 78d6a82344a..9c12109ffd0 100644 --- a/packages/@ourworldindata/explorer/src/GrapherGrammar.ts +++ b/packages/@ourworldindata/explorer/src/GrapherGrammar.ts @@ -3,6 +3,7 @@ import { ColorSchemeName, FacetAxisDomain, FacetStrategy, + GRAPHER_CHART_TYPES, GRAPHER_TAB_OPTIONS, MissingDataStrategy, StackMode, @@ -66,10 +67,11 @@ export const GrapherGrammar: Grammar = { description: `The type of chart to show such as LineChart or ScatterPlot. If set to None, then the chart tab is hidden.`, terminalOptions: toTerminalOptions([ ...ALL_GRAPHER_CHART_TYPES, + `${GRAPHER_CHART_TYPES.LineChart} ${GRAPHER_CHART_TYPES.SlopeChart}`, "None", ]), toGrapherObject: (value) => ({ - chartTypes: value === "None" ? [] : [value], + chartTypes: value === "None" ? [] : value.split(" "), }), }, grapherId: { diff --git a/packages/@ourworldindata/grapher/src/barCharts/DiscreteBarChart.tsx b/packages/@ourworldindata/grapher/src/barCharts/DiscreteBarChart.tsx index 144ed286209..242ddc08248 100644 --- a/packages/@ourworldindata/grapher/src/barCharts/DiscreteBarChart.tsx +++ b/packages/@ourworldindata/grapher/src/barCharts/DiscreteBarChart.tsx @@ -409,11 +409,14 @@ export class DiscreteBarChart {this.placedSeries.map((series) => { return ( - series.label && - series.label.render( - series.entityLabelX, - series.barY - series.label.height / 2, - { textProps: style } + series.label && ( + + {series.label.render( + series.entityLabelX, + series.barY - series.label.height / 2, + { textProps: style } + )} + ) ) })} @@ -990,6 +993,7 @@ function makeProjectedDataPattern(color: string): React.ReactElement { const size = 7 return ( { if (manager.isOnTableTab) return undefined if (manager.isOnMapTab) return GRAPHER_MAP_TYPE if (manager.isOnChartTab) { - return manager.isLineChartThatTurnedIntoDiscreteBar + return manager.isLineChartThatTurnedIntoDiscreteBarActive ? GRAPHER_CHART_TYPES.DiscreteBar : manager.activeChartType } diff --git a/packages/@ourworldindata/grapher/src/chart/ChartUtils.tsx b/packages/@ourworldindata/grapher/src/chart/ChartUtils.tsx index 375e9816c7a..501d646456d 100644 --- 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/controls/ContentSwitchers.tsx b/packages/@ourworldindata/grapher/src/controls/ContentSwitchers.tsx index 6c0eaa289a5..8d947e5bb62 100644 --- a/packages/@ourworldindata/grapher/src/controls/ContentSwitchers.tsx +++ b/packages/@ourworldindata/grapher/src/controls/ContentSwitchers.tsx @@ -175,9 +175,11 @@ function TabIcon({ case GRAPHER_TAB_NAMES.WorldMap: return default: - const chartIcon = isLineChartThatTurnedIntoDiscreteBar - ? chartIcons[GRAPHER_CHART_TYPES.DiscreteBar] - : chartIcons[tab] + const chartIcon = + tab === GRAPHER_TAB_NAMES.LineChart && + isLineChartThatTurnedIntoDiscreteBar + ? chartIcons[GRAPHER_CHART_TYPES.DiscreteBar] + : chartIcons[tab] return chartIcon } } @@ -193,9 +195,15 @@ function makeTabLabelText( if (tab === GRAPHER_TAB_NAMES.WorldMap) return "Map" if (!options.hasMultipleChartTypes) return "Chart" + if ( + tab === GRAPHER_TAB_NAMES.LineChart && + options.isLineChartThatTurnedIntoDiscreteBar + ) + return "Bar" + switch (tab) { case GRAPHER_TAB_NAMES.LineChart: - return options.isLineChartThatTurnedIntoDiscreteBar ? "Bar" : "Line" + return "Line" case GRAPHER_TAB_NAMES.SlopeChart: return "Slope" diff --git a/packages/@ourworldindata/grapher/src/controls/SettingsMenu.tsx b/packages/@ourworldindata/grapher/src/controls/SettingsMenu.tsx index 30cbd370147..fb7f4351ce7 100644 --- a/packages/@ourworldindata/grapher/src/controls/SettingsMenu.tsx +++ b/packages/@ourworldindata/grapher/src/controls/SettingsMenu.tsx @@ -51,6 +51,7 @@ const { StackedDiscreteBar, StackedBar, Marimekko, + SlopeChart, } = GRAPHER_CHART_TYPES export interface SettingsMenuManager @@ -170,6 +171,7 @@ export class SettingsMenu extends React.Component<{ ScatterPlot, LineChart, Marimekko, + SlopeChart, ].includes(this.chartType as any) } diff --git a/packages/@ourworldindata/grapher/src/core/Grapher.tsx b/packages/@ourworldindata/grapher/src/core/Grapher.tsx index 0243e038ba2..1c3d4a9bef2 100644 --- 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" @@ -886,7 +885,10 @@ export class Grapher ) if (this.isOnSlopeChartTab) - return table.filterByTargetTimes([startTime, endTime]) + return table.filterByTargetTimes( + [startTime, endTime], + table.get(this.yColumnSlugs[0]).tolerance + ) return table.filterByTimeRange(startTime, endTime) } @@ -1409,7 +1411,7 @@ export class Grapher if (this.isLineChart || this.isDiscreteBar) return [yAxis, color] else if (this.isScatter) return [yAxis, xAxis, size, color] else if (this.isMarimekko) return [yAxis, xAxis, color] - else if (this.isSlopeChart) return [yAxis, color] + else if (this.isSlopeChart) return [yAxis] return [yAxis] } @@ -1525,21 +1527,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 { @@ -1635,7 +1647,7 @@ export class Grapher if (this.shouldAddChangeInPrefixToTitle) text = "Change in " + lowerCaseFirstLetterUnlessAbbreviation(text) - if (this.shouldAddTimeSuffixToTitle) + if (this.shouldAddTimeSuffixToTitle && this.timeTitleSuffix) text = appendAnnotationField(text, this.timeTitleSuffix) return text.trim() @@ -1738,11 +1750,11 @@ export class Grapher return this.xAxis.scaleType } - @computed private get timeTitleSuffix(): string { + @computed private get timeTitleSuffix(): string | undefined { const timeColumn = this.table.timeColumn - if (timeColumn.isMissing) return "" // Do not show year until data is loaded + if (timeColumn.isMissing) return undefined // Do not show year until data is loaded const { startTime, endTime } = this - if (startTime === undefined || endTime === undefined) return "" + if (startTime === undefined || endTime === undefined) return undefined const time = startTime === endTime @@ -1934,7 +1946,7 @@ export class Grapher @computed get typeExceptWhenLineChartAndSingleTimeThenWillBeBarChart(): GrapherChartType { - return this.isLineChartThatTurnedIntoDiscreteBar + return this.isLineChartThatTurnedIntoDiscreteBarActive ? GRAPHER_CHART_TYPES.DiscreteBar : (this.activeChartType ?? GRAPHER_CHART_TYPES.LineChart) } @@ -1993,6 +2005,12 @@ export class Grapher return closestMinTime !== undefined && closestMinTime === closestMaxTime } + @computed get isLineChartThatTurnedIntoDiscreteBarActive(): boolean { + return ( + this.isOnLineChartTab && this.isLineChartThatTurnedIntoDiscreteBar + ) + } + @computed get isOnLineChartTab(): boolean { return this.activeChartType === GRAPHER_CHART_TYPES.LineChart } @@ -2026,7 +2044,7 @@ export class Grapher } @computed get supportsMultipleYColumns(): boolean { - return !(this.isScatter || this.isSlopeChart) + return !this.isScatter } @computed private get xDimension(): ChartDimension | undefined { @@ -3537,6 +3555,7 @@ export class Grapher this.hasChartTab && this.canSelectMultipleEntities && (this.isOnLineChartTab || + this.isOnSlopeChartTab || this.isOnStackedAreaTab || this.isOnStackedBarTab || this.isOnDiscreteBarTab || diff --git a/packages/@ourworldindata/grapher/src/entitySelector/EntitySelector.tsx b/packages/@ourworldindata/grapher/src/entitySelector/EntitySelector.tsx index ebce9d92057..a6590dcf0be 100644 --- a/packages/@ourworldindata/grapher/src/entitySelector/EntitySelector.tsx +++ b/packages/@ourworldindata/grapher/src/entitySelector/EntitySelector.tsx @@ -453,7 +453,7 @@ export class EntitySelector extends React.Component<{ const rows = column.owidRowsByEntityName.get(entityName) ?? [] searchableEntity[column.slug] = maxBy( rows, - (row) => row.time + (row) => row.originalTime )?.value } diff --git a/packages/@ourworldindata/grapher/src/lineCharts/LineChart.tsx b/packages/@ourworldindata/grapher/src/lineCharts/LineChart.tsx index 876a49b57bf..6def600bb85 100644 --- a/packages/@ourworldindata/grapher/src/lineCharts/LineChart.tsx +++ b/packages/@ourworldindata/grapher/src/lineCharts/LineChart.tsx @@ -23,7 +23,6 @@ import { AxisAlign, Color, HorizontalAlign, - PrimitiveType, makeIdForHumanConsumption, } from "@ourworldindata/utils" import { computed, action, observable } from "mobx" @@ -102,6 +101,13 @@ import { HorizontalColorLegendManager, HorizontalNumericColorLegend, } from "../horizontalColorLegend/HorizontalColorLegends" +import { + AnnotationsMap, + getAnnotationsForSeries, + getAnnotationsMap, + getColorKey, + getSeriesName, +} from "./lineChartHelpers" const LINE_CHART_CLASS_NAME = "LineChart" @@ -707,7 +713,10 @@ export class LineChart rows={sortedData.map((series) => { const { seriesName: name, isProjection: striped } = series - const annotation = this.getAnnotationsForSeries(name) + const annotation = getAnnotationsForSeries( + this.annotationsMap, + name + ) const point = series.points.find( (point) => point.x === target.x @@ -1148,24 +1157,8 @@ export class LineChart // End of color legend props - // todo: for now just works with 1 y column - @computed private get annotationsMap(): Map< - PrimitiveType, - Set - > { - return this.inputTable - .getAnnotationColumnForColumn(this.yColumnSlugs[0]) - ?.getUniqueValuesGroupedBy(this.inputTable.entityNameSlug) - } - - getAnnotationsForSeries(seriesName: SeriesName): string | undefined { - const annotationsMap = this.annotationsMap - const annos = annotationsMap?.get(seriesName) - return annos - ? Array.from(annos.values()) - .filter((anno) => anno) - .join(" & ") - : undefined + @computed private get annotationsMap(): AnnotationsMap | undefined { + return getAnnotationsMap(this.inputTable, this.yColumnSlugs[0]) } @computed private get colorScheme(): ColorScheme { @@ -1196,39 +1189,6 @@ export class LineChart }) } - private getSeriesName( - entityName: EntityName, - columnName: string, - entityCount: number - ): SeriesName { - if (this.seriesStrategy === SeriesStrategy.entity) { - return entityName - } - if (entityCount > 1 || this.manager.canSelectMultipleEntities) { - return `${entityName} - ${columnName}` - } else { - return columnName - } - } - - private getColorKey( - entityName: EntityName, - columnName: string, - entityCount: number - ): SeriesName { - if (this.seriesStrategy === SeriesStrategy.entity) { - return entityName - } - // If only one entity is plotted, we want to use the column colors. - // Unlike in `getSeriesName`, we don't care whether the user can select - // multiple entities, only whether more than one is plotted. - if (entityCount > 1) { - return `${entityName} - ${columnName}` - } else { - return columnName - } - } - // cache value for performance @computed private get rowIndicesByEntityName(): Map { return this.transformedTable.rowIndex([ @@ -1237,14 +1197,20 @@ export class LineChart } private constructSingleSeries( - entityName: string, - col: CoreColumn + entityName: EntityName, + column: CoreColumn ): LineChartSeries { - const { hasColorScale, transformedTable, colorColumn } = this + const { + manager: { canSelectMultipleEntities = false }, + transformedTable: { availableEntityNames }, + seriesStrategy, + hasColorScale, + colorColumn, + } = this // Construct the points - const timeValues = col.originalTimeColumn.valuesIncludingErrorValues - const values = col.valuesIncludingErrorValues + const timeValues = column.originalTimeColumn.valuesIncludingErrorValues + const values = column.valuesIncludingErrorValues const colorValues = colorColumn.valuesIncludingErrorValues // If Y and Color are the same column, we need to get rid of any duplicate rows. // Duplicates occur because Y doesn't have tolerance applied, but Color does. @@ -1269,26 +1235,34 @@ export class LineChart }) // Construct series properties - const totalEntityCount = transformedTable.availableEntityNames.length - const seriesName = this.getSeriesName( + const columnName = column.nonEmptyDisplayName + const seriesName = getSeriesName({ entityName, - col.displayName, - totalEntityCount - ) + columnName, + seriesStrategy, + availableEntityNames, + canSelectMultipleEntities, + }) + let seriesColor: Color if (hasColorScale) { const colorValue = last(points)?.colorValue seriesColor = this.getColorScaleColor(colorValue) } else { seriesColor = this.categoricalColorAssigner.assign( - this.getColorKey(entityName, col.displayName, totalEntityCount) + getColorKey({ + entityName, + columnName, + seriesStrategy, + availableEntityNames, + }) ) } return { points, seriesName, - isProjection: col.isProjection, + isProjection: column.isProjection, color: seriesColor, } } @@ -1350,7 +1324,10 @@ export class LineChart seriesName, // E.g. https://ourworldindata.org/grapher/size-poverty-gap-world label: !this.manager.showLegend ? "" : `${seriesName}`, - annotation: this.getAnnotationsForSeries(seriesName), + annotation: getAnnotationsForSeries( + this.annotationsMap, + seriesName + ), yValue: lastValue, } }) diff --git a/packages/@ourworldindata/grapher/src/lineCharts/lineChartHelpers.ts b/packages/@ourworldindata/grapher/src/lineCharts/lineChartHelpers.ts new file mode 100644 index 00000000000..74fdccc4c52 --- /dev/null +++ b/packages/@ourworldindata/grapher/src/lineCharts/lineChartHelpers.ts @@ -0,0 +1,75 @@ +import { OwidTable } from "@ourworldindata/core-table" +import { + ColumnSlug, + EntityName, + PrimitiveType, + SeriesName, + SeriesStrategy, +} from "@ourworldindata/types" + +export type AnnotationsMap = Map> + +export function getSeriesName({ + entityName, + columnName, + seriesStrategy, + availableEntityNames, + canSelectMultipleEntities, +}: { + entityName: EntityName + columnName: string + seriesStrategy: SeriesStrategy + availableEntityNames: EntityName[] + canSelectMultipleEntities: boolean +}): SeriesName { + // if entities are plotted, use the entity name + if (seriesStrategy === SeriesStrategy.entity) return entityName + + // if columns are plotted, use the column name + // and prepend the entity name if multiple entities can be selected + return availableEntityNames.length > 1 || canSelectMultipleEntities + ? `${entityName} - ${columnName}` + : columnName +} + +export function getColorKey({ + entityName, + columnName, + seriesStrategy, + availableEntityNames, +}: { + entityName: EntityName + columnName: string + seriesStrategy: SeriesStrategy + availableEntityNames: EntityName[] +}): SeriesName { + // if entities are plotted, use the entity name + if (seriesStrategy === SeriesStrategy.entity) return entityName + + // If only one entity is plotted, we want to use the column colors. + // Unlike in `getSeriesName`, we don't care whether the user can select + // multiple entities, only whether more than one is plotted. + return availableEntityNames.length > 1 + ? `${entityName} - ${columnName}` + : columnName +} + +export function getAnnotationsMap( + table: OwidTable, + slug: ColumnSlug +): AnnotationsMap | undefined { + return table + .getAnnotationColumnForColumn(slug) + ?.getUniqueValuesGroupedBy(table.entityNameSlug) +} + +export function getAnnotationsForSeries( + annotationsMap: AnnotationsMap | undefined, + seriesName: SeriesName +): string | undefined { + const annotations = annotationsMap?.get(seriesName) + if (!annotations) return undefined + return Array.from(annotations.values()) + .filter((anno) => anno) + .join(" & ") +} diff --git a/packages/@ourworldindata/grapher/src/mapCharts/MapChart.tsx b/packages/@ourworldindata/grapher/src/mapCharts/MapChart.tsx index f641a1b939b..a07da5438fa 100644 --- a/packages/@ourworldindata/grapher/src/mapCharts/MapChart.tsx +++ b/packages/@ourworldindata/grapher/src/mapCharts/MapChart.tsx @@ -346,12 +346,12 @@ export class MapChart return mapColumn.owidRows .map((row) => { - const { entityName, value, time } = row + const { entityName, value, originalTime } = row const color = this.colorScale.getColor(value) || "red" // todo: color fix if (!color) return undefined return { seriesName: entityName, - time, + time: originalTime, value, isSelected: selectionArray.selectedSet.has(entityName), color, diff --git a/packages/@ourworldindata/grapher/src/mapCharts/MapSparkline.tsx b/packages/@ourworldindata/grapher/src/mapCharts/MapSparkline.tsx index 7fa2a61dbfb..72977920cdb 100644 --- a/packages/@ourworldindata/grapher/src/mapCharts/MapSparkline.tsx +++ b/packages/@ourworldindata/grapher/src/mapCharts/MapSparkline.tsx @@ -118,7 +118,7 @@ export class MapSparkline extends React.Component<{ lineStrokeWidth: 2, entityYearHighlight: { entityName: this.manager.entityName, - year: this.manager.datum?.time, + year: this.manager.datum?.originalTime, }, yAxisConfig: { hideAxis: true, diff --git a/packages/@ourworldindata/grapher/src/mapCharts/MapTooltip.tsx b/packages/@ourworldindata/grapher/src/mapCharts/MapTooltip.tsx index e58b90c5484..54aa0321aaa 100644 --- a/packages/@ourworldindata/grapher/src/mapCharts/MapTooltip.tsx +++ b/packages/@ourworldindata/grapher/src/mapCharts/MapTooltip.tsx @@ -119,8 +119,8 @@ export class MapTooltip : targetTime?.toString() const displayDatumTime = timeColumn && datum - ? timeColumn.formatValue(datum?.time) - : (datum?.time.toString() ?? "") + ? timeColumn.formatValue(datum?.originalTime) + : datum?.originalTime.toString() ?? "" const valueColor: string | undefined = darkenColorForHighContrastText( lineColorScale?.getColor(datum?.value) ?? "#333" ) @@ -143,7 +143,7 @@ export class MapTooltip const yColumn = this.mapTable.get(this.mapColumnSlug) const targetNotice = - datum && datum.time !== targetTime ? displayTime : undefined + datum && datum.originalTime !== targetTime ? displayTime : undefined const toleranceNotice = targetNotice ? { icon: TooltipFooterIcon.notice, diff --git a/packages/@ourworldindata/grapher/src/scatterCharts/NoDataSection.tsx b/packages/@ourworldindata/grapher/src/scatterCharts/NoDataSection.tsx index 6ccac9dd108..bf9dfb192f3 100644 --- a/packages/@ourworldindata/grapher/src/scatterCharts/NoDataSection.tsx +++ b/packages/@ourworldindata/grapher/src/scatterCharts/NoDataSection.tsx @@ -6,19 +6,19 @@ import { } from "../core/GrapherConstants" export function NoDataSection({ - entityNames, + seriesNames, bounds, baseFontSize = 16, }: { - entityNames: string[] + seriesNames: string[] bounds: Bounds baseFontSize?: number }): React.ReactElement { { - const displayedEntities = entityNames.slice(0, 5) - const numRemainingEntities = Math.max( + const displayedNames = seriesNames.slice(0, 5) + const remaining = Math.max( 0, - entityNames.length - displayedEntities.length + seriesNames.length - displayedNames.length ) return ( @@ -40,7 +40,7 @@ export function NoDataSection({ No data
    - {displayedEntities.map((entityName) => ( + {displayedNames.map((entityName) => (
  • ))}
- {numRemainingEntities > 0 && ( -
- &{" "} - {numRemainingEntities === 1 - ? "one" - : numRemainingEntities}{" "} - more -
+ {remaining > 0 && ( +
& {remaining === 1 ? "one" : remaining} more
)} ) diff --git a/packages/@ourworldindata/grapher/src/scatterCharts/ScatterPlotChart.tsx b/packages/@ourworldindata/grapher/src/scatterCharts/ScatterPlotChart.tsx index e4688cad8ee..fc505bb6459 100644 --- a/packages/@ourworldindata/grapher/src/scatterCharts/ScatterPlotChart.tsx +++ b/packages/@ourworldindata/grapher/src/scatterCharts/ScatterPlotChart.tsx @@ -871,7 +871,7 @@ export class ScatterPlotChart {!this.manager.isStatic && separatorLine(noDataSectionBounds.top)} diff --git a/packages/@ourworldindata/grapher/src/slopeCharts/SlopeChart.test.ts b/packages/@ourworldindata/grapher/src/slopeCharts/SlopeChart.test.ts index 7d7e4ae8d80..02a2bd75f00 100755 --- a/packages/@ourworldindata/grapher/src/slopeCharts/SlopeChart.test.ts +++ b/packages/@ourworldindata/grapher/src/slopeCharts/SlopeChart.test.ts @@ -7,13 +7,13 @@ import { SynthesizeGDPTable, } from "@ourworldindata/core-table" import { ChartManager } from "../chart/ChartManager" -import { DEFAULT_SLOPE_CHART_COLOR } from "./SlopeChartConstants" -import { isNumber, OwidTableSlugs } from "@ourworldindata/utils" +import { isNumber } from "@ourworldindata/utils" const table = SynthesizeGDPTable({ timeRange: [2000, 2010] }) const manager: ChartManager = { table, yColumnSlug: SampleColumnSlugs.Population, + selection: table.availableEntityNames, } it("can create a new slope chart", () => { @@ -21,16 +21,6 @@ it("can create a new slope chart", () => { expect(chart.series.length).toEqual(2) }) -it("slope charts can have different colors", () => { - const manager: ChartManager = { - table, - yColumnSlug: SampleColumnSlugs.Population, - colorColumnSlug: OwidTableSlugs.entityName, - } - const chart = new SlopeChart({ manager }) - expect(chart.series[0].color).not.toEqual(DEFAULT_SLOPE_CHART_COLOR) -}) - it("filters non-numeric values", () => { const table = SynthesizeFruitTableWithStringValues( { @@ -48,10 +38,9 @@ it("filters non-numeric values", () => { const chart = new SlopeChart({ manager }) expect(chart.series.length).toEqual(1) expect( - chart.series.every((series) => - series.values.every( - (value) => isNumber(value.x) && isNumber(value.y) - ) + chart.series.every( + (series) => + isNumber(series.start.value) && isNumber(series.end.value) ) ).toBeTruthy() }) diff --git a/packages/@ourworldindata/grapher/src/slopeCharts/SlopeChart.tsx b/packages/@ourworldindata/grapher/src/slopeCharts/SlopeChart.tsx index 8b865b803d6..08604f5c25b 100644 --- a/packages/@ourworldindata/grapher/src/slopeCharts/SlopeChart.tsx +++ b/packages/@ourworldindata/grapher/src/slopeCharts/SlopeChart.tsx @@ -1,830 +1,457 @@ -import React from "react" +import React, { SVGProps } from "react" import { Bounds, DEFAULT_BOUNDS, - intersection, - without, - uniq, isEmpty, - last, - sortBy, - max, - getRelativeMouse, domainExtent, - minBy, exposeInstanceOnWindow, PointVector, clamp, - HorizontalAlign, - difference, makeIdForHumanConsumption, + guid, + excludeUndefined, + partition, + max, + getRelativeMouse, + minBy, } from "@ourworldindata/utils" -import { TextWrap } from "@ourworldindata/components" import { observable, computed, action } from "mobx" import { observer } from "mobx-react" import { NoDataModal } from "../noDataModal/NoDataModal" -import { - VerticalColorLegend, - VerticalColorLegendManager, -} from "../verticalColorLegend/VerticalColorLegend" -import { ColorScale, ColorScaleManager } from "../color/ColorScale" import { BASE_FONT_SIZE, + GRAPHER_BACKGROUND_DEFAULT, GRAPHER_DARK_TEXT, - GRAPHER_FONT_SCALE_9_6, - GRAPHER_FONT_SCALE_10_5, + GRAPHER_FONT_SCALE_12, } from "../core/GrapherConstants" import { ScaleType, - EntitySelectionMode, - Color, SeriesName, ColorSchemeName, + ColumnSlug, + MissingDataStrategy, + Time, + SeriesStrategy, + EntityName, + RenderMode, } from "@ourworldindata/types" import { ChartInterface } from "../chart/ChartInterface" import { ChartManager } from "../chart/ChartManager" import { scaleLinear, ScaleLinear } from "d3-scale" import { select } from "d3-selection" import { - DEFAULT_SLOPE_CHART_COLOR, - LabelledSlopesProps, + PlacedSlopeChartSeries, + RawSlopeChartSeries, SlopeChartSeries, - SlopeChartValue, - SlopeEntryProps, } from "./SlopeChartConstants" -import { OwidTable } from "@ourworldindata/core-table" +import { CoreColumn, OwidTable } from "@ourworldindata/core-table" import { + autoDetectSeriesStrategy, autoDetectYColumnSlugs, + getDefaultFailMessage, makeSelectionArray, - isElementInteractive, } from "../chart/ChartUtils" -import { AxisConfig, AxisManager } from "../axis/AxisConfig" +import { AxisConfig } from "../axis/AxisConfig" import { VerticalAxis } from "../axis/Axis" import { VerticalAxisComponent } from "../axis/AxisViews" -import { - HorizontalCategoricalColorLegend, - HorizontalColorLegendManager, -} from "../horizontalColorLegend/HorizontalColorLegends" -import { CategoricalBin, ColorScaleBin } from "../color/ColorScaleBin" import { NoDataSection } from "../scatterCharts/NoDataSection" +import { CategoricalColorAssigner } from "../color/CategoricalColorAssigner" +import { ColorScheme } from "../color/ColorScheme" +import { ColorSchemes } from "../color/ColorSchemes" +import { LineLabelSeries, LineLegend } from "../lineLegend/LineLegend" +import { + makeTooltipRoundingNotice, + makeTooltipToleranceNotice, + Tooltip, + TooltipState, + TooltipValueRange, +} from "../tooltip/Tooltip" +import { TooltipFooterIcon } from "../tooltip/TooltipProps" +import { + AnnotationsMap, + getAnnotationsForSeries, + getAnnotationsMap, + getColorKey, + getSeriesName, +} from "../lineCharts/lineChartHelpers" + +type SVGMouseOrTouchEvent = + | React.MouseEvent + | React.TouchEvent export interface SlopeChartManager extends ChartManager { - isModalOpen?: boolean + canSelectMultipleEntities?: boolean } -const LABEL_SLOPE_PADDING = 8 -const LABEL_LABEL_PADDING = 2 - const TOP_PADDING = 6 const BOTTOM_PADDING = 20 +const LINE_LEGEND_PADDING = 4 + @observer export class SlopeChart extends React.Component<{ bounds?: Bounds manager: SlopeChartManager }> - implements - ChartInterface, - VerticalColorLegendManager, - HorizontalColorLegendManager, - ColorScaleManager + implements ChartInterface { - // currently hovered individual series key - @observable hoverKey?: string - // currently hovered legend color - @observable hoverColor?: string + slopeAreaRef: React.RefObject = React.createRef() + defaultBaseColorScheme = ColorSchemeName.OwidDistinctLines - private hasInteractedWithChart = false + @observable hoveredSeriesName?: string + @observable tooltipState = new TooltipState<{ + series: SlopeChartSeries + }>({ fade: "immediate" }) transformTable(table: OwidTable) { - if (!table.has(this.yColumnSlug)) return table + table = table.filterByEntityNames( + this.selectionArray.selectedEntityNames + ) // TODO: remove this filter once we don't have mixed type columns in datasets - table = table.replaceNonNumericCellsWithErrorValues([this.yColumnSlug]) - - return table - .dropRowsWithErrorValuesForColumn(this.yColumnSlug) - .interpolateColumnWithTolerance(this.yColumnSlug) - } - - @computed get manager() { - return this.props.manager - } - - @computed.struct get bounds() { - return this.props.bounds ?? DEFAULT_BOUNDS - } - - @computed get isStatic(): boolean { - return this.manager.isStatic ?? false - } - - @computed get fontSize() { - return this.manager.fontSize ?? BASE_FONT_SIZE - } - - @computed private get isPortrait(): boolean { - return !!(this.manager.isNarrow || this.manager.isStaticAndSmall) - } - - @computed private get showHorizontalLegend(): boolean { - return !!(this.manager.isSemiNarrow || this.manager.isStaticAndSmall) - } + table = table.replaceNonNumericCellsWithErrorValues(this.yColumnSlugs) - // used by the component - @computed get legendItems() { - return this.colorScale.legendBins - .filter((bin) => this.colorsInUse.includes(bin.color)) - .map((bin) => { - return { - key: bin.label ?? "", - label: bin.label ?? "", - color: bin.color, - } - }) - } - - // used by the component - @computed get categoricalLegendData(): CategoricalBin[] { - return this.legendItems.map( - (legendItem, index) => - new CategoricalBin({ - ...legendItem, - index, - value: legendItem.label, - }) - ) - } + if (this.isLogScale) + table = table.replaceNonPositiveCellsForLogScale(this.yColumnSlugs) - @action.bound onSlopeMouseOver(slopeProps: SlopeEntryProps) { - this.hoverKey = slopeProps.seriesName - } + this.yColumnSlugs.forEach((slug) => { + table = table.interpolateColumnWithTolerance(slug) + }) - @action.bound onSlopeMouseLeave() { - this.hoverKey = undefined + return table } - @action.bound onSlopeClick() { - const { hoverKey, isEntitySelectionEnabled } = this - if (!isEntitySelectionEnabled || hoverKey === undefined) { - return + transformTableForSelection(table: OwidTable): OwidTable { + // 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) + .dropEntitiesThatHaveNoDataInSomeColumn(this.yColumnSlugs) } - this.hasInteractedWithChart = true - this.selectionArray.toggleSelection(hoverKey) - } - - // Both legend managers accept a `onLegendMouseOver` property, but define different signatures. - // The component expects a string, - // the component expects a ColorScaleBin. - @action.bound onLegendMouseOver(binOrColor: string | ColorScaleBin) { - this.hoverColor = - typeof binOrColor === "string" ? binOrColor : binOrColor.color - } - - @action.bound onLegendMouseLeave() { - this.hoverColor = undefined - } - - @computed private get selectionArray() { - return makeSelectionArray(this.manager.selection) - } - @computed private get selectedEntityNames() { - return this.selectionArray.selectedEntityNames + return table } - @computed get isEntitySelectionEnabled(): boolean { - const { manager } = this - return !!( - manager.addCountryMode !== EntitySelectionMode.Disabled && - manager.addCountryMode + @computed get transformedTableFromGrapher(): OwidTable { + return ( + this.manager.transformedTable ?? + this.transformTable(this.inputTable) ) } - // When the color legend is clicked, toggle selection fo all associated keys - @action.bound onLegendClick() { - const { hoverColor, isEntitySelectionEnabled } = this - if (!isEntitySelectionEnabled || hoverColor === undefined) return - - this.hasInteractedWithChart = true - - const seriesNamesToToggle = this.series - .filter((g) => g.color === hoverColor) - .map((g) => g.seriesName) - const areAllSeriesActive = - intersection(seriesNamesToToggle, this.selectedEntityNames) - .length === seriesNamesToToggle.length - if (areAllSeriesActive) - this.selectionArray.setSelectedEntities( - without(this.selectedEntityNames, ...seriesNamesToToggle) - ) - else - this.selectionArray.setSelectedEntities( - this.selectedEntityNames.concat(seriesNamesToToggle) + @computed get transformedTable(): OwidTable { + let table = this.transformedTableFromGrapher + // The % growth transform cannot be applied in transformTable() because it will filter out + // any rows before startHandleTimeBound and change the timeline bounds. + const { isRelativeMode, startHandleTimeBound } = this.manager + if (isRelativeMode && startHandleTimeBound !== undefined) { + table = table.toTotalGrowthForEachColumnComparedToStartTime( + startHandleTimeBound, + this.yColumnSlugs ?? [] ) + } + return table } - // Colors on the legend for which every matching group is focused - @computed get focusColors() { - const { colorsInUse } = this - return colorsInUse.filter((color) => { - const matchingSeriesNames = this.series - .filter((g) => g.color === color) - .map((g) => g.seriesName) - return ( - intersection(matchingSeriesNames, this.selectedEntityNames) - .length === matchingSeriesNames.length - ) - }) + @computed private get manager(): SlopeChartManager { + return this.props.manager } - @computed get focusKeys() { - return this.selectedEntityNames + @computed get inputTable(): OwidTable { + return this.manager.table } - // All currently hovered group keys, combining the legend and the main UI - @computed.struct get hoverKeys() { - const { hoverColor, hoverKey } = this - - const hoverKeys = - hoverColor === undefined - ? [] - : uniq( - this.series - .filter((g) => g.color === hoverColor) - .map((g) => g.seriesName) - ) - - if (hoverKey !== undefined) hoverKeys.push(hoverKey) - - return hoverKeys + @computed private get bounds(): Bounds { + return this.props.bounds ?? DEFAULT_BOUNDS } - // Colors currently on the chart and not greyed out - @computed get activeColors() { - const { hoverKeys, focusKeys } = this - const activeKeys = hoverKeys.concat(focusKeys) - - if (activeKeys.length === 0) - // No hover or focus means they're all active by default - return uniq(this.series.map((g) => g.color)) - - return uniq( - this.series - .filter((g) => activeKeys.indexOf(g.seriesName) !== -1) - .map((g) => g.color) - ) + @computed get fontSize() { + return this.manager.fontSize ?? BASE_FONT_SIZE } - // Only show colors on legend that are actually in use - @computed private get colorsInUse() { - return uniq(this.series.map((series) => series.color)) + @computed private get isLogScale(): boolean { + return this.yScaleType === ScaleType.log } - @computed get legendAlign(): HorizontalAlign { - return HorizontalAlign.left + @computed private get missingDataStrategy(): MissingDataStrategy { + return this.manager.missingDataStrategy || MissingDataStrategy.auto } - @computed get verticalColorLegend(): VerticalColorLegend { - return new VerticalColorLegend({ manager: this }) + @computed private get selectionArray() { + return makeSelectionArray(this.manager.selection) } - @computed get horizontalColorLegend(): HorizontalCategoricalColorLegend { - return new HorizontalCategoricalColorLegend({ manager: this }) + @computed private get formatColumn() { + return this.yColumns[0] } - @computed get legendHeight(): number { - return this.showHorizontalLegend - ? this.horizontalColorLegend.height - : this.verticalColorLegend.height + @computed private get sidebarWidth(): number { + return this.showNoDataSection + ? clamp(this.bounds.width * 0.125, 60, 140) + : 0 } - @computed get legendWidth(): number { - return this.showHorizontalLegend - ? this.bounds.width - : this.verticalColorLegend.width + // used by LineLegend + @computed get focusedSeriesNames(): SeriesName[] { + return this.hoveredSeriesName ? [this.hoveredSeriesName] : [] } - @computed get maxLegendWidth(): number { - return this.showHorizontalLegend - ? this.bounds.width - : this.bounds.width * 0.5 + @computed private get isFocusModeActive(): boolean { + return this.hoveredSeriesName !== undefined } - @computed private get sidebarWidth(): number { - // the min width is set to prevent the "No data" title from line breaking - return clamp(this.legendWidth, 51, this.maxLegendWidth) - } - - // correction is to account for the space taken by the legend - @computed private get innerBounds() { - const { sidebarWidth, showLegend, legendHeight } = this - let bounds = this.bounds - if (showLegend) { - bounds = this.showHorizontalLegend - ? bounds.padTop(legendHeight + 8) - : bounds.padRight(sidebarWidth + 16) - } - return bounds + @computed private get startX(): number { + return this.xScale(this.startTime) } - // verify the validity of data used to show legend - // this is for backwards compatibility with charts that were added without legend - // eg: https://ourworldindata.org/grapher/mortality-rate-improvement-by-cohort - @computed private get showLegend() { - const { colorsInUse } = this - const { legendBins } = this.colorScale - return legendBins.some((bin) => colorsInUse.includes(bin.color)) + @computed private get endX(): number { + return this.xScale(this.endTime) } - @computed - private get selectedEntitiesWithoutData(): string[] { - return difference( - this.selectedEntityNames, - this.series.map((s) => s.seriesName) - ) + private updateTooltipPosition(event: SVGMouseOrTouchEvent) { + const ref = this.manager.base?.current + if (ref) this.tooltipState.position = getRelativeMouse(ref, event) } - @computed private get noDataSection(): React.ReactElement { - const bounds = new Bounds( - this.legendX, - this.legendY + this.legendHeight + 12, - this.sidebarWidth, - this.bounds.height - this.legendHeight - 12 - ) - return ( - - ) - } + private detectHoveredSlope(event: SVGMouseOrTouchEvent) { + const ref = this.slopeAreaRef.current + if (!ref) return - render() { - if (this.failMessage) - return ( - - ) - - const { manager } = this.props - const { - series, - focusKeys, - hoverKeys, - innerBounds, - showLegend, - showHorizontalLegend, - selectedEntitiesWithoutData, - } = this - - const legend = showHorizontalLegend ? ( - - ) : ( - - ) - - return ( - - - {showLegend && legend} - {/* only show the "No data" section if there is space */} - {showLegend && - !showHorizontalLegend && - selectedEntitiesWithoutData.length > 0 && - this.noDataSection} - - ) - } + const mouse = getRelativeMouse(ref, event) + this.mouseFrame = requestAnimationFrame(() => { + if (this.placedSeries.length === 0) return - @computed get categoryLegendY(): number { - return this.bounds.top - } - - @computed get legendY() { - return this.bounds.top - } + const distanceMap = new Map() + for (const series of this.placedSeries) { + distanceMap.set( + series, + PointVector.distanceFromPointToLineSegmentSq( + mouse, + series.startPoint, + series.endPoint + ) + ) + } - @computed get legendX(): number { - return this.showHorizontalLegend - ? this.bounds.left - : this.bounds.right - this.sidebarWidth + const closestSlope = minBy(this.placedSeries, (s) => + distanceMap.get(s) + )! + const distanceSq = distanceMap.get(closestSlope)! + const tolerance = 10 + const toleranceSq = tolerance * tolerance + + if (closestSlope && distanceSq < toleranceSq) { + this.onSlopeMouseOver(closestSlope) + } else { + this.onSlopeMouseLeave() + } + }) } @computed get failMessage() { - if (this.yColumn.isMissing) return "Missing Y column" + const message = getDefaultFailMessage(this.manager) + if (message) return message + else if (this.startTime === this.endTime) return "No matching data" else if (isEmpty(this.series)) return "No matching data" return "" } - colorScale = this.props.manager.colorScaleOverride ?? new ColorScale(this) - - @computed get colorScaleConfig() { - return this.manager.colorScale - } - - @computed get colorScaleColumn() { - return ( - // For faceted charts, we have to get the values of inputTable before it's filtered by - // the faceting logic. - this.manager.colorScaleColumnOverride ?? this.colorColumn - ) - } - - defaultBaseColorScheme = ColorSchemeName.continents - - @computed private get yColumn() { - return this.transformedTable.get(this.yColumnSlug) - } - - @computed protected get yColumnSlug() { - return autoDetectYColumnSlugs(this.manager)[0] + @computed private get yColumns(): CoreColumn[] { + return this.yColumnSlugs.map((slug) => this.transformedTable.get(slug)) } - @computed private get colorColumn() { - // NB: This is tricky. Often it seems we use the Continent variable (123) for colors, but we only have 1 year for that variable, which - // would likely get filtered by any time filtering. So we need to jump up to the root table to get the color values we want. - // We should probably refactor this as part of a bigger color refactoring. - return this.inputTable.get(this.manager.colorColumnSlug) + @computed protected get yColumnSlugs(): ColumnSlug[] { + return autoDetectYColumnSlugs(this.manager) } - @computed get transformedTable() { + @computed private get colorScheme(): ColorScheme { return ( - this.manager.transformedTable ?? - this.transformTable(this.inputTable) + (this.manager.baseColorScheme + ? ColorSchemes.get(this.manager.baseColorScheme) + : null) ?? ColorSchemes.get(this.defaultBaseColorScheme) ) } - @computed get inputTable() { - return this.manager.table - } - - // helper method to directly get the associated color value given an Entity - // dimension data saves color a level deeper. eg: { Afghanistan => { 2015: Asia|Color }} - // this returns that data in the form { Afghanistan => Asia } - @computed private get colorBySeriesName(): Map< - SeriesName, - Color | undefined - > { - const { colorScale, colorColumn } = this - if (colorColumn.isMissing) return new Map() - - const colorByEntity = new Map() - - colorColumn.valueByEntityNameAndOriginalTime.forEach( - (timeToColorMap, seriesName) => { - const values = Array.from(timeToColorMap.values()) - const key = last(values) - colorByEntity.set(seriesName, colorScale.getColor(key)) - } - ) - - return colorByEntity + @computed private get startTime(): Time { + return this.transformedTable.minTime ?? 0 } - // click anywhere inside the Grapher frame to dismiss the current selection - @action.bound onGrapherClick(e: Event): void { - const target = e.target as HTMLElement - const isTargetInteractive = isElementInteractive(target) - if ( - this.isEntitySelectionEnabled && - this.hasInteractedWithChart && - !this.hoverKey && - !this.hoverColor && - !this.manager.isModalOpen && - !isTargetInteractive - ) { - this.selectionArray.clearSelection() - } + @computed private get endTime(): Time { + return this.transformedTable.maxTime ?? 0 } - @computed private get grapherElement() { - return this.manager.base?.current + @computed get seriesStrategy(): SeriesStrategy { + return autoDetectSeriesStrategy(this.manager, true) } - componentDidMount() { - if (this.grapherElement) { - // listening to "mousedown" instead of "click" fixes a bug - // where the current selection was incorrectly dismissed - // when the user drags the slider but releases the drag outside of the timeline - this.grapherElement.addEventListener( - "mousedown", - this.onGrapherClick - ) - } - exposeInstanceOnWindow(this) + @computed private get categoricalColorAssigner(): CategoricalColorAssigner { + return new CategoricalColorAssigner({ + colorScheme: this.colorScheme, + invertColorScheme: this.manager.invertColorScheme, + colorMap: + this.seriesStrategy === SeriesStrategy.entity + ? this.inputTable.entityNameColorIndex + : this.inputTable.columnDisplayNameToColorMap, + autoColorMapCache: this.manager.seriesColorMap, + }) } - componentWillUnmount(): void { - if (this.grapherElement) { - this.grapherElement.removeEventListener( - "mousedown", - this.onGrapherClick - ) - } + @computed private get annotationsMap(): AnnotationsMap | undefined { + return getAnnotationsMap(this.inputTable, this.yColumnSlugs[0]) } - @computed get series() { - const column = this.yColumn - if (!column) return [] - - const { colorBySeriesName } = this - const { minTime, maxTime } = column - - const table = this.inputTable - - return column.uniqEntityNames - .map((seriesName) => { - const values: SlopeChartValue[] = [] - - const yValues = - column.valueByEntityNameAndOriginalTime.get(seriesName)! || - [] - - yValues.forEach((value, time) => { - if (time !== minTime && time !== maxTime) return + private constructSingleSeries( + entityName: EntityName, + column: CoreColumn + ): RawSlopeChartSeries { + const { startTime, endTime, seriesStrategy } = this + const { canSelectMultipleEntities = false } = this.manager - values.push({ - x: time, - y: value, - }) - }) - - // sort values by time - const sortedValues = sortBy(values, (v) => v.x) - - const color = - table.getColorForEntityName(seriesName) ?? - colorBySeriesName.get(seriesName) ?? - DEFAULT_SLOPE_CHART_COLOR - - return { - seriesName, - color, - values: sortedValues, - } as SlopeChartSeries - }) - .filter((series) => series.values.length >= 2) - } -} - -@observer -class SlopeEntry extends React.Component { - line: SVGElement | null = null + const { availableEntityNames } = this.selectionArray + const columnName = column.nonEmptyDisplayName + const seriesName = getSeriesName({ + entityName, + columnName, + seriesStrategy, + availableEntityNames, + canSelectMultipleEntities, + }) - @computed get isInBackground() { - const { isLayerMode, isHovered, isFocused } = this.props + const owidRowByTime = column.owidRowByEntityNameAndTime.get(entityName) + const start = owidRowByTime?.get(startTime) + const end = owidRowByTime?.get(endTime) - if (!isLayerMode) return false + const colorKey = getColorKey({ + entityName, + columnName, + seriesStrategy, + availableEntityNames, + }) + const color = this.categoricalColorAssigner.assign(colorKey) - return !(isHovered || isFocused) - } + const annotation = getAnnotationsForSeries( + this.annotationsMap, + seriesName + ) - render() { - const { - x1, - y1, - x2, - y2, - color, - hasLeftLabel, - hasRightLabel, - leftValueLabel, - leftEntityLabel, - rightValueLabel, - rightEntityLabel, - leftEntityLabelBounds, - rightEntityLabelBounds, - isFocused, - isHovered, - isMultiHoverMode, + return { seriesName, - } = this.props - const { isInBackground } = this - - const lineColor = isInBackground ? "#e2e2e2" : color - const labelColor = isInBackground ? "#ccc" : GRAPHER_DARK_TEXT - const opacity = isHovered ? 1 : isFocused ? 0.7 : 0.5 - const lineStrokeWidth = - isHovered && !isMultiHoverMode ? 4 : isFocused ? 3 : 2 - - const showDots = isFocused || isHovered - const showValueLabels = isFocused || isHovered - const showLeftEntityLabel = isFocused || (isHovered && isMultiHoverMode) - - const sharedLabelProps = { - fill: labelColor, - style: { cursor: "default" }, + entityName, + color, + start, + end, + annotation, } + } + private isSeriesValid( + series: RawSlopeChartSeries + ): series is SlopeChartSeries { + const { start, end } = series return ( - - (this.line = el)} - x1={x1} - y1={y1} - x2={x2} - y2={y2} - stroke={lineColor} - strokeWidth={lineStrokeWidth} - opacity={opacity} - /> - {showDots && ( - <> - - - - )} - {/* value label on the left */} - {hasLeftLabel && - showValueLabels && - leftValueLabel.render( - x1 - LABEL_SLOPE_PADDING, - leftEntityLabelBounds.y, - { - textProps: { - ...sharedLabelProps, - textAnchor: "end", - }, - } - )} - {/* entity label on the left */} - {hasLeftLabel && - showLeftEntityLabel && - leftEntityLabel.render( - // -2px is a minor visual correction - leftEntityLabelBounds.x - 2, - leftEntityLabelBounds.y, - { - textProps: { - ...sharedLabelProps, - textAnchor: "end", - }, - } - )} - {/* value label on the right */} - {hasRightLabel && - showValueLabels && - rightValueLabel.render( - rightEntityLabelBounds.x + - rightEntityLabel.width + - LABEL_LABEL_PADDING, - rightEntityLabelBounds.y, - { - textProps: sharedLabelProps, - } - )} - {/* entity label on the right */} - {hasRightLabel && - rightEntityLabel.render( - rightEntityLabelBounds.x, - rightEntityLabelBounds.y, - { - textProps: { - ...sharedLabelProps, - fontWeight: - isFocused || isHovered ? "bold" : undefined, - }, - } - )} - + start?.value !== undefined && + end?.value !== undefined && + start.originalTime < end.originalTime ) } -} -@observer -class LabelledSlopes - extends React.Component - implements AxisManager -{ - base: React.RefObject = React.createRef() - - @computed private get data() { - return this.props.seriesArr - } + /** + * Usually we drop rows with missing data in the transformTable function. + * But slope charts have a "No data" section. If slopes that have data + * but shouldn't be plotted because a "sibling" slope of the same entity + * doesn't have data are dropped from the transformed table, then we + * would have no way of knowing whether a slope has been dropped because + * it actually had no data or a sibling slope had no data. That's why we + * filter out slopes that are valid but shouldn't be plotted here, so + * that the noDataSeries is populated correctly. + */ + private shouldSeriesBePlotted( + series: RawSlopeChartSeries + ): series is SlopeChartSeries { + if (!this.isSeriesValid(series)) return false - @computed private get yColumn() { - return this.props.yColumn - } + if ( + this.seriesStrategy === SeriesStrategy.column && + this.missingDataStrategy === MissingDataStrategy.hide + ) { + const entitySeries = this.rawSeriesByEntityName.get( + series.entityName + ) + return !!entitySeries?.every((series) => this.isSeriesValid(series)) + } - @computed private get manager() { - return this.props.manager + return true } - @computed private get bounds() { - return this.props.bounds + @computed private get rawSeries(): RawSlopeChartSeries[] { + return this.yColumns.flatMap((column) => + this.selectionArray.selectedEntityNames.map((entityName) => + this.constructSingleSeries(entityName, column) + ) + ) } - @computed get fontSize() { - return this.manager.fontSize ?? BASE_FONT_SIZE + @computed private get rawSeriesByEntityName(): Map< + SeriesName, + RawSlopeChartSeries[] + > { + const map = new Map() + this.rawSeries.forEach((series) => { + const { entityName } = series + if (!map.has(entityName)) map.set(entityName, []) + map.get(entityName)!.push(series) + }) + return map } - @computed private get focusedSeriesNames() { - return intersection( - this.props.focusKeys || [], - this.data.map((g) => g.seriesName) + @computed get series(): SlopeChartSeries[] { + return this.rawSeries.filter((series) => + this.shouldSeriesBePlotted(series) ) } - @computed private get hoveredSeriesNames() { - return intersection( - this.props.hoverKeys || [], - this.data.map((g) => g.seriesName) - ) - } + @computed private get placedSeries(): PlacedSlopeChartSeries[] { + const { yAxis, startX, endX } = this - // Layered mode occurs when any entity on the chart is hovered or focused - // Then, a special "foreground" set of entities is rendered over the background - @computed private get isLayerMode() { - return ( - this.hoveredSeriesNames.length > 0 || - this.focusedSeriesNames.length > 0 || - // if the user has selected entities that are not in the chart, - // we want to move all entities into the background - (this.props.focusKeys?.length > 0 && - this.focusedSeriesNames.length === 0) - ) - } + return this.series.map((series) => { + const startY = yAxis.place(series.start.value) + const endY = yAxis.place(series.end.value) - @computed private get isMultiHoverMode() { - return this.hoveredSeriesNames.length > 1 - } + const startPoint = new PointVector(startX, startY) + const endPoint = new PointVector(endX, endY) - @computed get isPortrait(): boolean { - return this.props.isPortrait + return { ...series, startPoint, endPoint } + }) } - @computed private get allValues() { - return this.props.seriesArr.flatMap((g) => g.values) + @computed + private get noDataSeries(): RawSlopeChartSeries[] { + return this.rawSeries.filter((series) => !this.isSeriesValid(series)) } - @computed private get xDomainDefault(): [number, number] { - return domainExtent( - this.allValues.map((v) => v.x), - ScaleType.linear - ) + @computed private get showNoDataSection(): boolean { + return this.noDataSeries.length > 0 } @computed private get yAxisConfig(): AxisConfig { return new AxisConfig(this.manager.yAxisConfig, this) } - @computed get yAxis(): VerticalAxis { - const axis = this.yAxisConfig.toVerticalAxis() - axis.domain = this.yDomain - axis.range = this.yRange - axis.formatColumn = this.yColumn - axis.label = "" - return axis + @computed private get allValues(): number[] { + return this.series.flatMap((series) => [ + series.start.value, + series.end.value, + ]) } - @computed private get yScaleType() { - return this.yAxisConfig.scaleType || ScaleType.linear + @computed private get yScaleType(): ScaleType { + return this.yAxisConfig.scaleType ?? ScaleType.linear } @computed private get yDomainDefault(): [number, number] { - return domainExtent( - this.allValues.map((v) => v.y), - this.yScaleType || ScaleType.linear - ) - } - - @computed private get xDomain(): [number, number] { - return this.xDomainDefault + return domainExtent(this.allValues, this.yScaleType) } @computed private get yDomain(): [number, number] { @@ -843,30 +470,17 @@ class LabelledSlopes .yRange() } - @computed get yAxisWidth(): number { - return this.yAxis.width + 5 // 5px account for the tick marks + @computed get yAxis(): VerticalAxis { + const axis = this.yAxisConfig.toVerticalAxis() + axis.domain = this.yDomain + axis.range = this.yRange + axis.formatColumn = this.yColumns[0] + axis.label = "" + return axis } - @computed get xRange(): [number, number] { - // take into account the space taken by the yAxis and slope labels - const bounds = this.bounds - .padLeft(this.yAxisWidth + 4) - .padLeft(this.maxLabelWidth) - .padRight(this.maxLabelWidth) - - // pick a reasonable width based on an ideal aspect ratio - const idealAspectRatio = 0.9 - const availableWidth = bounds.width - const idealWidth = idealAspectRatio * bounds.height - const slopeWidth = this.isPortrait - ? availableWidth - : clamp(idealWidth, 220, availableWidth) - - const leftRightPadding = (availableWidth - slopeWidth) / 2 - return bounds - .padLeft(leftRightPadding) - .padRight(leftRightPadding) - .xRange() + @computed get yAxisWidth(): number { + return this.yAxis.width + 5 // 5px account for the tick marks } @computed private get xScale(): ScaleLinear { @@ -874,446 +488,554 @@ class LabelledSlopes return scaleLinear().domain(xDomain).range(xRange) } - @computed get maxLabelWidth(): number { - const { slopeLabels } = this - const maxLabelWidths = slopeLabels.map((slope) => { - const entityLabelWidth = slope.leftEntityLabel.width - const maxValueLabelWidth = Math.max( - slope.leftValueLabel.width, - slope.rightValueLabel.width - ) - return ( - entityLabelWidth + - maxValueLabelWidth + - LABEL_SLOPE_PADDING + - LABEL_LABEL_PADDING + @computed private get xDomain(): [number, number] { + return [this.startTime, this.endTime] + } + + @computed private get maxLabelWidth(): number { + // TODO: copied from line legend + const fontSize = + GRAPHER_FONT_SCALE_12 * (this.manager.fontSize ?? BASE_FONT_SIZE) + return max( + this.series.map( + (series) => + Bounds.forText(series.seriesName, { fontSize }).width ) - }) - return max(maxLabelWidths) ?? 0 + )! } - @computed get allowedLabelWidth() { - return this.bounds.width * 0.2 + @computed get maxLineLegendWidth(): number { + // todo: copied from line legend (left padding, marker margin) + return Math.min(this.maxLabelWidth + 35 + 4, this.bounds.width / 3) } - @computed private get slopeLabels() { - const { isPortrait, yColumn, allowedLabelWidth: maxWidth } = this + @computed get xRange(): [number, number] { + const lineLegendWidth = this.maxLineLegendWidth + LINE_LEGEND_PADDING + + // pick a reasonable max width based on an ideal aspect ratio + const idealAspectRatio = 0.6 + const chartAreaWidth = this.bounds.width - this.sidebarWidth + const availableWidth = + chartAreaWidth - this.yAxisWidth - lineLegendWidth + const idealWidth = idealAspectRatio * this.bounds.height + const maxSlopeWidth = Math.min(idealWidth, availableWidth) + + let startX = + this.bounds.x + Math.max(0.25 * chartAreaWidth, this.yAxisWidth + 4) + let endX = + this.bounds.x + + Math.min( + chartAreaWidth - 0.25 * chartAreaWidth, + chartAreaWidth - lineLegendWidth + ) - return this.data.map((series) => { - const text = series.seriesName - const [v1, v2] = series.values - const fontSize = - (isPortrait - ? GRAPHER_FONT_SCALE_9_6 - : GRAPHER_FONT_SCALE_10_5) * this.fontSize - const leftValueStr = yColumn.formatValueShort(v1.y) - const rightValueStr = yColumn.formatValueShort(v2.y) + const currentSlopeWidth = endX - startX + if (currentSlopeWidth > maxSlopeWidth) { + const padding = currentSlopeWidth - maxSlopeWidth + startX += padding / 2 + endX -= padding / 2 + } - // value labels - const valueLabelProps = { - maxWidth: Infinity, // no line break - fontSize, - lineHeight: 1, - } - const leftValueLabel = new TextWrap({ - text: leftValueStr, - ...valueLabelProps, - }) - const rightValueLabel = new TextWrap({ - text: rightValueStr, - ...valueLabelProps, - }) - - // entity labels - const entityLabelProps = { - ...valueLabelProps, - maxWidth, - fontWeight: 700, - separators: [" ", "-"], - } - const leftEntityLabel = new TextWrap({ - text, - ...entityLabelProps, - }) - const rightEntityLabel = new TextWrap({ - text, - ...entityLabelProps, - }) + return [startX, endX] + } + @computed get lineLegendX(): number { + return this.xRange[1] + LINE_LEGEND_PADDING + } + + // used in LineLegend + @computed get labelSeries(): LineLabelSeries[] { + return this.series.map((series) => { + const { seriesName, color, end, annotation } = series return { - seriesName: series.seriesName, - leftValueLabel, - leftEntityLabel, - rightValueLabel, - rightEntityLabel, + color, + seriesName, + label: seriesName, + annotation, + yValue: end.value, } }) } - @computed private get initialSlopeData() { - const { data, slopeLabels, xScale, yAxis, yDomain } = this + private playIntroAnimation() { + // Nice little intro animation + select(this.slopeAreaRef.current) + .select(".slopes") + .attr("stroke-dasharray", "100%") + .attr("stroke-dashoffset", "100%") + .transition() + .attr("stroke-dashoffset", "0%") + } - const slopeData: SlopeEntryProps[] = [] + componentDidMount() { + exposeInstanceOnWindow(this) - data.forEach((series, i) => { - // Ensure values fit inside the chart - if ( - !series.values.every( - (d) => d.y >= yDomain[0] && d.y <= yDomain[1] - ) - ) - return - - const labels = slopeLabels[i] - const [v1, v2] = series.values - const [x1, x2] = [xScale(v1.x), xScale(v2.x)] - const [y1, y2] = [yAxis.place(v1.y), yAxis.place(v2.y)] - - slopeData.push({ - ...labels, - x1, - y1, - x2, - y2, - color: series.color, - seriesName: series.seriesName, - isFocused: false, - isHovered: false, - hasLeftLabel: true, - hasRightLabel: true, - } as SlopeEntryProps) - }) + if (!this.manager.disableIntroAnimation) { + this.playIntroAnimation() + } + } - return slopeData + private hoverTimer?: NodeJS.Timeout + @action.bound onLineLegendMouseOver(seriesName: SeriesName): void { + clearTimeout(this.hoverTimer) + this.hoveredSeriesName = seriesName } - @computed get backgroundGroups() { - return this.slopeData.filter( - (group) => !(group.isHovered || group.isFocused) - ) + @action.bound onLineLegendMouseLeave(): void { + clearTimeout(this.hoverTimer) + this.hoverTimer = setTimeout(() => { + // wait before clearing selection in case the mouse is moving quickly over neighboring labels + this.hoveredSeriesName = undefined + }, 200) } - @computed get foregroundGroups() { - return this.slopeData.filter( - (group) => !!(group.isHovered || group.isFocused) - ) + @action.bound onSlopeMouseOver(series: SlopeChartSeries) { + this.hoveredSeriesName = series.seriesName + this.tooltipState.target = { series } } - // Get the final slope data with hover focusing and collision detection - @computed get slopeData(): SlopeEntryProps[] { - const { focusedSeriesNames, hoveredSeriesNames } = this + @action.bound onSlopeMouseLeave() { + this.hoveredSeriesName = undefined + this.tooltipState.target = null + } - let slopeData = this.initialSlopeData + mouseFrame?: number + @action.bound onMouseMove(event: SVGMouseOrTouchEvent) { + this.updateTooltipPosition(event) + this.detectHoveredSlope(event) + } - slopeData = slopeData.map((slope) => { - // used for collision detection - const leftEntityLabelBounds = new Bounds( - // labels on the left are placed like this: | - slope.x1 - - LABEL_SLOPE_PADDING - - slope.leftValueLabel.width - - LABEL_LABEL_PADDING, - slope.y1 - slope.leftEntityLabel.lines[0].height / 2, - slope.leftEntityLabel.width, - slope.leftEntityLabel.height - ) - const rightEntityLabelBounds = new Bounds( - // labels on the left are placed like this: | - slope.x2 + LABEL_SLOPE_PADDING, - slope.y2 - slope.rightEntityLabel.height / 2, - slope.rightEntityLabel.width, - slope.rightEntityLabel.height - ) + @action.bound onMouseLeave() { + if (this.mouseFrame !== undefined) cancelAnimationFrame(this.mouseFrame) - // used to determine priority for labelling conflicts - const isFocused = focusedSeriesNames.includes(slope.seriesName) - const isHovered = hoveredSeriesNames.includes(slope.seriesName) + this.onSlopeMouseLeave() + } - return { - ...slope, - leftEntityLabelBounds, - rightEntityLabelBounds, - isFocused, - isHovered, - } - }) + @computed private get lineStrokeWidth(): number { + const factor = this.manager.isStaticAndSmall ? 2 : 1 + return factor * 2 + } - // How to work out which of two slopes to prioritize for labelling conflicts - function chooseLabel(s1: SlopeEntryProps, s2: SlopeEntryProps) { - if (s1.isHovered && !s2.isHovered) - // Hovered slopes always have priority - return s1 - else if (!s1.isHovered && s2.isHovered) return s2 - else if (s1.isFocused && !s2.isFocused) - // Focused slopes are next in priority - return s1 - else if (!s1.isFocused && s2.isFocused) return s2 - else if (s1.hasRightLabel && !s2.hasRightLabel) - // Slopes which already have one label are prioritized for the other side - return s1 - else if (!s1.hasRightLabel && s2.hasRightLabel) return s2 - else return s1 // Equal priority, just do the first one - } + @computed private get backgroundColor(): string { + return this.manager.backgroundColor ?? GRAPHER_BACKGROUND_DEFAULT + } - // Eliminate overlapping labels, one pass for each side - slopeData.forEach((s1) => { - slopeData.forEach((s2) => { - if ( - s1 !== s2 && - s1.hasRightLabel && - s2.hasRightLabel && - // entity labels don't necessarily share the same x position. - // that's why we check for vertical intersection only - s1.rightEntityLabelBounds.hasVerticalOverlap( - s2.rightEntityLabelBounds - ) - ) { - if (chooseLabel(s1, s2) === s1) s2.hasRightLabel = false - else s1.hasRightLabel = false - } - }) - }) + @computed get renderUid(): number { + return guid() + } - slopeData.forEach((s1) => { - slopeData.forEach((s2) => { - if ( - s1 !== s2 && - s1.hasLeftLabel && - s2.hasLeftLabel && - // entity labels don't necessarily share the same x position. - // that's why we check for vertical intersection only - s1.leftEntityLabelBounds.hasVerticalOverlap( - s2.leftEntityLabelBounds - ) - ) { - if (chooseLabel(s1, s2) === s1) s2.hasLeftLabel = false - else s1.hasLeftLabel = false - } - }) - }) + @computed get tooltip(): React.ReactElement | undefined { + const { + tooltipState: { target, position, fading }, + startTime, + endTime, + } = this - // Order by focus/hover for draw order - slopeData = sortBy(slopeData, (slope) => - slope.isFocused || slope.isHovered ? 1 : 0 - ) + const { series } = target || {} + if (!series) return - return slopeData - } + const formatTime = (time: Time) => this.formatColumn.formatTime(time) - mouseFrame?: number - @action.bound onMouseLeave() { - if (this.mouseFrame !== undefined) cancelAnimationFrame(this.mouseFrame) + const isStartValueOriginal = series.start.originalTime === startTime + const isEndValueOriginal = series.end.originalTime === endTime + const actualStartTime = isStartValueOriginal + ? startTime + : series.start.originalTime + const actualEndTime = isEndValueOriginal + ? endTime + : series.end.originalTime - if (this.props.onMouseLeave) this.props.onMouseLeave() - } - - @action.bound onMouseMove( - ev: React.MouseEvent | React.TouchEvent - ) { - if (this.base.current) { - const mouse = getRelativeMouse(this.base.current, ev.nativeEvent) - - this.mouseFrame = requestAnimationFrame(() => { - if (this.props.bounds.contains(mouse)) { - if (this.slopeData.length === 0) return - - const { x1: startX, x2: endX } = this.slopeData[0] - - // whether the mouse is over the chart area, - // the left label area, or the right label area - const mousePosition = - mouse.x < startX - ? "left" - : mouse.x > endX - ? "right" - : "chart" - - // don't track mouse movements when hovering over labels on the left - if (mousePosition === "left") { - this.props.onMouseLeave() - return - } - - const distToSlopeOrLabel = new Map< - SlopeEntryProps, - number - >() - for (const s of this.slopeData) { - // start and end point of a line - let p1: PointVector - let p2: PointVector - - if (mousePosition === "chart") { - // points define the slope line - p1 = new PointVector(s.x1, s.y1) - p2 = new PointVector(s.x2, s.y2) - } else { - const labelBox = s.rightEntityLabelBounds.toProps() - // points define a "strike-through" line that stretches from - // the end point of the slopes to the right side of the right label - const y = labelBox.y + labelBox.height / 2 - p1 = new PointVector(endX, y) - p2 = new PointVector(labelBox.x + labelBox.width, y) - } - - // calculate the distance to the slope or label - const dist = - PointVector.distanceFromPointToLineSegmentSq( - mouse, - p1, - p2 - ) - distToSlopeOrLabel.set(s, dist) - } - - const closestSlope = minBy(this.slopeData, (s) => - distToSlopeOrLabel.get(s) - ) - const distanceSq = distToSlopeOrLabel.get(closestSlope!)! - const tolerance = mousePosition === "chart" ? 20 : 10 - const toleranceSq = tolerance * tolerance - - if ( - closestSlope && - distanceSq < toleranceSq && - this.props.onMouseOver - ) { - this.props.onMouseOver(closestSlope) - } else { - this.props.onMouseLeave() - } - } - }) - } - } + const { isRelativeMode } = this.manager, + timeRange = `${formatTime(actualStartTime)} to ${formatTime(actualEndTime)}`, + timeLabel = timeRange + (isRelativeMode ? " (relative change)" : "") - @action.bound onClick() { - if (this.props.onClick) this.props.onClick() - } + const columns = this.yColumns + const allRoundedToSigFigs = columns.every( + (column) => column.roundsToSignificantFigures + ) + const anyRoundedToSigFigs = columns.some( + (column) => column.roundsToSignificantFigures + ) + const sigFigs = excludeUndefined( + columns.map((column) => + column.roundsToSignificantFigures + ? column.numSignificantFigures + : undefined + ) + ) - componentDidMount() { - if (!this.manager.disableIntroAnimation) { - this.playIntroAnimation() + const constructTargetYearForToleranceNotice = () => { + if (!isStartValueOriginal && !isEndValueOriginal) { + return `${formatTime(startTime)} and ${formatTime(endTime)}` + } else if (!isStartValueOriginal) { + return formatTime(startTime) + } else if (!isEndValueOriginal) { + return formatTime(endTime) + } else { + return undefined + } } - } - private playIntroAnimation() { - // Nice little intro animation - select(this.base.current) - .select(".slopes") - .attr("stroke-dasharray", "100%") - .attr("stroke-dashoffset", "100%") - .transition() - .attr("stroke-dashoffset", "0%") + const targetYear = constructTargetYearForToleranceNotice() + const toleranceNotice = targetYear + ? { + icon: TooltipFooterIcon.notice, + text: makeTooltipToleranceNotice(targetYear), + } + : undefined + const roundingNotice = anyRoundedToSigFigs + ? { + icon: allRoundedToSigFigs + ? TooltipFooterIcon.none + : TooltipFooterIcon.significance, + text: makeTooltipRoundingNotice(sigFigs, { + plural: sigFigs.length > 1, + }), + } + : undefined + const footer = excludeUndefined([toleranceNotice, roundingNotice]) + + return ( + (this.tooltipState.target = null)} + > + + + ) } - renderGroups(groups: SlopeEntryProps[]) { - const { isLayerMode, isMultiHoverMode } = this + private renderNoDataSection(): React.ReactElement { + const seriesNames = this.noDataSeries.map((series) => series.seriesName) + const bounds = new Bounds( + this.bounds.right - this.sidebarWidth, + this.bounds.top, + this.sidebarWidth, + this.bounds.height + ) - return groups.map((slope) => ( - - )) + ) } - render() { - const { bounds, slopeData, xDomain, yAxis, yRange, onMouseMove } = this + private renderSlope( + series: PlacedSlopeChartSeries, + mode?: RenderMode + ): React.ReactElement { + return ( + + ) + } - if (isEmpty(slopeData)) - return + private renderSlopes() { + if (!this.isFocusModeActive) { + return this.placedSeries.map((series) => this.renderSlope(series)) + } - const { x1, x2 } = slopeData[0] - const [y1, y2] = yRange + const [focusedSeries, backgroundSeries] = partition( + this.placedSeries, + (series) => series.seriesName === this.hoveredSeriesName + ) return ( - + <> + {backgroundSeries.map((series) => + this.renderSlope(series, RenderMode.mute) + )} + {focusedSeries.map((series) => + this.renderSlope(series, RenderMode.focus) + )} + + ) + } + + private renderChartArea() { + const { bounds, xDomain, yRange, startX, endX } = this + + const [bottom, top] = yRange + + return ( + + - - {this.yAxis.tickLabels.map((tick) => { - const y = yAxis.place(tick.value) - return ( - - {/* grid lines connecting the chart area to the axis */} - - {/* grid lines within the chart area */} - - - ) - })} - - - - - {this.yColumn.formatTime(xDomain[0])} - - + + - {this.yColumn.formatTime(xDomain[1])} - - - {this.renderGroups(this.backgroundGroups)} - {this.renderGroups(this.foregroundGroups)} + + {this.renderSlopes()} ) } + + render() { + if (this.failMessage) + return ( + + ) + + return ( + + {this.renderChartArea()} + {this.manager.showLegend && } + {this.showNoDataSection && this.renderNoDataSection()} + {this.tooltip} + + ) + } +} + +interface SlopeProps { + series: PlacedSlopeChartSeries + color: string + mode?: RenderMode + dotRadius?: number + strokeWidth?: number + outlineWidth?: number + outlineStroke?: string + onMouseOver?: (series: SlopeChartSeries) => void + onMouseLeave?: () => void +} + +function Slope({ + series, + color, + mode = RenderMode.default, + dotRadius = 3.5, + strokeWidth = 2, + outlineWidth = 0.5, + outlineStroke = "#fff", + onMouseOver, + onMouseLeave, +}: SlopeProps) { + const { seriesName, startPoint, endPoint } = series + + const opacity = { + [RenderMode.default]: 1, + [RenderMode.focus]: 1, + [RenderMode.mute]: 0.3, + [RenderMode.background]: 0.3, + }[mode] + + return ( + onMouseOver?.(series)} + onMouseLeave={() => onMouseLeave?.()} + > + + + + + ) +} + +interface HaloLineProps extends SVGProps { + startPoint: PointVector + endPoint: PointVector + strokeWidth?: number + outlineWidth?: number + outlineStroke?: string +} + +function HaloLine(props: HaloLineProps): React.ReactElement { + const { + startPoint, + endPoint, + outlineWidth = 0.5, + outlineStroke = "#fff", + ...styleProps + } = props + return ( + <> + + + + ) +} + +interface GridLinesProps { + bounds: Bounds + yAxis: VerticalAxis + startX: number + endX: number +} + +function GridLines({ bounds, yAxis, startX, endX }: GridLinesProps) { + return ( + + {yAxis.tickLabels.map((tick) => { + const y = yAxis.place(tick.value) + return ( + + {/* grid lines connecting the chart area to the axis */} + + {/* grid lines within the chart area */} + + + ) + })} + + ) +} + +function MarkX({ + label, + x, + top, + bottom, + fontSize, +}: { + label: string + x: number + top: number + bottom: number + fontSize: number +}) { + return ( + <> + + + {label} + + + ) } diff --git a/packages/@ourworldindata/grapher/src/slopeCharts/SlopeChartConstants.ts b/packages/@ourworldindata/grapher/src/slopeCharts/SlopeChartConstants.ts index bb52f727212..321ac2e6932 100644 --- a/packages/@ourworldindata/grapher/src/slopeCharts/SlopeChartConstants.ts +++ b/packages/@ourworldindata/grapher/src/slopeCharts/SlopeChartConstants.ts @@ -1,62 +1,19 @@ -import { CoreColumn } from "@ourworldindata/core-table" +import { PartialBy, PointVector } from "@ourworldindata/utils" +import { EntityName, OwidVariableRow } from "@ourworldindata/types" import { ChartSeries } from "../chart/ChartInterface" -import { ChartManager } from "../chart/ChartManager" -import { ScaleType } from "@ourworldindata/types" -import { Bounds } from "@ourworldindata/utils" -import { TextWrap } from "@ourworldindata/components" - -export interface SlopeChartValue { - x: number - y: number -} export interface SlopeChartSeries extends ChartSeries { - size: number - values: SlopeChartValue[] + entityName: EntityName + start: Pick, "value" | "originalTime"> + end: Pick, "value" | "originalTime"> + annotation?: string } -export const DEFAULT_SLOPE_CHART_COLOR = "#ff7f0e" - -export interface SlopeEntryProps extends ChartSeries { - isLayerMode: boolean - isMultiHoverMode: boolean - x1: number - y1: number - x2: number - y2: number - - hasLeftLabel: boolean - leftEntityLabel: TextWrap - leftValueLabel: TextWrap - leftEntityLabelBounds: Bounds +export type RawSlopeChartSeries = PartialBy - hasRightLabel: boolean - rightEntityLabel: TextWrap - rightEntityLabelBounds: Bounds - rightValueLabel: TextWrap - - isFocused: boolean - isHovered: boolean -} - -export interface LabelledSlopesProps { - manager: ChartManager - yColumn: CoreColumn - bounds: Bounds - seriesArr: SlopeChartSeries[] - focusKeys: string[] - hoverKeys: string[] - onMouseOver: (slopeProps: SlopeEntryProps) => void - onMouseLeave: () => void - onClick: () => void - isPortrait: boolean +export interface PlacedSlopeChartSeries extends SlopeChartSeries { + startPoint: PointVector + endPoint: PointVector } -export interface SlopeAxisProps { - bounds: Bounds - orient: "left" | "right" - column: CoreColumn - scale: any - scaleType: ScaleType - fontSize: number -} +export const DEFAULT_SLOPE_CHART_COLOR = "#ff7f0e" diff --git a/packages/@ourworldindata/grapher/src/stackedCharts/AbstractStackedChart.tsx b/packages/@ourworldindata/grapher/src/stackedCharts/AbstractStackedChart.tsx index 9004f813505..172d7e0bf9c 100644 --- a/packages/@ourworldindata/grapher/src/stackedCharts/AbstractStackedChart.tsx +++ b/packages/@ourworldindata/grapher/src/stackedCharts/AbstractStackedChart.tsx @@ -405,8 +405,8 @@ export class AbstractStackedChart const pointColor = row.value > 0 ? POSITIVE_COLOR : NEGATIVE_COLOR return { - position: row.time, - time: row.time, + position: row.originalTime, + time: row.originalTime, value: row.value, valueOffset: 0, interpolated: diff --git a/packages/@ourworldindata/grapher/src/stackedCharts/MarimekkoChart.tsx b/packages/@ourworldindata/grapher/src/stackedCharts/MarimekkoChart.tsx index 9fa7f41afd6..e89b176b4da 100644 --- a/packages/@ourworldindata/grapher/src/stackedCharts/MarimekkoChart.tsx +++ b/packages/@ourworldindata/grapher/src/stackedCharts/MarimekkoChart.tsx @@ -383,7 +383,7 @@ export class MarimekkoChart col.def.color ?? colorScheme.getColors(yColumns.length)[i], points: col.owidRows.map((row) => ({ - time: row.time, + time: row.originalTime, position: row.entityName, value: row.value, valueOffset: 0, @@ -417,7 +417,7 @@ export class MarimekkoChart const points: SimplePoint[] = [] for (const row of rows) { points.push({ - time: row.time, + time: row.originalTime, value: row.value, entity: row.entityName, }) diff --git a/packages/@ourworldindata/grapher/src/stackedCharts/StackedAreaChart.tsx b/packages/@ourworldindata/grapher/src/stackedCharts/StackedAreaChart.tsx index 857a08a1b4a..96bb76f8625 100644 --- a/packages/@ourworldindata/grapher/src/stackedCharts/StackedAreaChart.tsx +++ b/packages/@ourworldindata/grapher/src/stackedCharts/StackedAreaChart.tsx @@ -18,7 +18,7 @@ import { max, } from "@ourworldindata/utils" import { computed, action, observable } from "mobx" -import { SeriesName } from "@ourworldindata/types" +import { RenderMode, SeriesName } from "@ourworldindata/types" import { GRAPHER_AREA_OPACITY_DEFAULT, GRAPHER_AREA_OPACITY_MUTE, @@ -68,21 +68,21 @@ interface AreasProps extends React.SVGAttributes { const STACKED_AREA_CHART_CLASS_NAME = "StackedArea" -const AREA_OPACITY = { - DEFAULT: GRAPHER_AREA_OPACITY_DEFAULT, - FOCUS: GRAPHER_AREA_OPACITY_FOCUS, - MUTE: GRAPHER_AREA_OPACITY_MUTE, +const AREA_OPACITY: Partial> = { + default: GRAPHER_AREA_OPACITY_DEFAULT, + focus: GRAPHER_AREA_OPACITY_FOCUS, + mute: GRAPHER_AREA_OPACITY_MUTE, } -const BORDER_OPACITY = { - DEFAULT: 0.7, - HOVER: 1, - MUTE: 0.3, +const BORDER_OPACITY: Partial> = { + default: 0.7, + focus: 1, + mute: 0.3, } -const BORDER_WIDTH = { - DEFAULT: 0.5, - HOVER: 1.5, +const BORDER_WIDTH: Partial> = { + default: 0.5, + mute: 1.5, } @observer @@ -183,10 +183,10 @@ class Areas extends React.Component { } const points = [...placedPoints, ...reverse(clone(prevPoints))] const opacity = !this.isFocusModeActive - ? AREA_OPACITY.DEFAULT // normal opacity + ? AREA_OPACITY.default // normal opacity : focusedSeriesName === series.seriesName - ? AREA_OPACITY.FOCUS // hovered - : AREA_OPACITY.MUTE // non-hovered + ? AREA_OPACITY.focus // hovered + : AREA_OPACITY.mute // non-hovered return ( { return placedSeriesArr.map((placedSeries) => { const opacity = !this.isFocusModeActive - ? BORDER_OPACITY.DEFAULT // normal opacity + ? BORDER_OPACITY.default // normal opacity : focusedSeriesName === placedSeries.seriesName - ? BORDER_OPACITY.HOVER // hovered - : BORDER_OPACITY.MUTE // non-hovered + ? BORDER_OPACITY.focus // hovered + : BORDER_OPACITY.mute // non-hovered const strokeWidth = focusedSeriesName === placedSeries.seriesName - ? BORDER_WIDTH.HOVER - : BORDER_WIDTH.DEFAULT + ? BORDER_WIDTH.focus + : BORDER_WIDTH.default return ( ({ - time: row.time, + time: row.originalTime, position: row.entityName, value: row.value, valueOffset: 0, diff --git a/packages/@ourworldindata/grapher/src/tooltip/TooltipContents.tsx b/packages/@ourworldindata/grapher/src/tooltip/TooltipContents.tsx index 3078fd31d53..a3a8b7f0f1d 100644 --- a/packages/@ourworldindata/grapher/src/tooltip/TooltipContents.tsx +++ b/packages/@ourworldindata/grapher/src/tooltip/TooltipContents.tsx @@ -337,8 +337,12 @@ export function IconCircledS({ ) } -export function makeTooltipToleranceNotice(targetYear: string): string { - return `Data not available for ${targetYear}. Showing closest available data point instead` +export function makeTooltipToleranceNotice( + targetYear: string, + { plural }: { plural: boolean } = { plural: false } +): string { + const dataPoint = plural ? "data points" : "data point" + return `Data not available for ${targetYear}. Showing closest available ${dataPoint} instead` } export function makeTooltipRoundingNotice( diff --git a/packages/@ourworldindata/types/src/domainTypes/CoreTableTypes.ts b/packages/@ourworldindata/types/src/domainTypes/CoreTableTypes.ts index 5fa5ba92b00..a44d6d42459 100644 --- a/packages/@ourworldindata/types/src/domainTypes/CoreTableTypes.ts +++ b/packages/@ourworldindata/types/src/domainTypes/CoreTableTypes.ts @@ -300,5 +300,6 @@ export interface OwidVariableRow { entityName: EntityName time: Time value: ValueType + originalTime: Time originalValue?: ValueType } diff --git a/packages/@ourworldindata/types/src/grapherTypes/GrapherTypes.ts b/packages/@ourworldindata/types/src/grapherTypes/GrapherTypes.ts index 1d73e6a6470..8306197da2f 100644 --- a/packages/@ourworldindata/types/src/grapherTypes/GrapherTypes.ts +++ b/packages/@ourworldindata/types/src/grapherTypes/GrapherTypes.ts @@ -208,6 +208,13 @@ export interface AnnotationFieldsInTitle { changeInPrefix?: boolean } +export enum RenderMode { + default = "default", + focus = "focus", // hovered or focused + mute = "mute", // not hovered + background = "background", // not focused +} + export interface Tickmark { value: number priority: number diff --git a/packages/@ourworldindata/types/src/index.ts b/packages/@ourworldindata/types/src/index.ts index 562dd93191d..0f42e50f1ad 100644 --- a/packages/@ourworldindata/types/src/index.ts +++ b/packages/@ourworldindata/types/src/index.ts @@ -113,6 +113,7 @@ export { GrapherWindowType, AxisMinMaxValueStr, GrapherTooltipAnchor, + RenderMode, } from "./grapherTypes/GrapherTypes.js" export { diff --git a/vite.config-site.mts.timestamp-1732528761102-d1ef0b3f0da3.mjs b/vite.config-site.mts.timestamp-1732528761102-d1ef0b3f0da3.mjs new file mode 100644 index 00000000000..1ff6001c7dc --- /dev/null +++ b/vite.config-site.mts.timestamp-1732528761102-d1ef0b3f0da3.mjs @@ -0,0 +1,358 @@ +var __defProp = Object.defineProperty; +var __export = (target, all) => { + for (var name in all) + __defProp(target, name, { get: all[name], enumerable: true }); +}; + +// site/viteUtils.tsx +import React from "file:///Users/sophia/code/owid/owid-grapher/node_modules/react/index.js"; + +// settings/findBaseDir.ts +import path from "path"; +import fs from "fs"; +function findProjectBaseDir(from) { + if (!fs.existsSync) return void 0; + let dir = path.dirname(from); + while (dir.length) { + if (fs.existsSync(path.resolve(dir, "package.json"))) return dir; + const parentDir = path.resolve(dir, ".."); + if (parentDir === dir) break; + else dir = parentDir; + } + return void 0; +} + +// site/viteUtils.tsx +import fs3 from "file:///Users/sophia/code/owid/owid-grapher/node_modules/fs-extra/lib/index.js"; + +// settings/serverSettings.ts +import path2 from "path"; +import dotenv2 from "file:///Users/sophia/code/owid/owid-grapher/node_modules/dotenv/lib/main.js"; +import fs2 from "fs"; +import ini from "file:///Users/sophia/code/owid/owid-grapher/node_modules/ini/lib/ini.js"; +import os from "os"; + +// settings/clientSettings.ts +var clientSettings_exports = {}; +__export(clientSettings_exports, { + ADMIN_BASE_URL: () => ADMIN_BASE_URL, + ADMIN_SERVER_HOST: () => ADMIN_SERVER_HOST, + ADMIN_SERVER_PORT: () => ADMIN_SERVER_PORT, + ALGOLIA_ID: () => ALGOLIA_ID, + ALGOLIA_INDEX_PREFIX: () => ALGOLIA_INDEX_PREFIX, + ALGOLIA_SEARCH_KEY: () => ALGOLIA_SEARCH_KEY, + BAKED_BASE_URL: () => BAKED_BASE_URL, + BAKED_GRAPHER_EXPORTS_BASE_URL: () => BAKED_GRAPHER_EXPORTS_BASE_URL, + BAKED_GRAPHER_URL: () => BAKED_GRAPHER_URL, + BAKED_SITE_EXPORTS_BASE_URL: () => BAKED_SITE_EXPORTS_BASE_URL, + BUGSNAG_API_KEY: () => BUGSNAG_API_KEY, + DATA_API_URL: () => DATA_API_URL, + DONATE_API_URL: () => DONATE_API_URL, + ENV: () => ENV, + ETL_API_URL: () => ETL_API_URL, + ETL_WIZARD_URL: () => ETL_WIZARD_URL, + EXPLORER_DYNAMIC_THUMBNAIL_URL: () => EXPLORER_DYNAMIC_THUMBNAIL_URL, + FEATURE_FLAGS: () => FEATURE_FLAGS, + FeatureFlagFeature: () => FeatureFlagFeature, + GDOCS_BASIC_ARTICLE_TEMPLATE_URL: () => GDOCS_BASIC_ARTICLE_TEMPLATE_URL, + GDOCS_CLIENT_EMAIL: () => GDOCS_CLIENT_EMAIL, + GDOCS_DETAILS_ON_DEMAND_ID: () => GDOCS_DETAILS_ON_DEMAND_ID, + GOOGLE_TAG_MANAGER_ID: () => GOOGLE_TAG_MANAGER_ID, + GRAPHER_DYNAMIC_CONFIG_URL: () => GRAPHER_DYNAMIC_CONFIG_URL, + GRAPHER_DYNAMIC_THUMBNAIL_URL: () => GRAPHER_DYNAMIC_THUMBNAIL_URL, + IMAGE_HOSTING_R2_BUCKET_PATH: () => IMAGE_HOSTING_R2_BUCKET_PATH, + IMAGE_HOSTING_R2_BUCKET_SUBFOLDER_PATH: () => IMAGE_HOSTING_R2_BUCKET_SUBFOLDER_PATH, + IMAGE_HOSTING_R2_CDN_URL: () => IMAGE_HOSTING_R2_CDN_URL, + MULTI_DIM_DYNAMIC_CONFIG_URL: () => MULTI_DIM_DYNAMIC_CONFIG_URL, + PUBLISHED_AT_FORMAT: () => PUBLISHED_AT_FORMAT, + RECAPTCHA_SITE_KEY: () => RECAPTCHA_SITE_KEY, + SENTRY_DSN: () => SENTRY_DSN, + TOPICS_CONTENT_GRAPH: () => TOPICS_CONTENT_GRAPH +}); +import dotenv from "file:///Users/sophia/code/owid/owid-grapher/node_modules/dotenv/lib/main.js"; +import { parseIntOrUndefined } from "file:///Users/sophia/code/owid/owid-grapher/packages/@ourworldindata/utils/dist/index.js"; +var __vite_injected_original_dirname2 = "/Users/sophia/code/owid/owid-grapher/settings"; +if (typeof __vite_injected_original_dirname2 !== "undefined") { + const baseDir2 = findProjectBaseDir(__vite_injected_original_dirname2); + if (baseDir2) dotenv.config({ path: `${baseDir2}/.env` }); +} +var ENV = process.env.ENV === "production" ? "production" : "development"; +var BUGSNAG_API_KEY = process.env.BUGSNAG_API_KEY; +var SENTRY_DSN = process.env.SENTRY_DSN; +var ADMIN_SERVER_PORT = parseIntOrUndefined(process.env.ADMIN_SERVER_PORT) ?? 3030; +var ADMIN_SERVER_HOST = process.env.ADMIN_SERVER_HOST ?? "localhost"; +var BAKED_BASE_URL = process.env.BAKED_BASE_URL ?? `http://${ADMIN_SERVER_HOST}:${ADMIN_SERVER_PORT}`; +var BAKED_GRAPHER_URL = process.env.BAKED_GRAPHER_URL ?? `${BAKED_BASE_URL}/grapher`; +var BAKED_GRAPHER_EXPORTS_BASE_URL = process.env.BAKED_GRAPHER_EXPORTS_BASE_URL ?? `${BAKED_GRAPHER_URL}/exports`; +var BAKED_SITE_EXPORTS_BASE_URL = process.env.BAKED_SITE_EXPORTS_BASE_URL ?? `${BAKED_BASE_URL}/exports`; +var GRAPHER_DYNAMIC_THUMBNAIL_URL = process.env.GRAPHER_DYNAMIC_THUMBNAIL_URL ?? `${BAKED_GRAPHER_URL}`; +var EXPLORER_DYNAMIC_THUMBNAIL_URL = process.env.EXPLORER_DYNAMIC_THUMBNAIL_URL ?? `${BAKED_BASE_URL}/explorers`; +var GRAPHER_DYNAMIC_CONFIG_URL = process.env.GRAPHER_DYNAMIC_CONFIG_URL ?? `${BAKED_GRAPHER_URL}`; +var MULTI_DIM_DYNAMIC_CONFIG_URL = process.env.MULTI_DIM_DYNAMIC_CONFIG_URL ?? `${BAKED_BASE_URL}/multi-dim`; +var ADMIN_BASE_URL = process.env.ADMIN_BASE_URL ?? `http://${ADMIN_SERVER_HOST}:${ADMIN_SERVER_PORT}`; +var DATA_API_URL = process.env.DATA_API_URL ?? "https://api.ourworldindata.org/v1/indicators/"; +var ALGOLIA_ID = process.env.ALGOLIA_ID ?? ""; +var ALGOLIA_SEARCH_KEY = process.env.ALGOLIA_SEARCH_KEY ?? ""; +var ALGOLIA_INDEX_PREFIX = process.env.ALGOLIA_INDEX_PREFIX ?? ""; +var DONATE_API_URL = process.env.DONATE_API_URL ?? "http://localhost:8788/donation/donate"; +var RECAPTCHA_SITE_KEY = process.env.RECAPTCHA_SITE_KEY ?? "6LcJl5YUAAAAAATQ6F4vl9dAWRZeKPBm15MAZj4Q"; +var GOOGLE_TAG_MANAGER_ID = process.env.GOOGLE_TAG_MANAGER_ID ?? ""; +var TOPICS_CONTENT_GRAPH = process.env.TOPICS_CONTENT_GRAPH === "true"; +var GDOCS_CLIENT_EMAIL = process.env.GDOCS_CLIENT_EMAIL ?? ""; +var GDOCS_BASIC_ARTICLE_TEMPLATE_URL = process.env.GDOCS_BASIC_ARTICLE_TEMPLATE_URL ?? ""; +var IMAGE_HOSTING_R2_CDN_URL = process.env.IMAGE_HOSTING_R2_CDN_URL || ""; +var IMAGE_HOSTING_R2_BUCKET_PATH = process.env.IMAGE_HOSTING_R2_BUCKET_PATH || ""; +var IMAGE_HOSTING_R2_BUCKET_SUBFOLDER_PATH = IMAGE_HOSTING_R2_BUCKET_PATH.slice( + IMAGE_HOSTING_R2_BUCKET_PATH.indexOf("/") + 1 +); +var ETL_WIZARD_URL = process.env.ETL_WIZARD_URL ?? `http://${ADMIN_SERVER_HOST}:8053/`; +var ETL_API_URL = process.env.ETL_API_URL ?? `http://${ADMIN_SERVER_HOST}:8081/api/v1`; +var GDOCS_DETAILS_ON_DEMAND_ID = process.env.GDOCS_DETAILS_ON_DEMAND_ID ?? ""; +var PUBLISHED_AT_FORMAT = "ddd, MMM D, YYYY HH:mm"; +var FeatureFlagFeature = /* @__PURE__ */ ((FeatureFlagFeature2) => { + FeatureFlagFeature2["MultiDimDataPage"] = "MultiDimDataPage"; + return FeatureFlagFeature2; +})(FeatureFlagFeature || {}); +var featureFlagsRaw = typeof process.env.FEATURE_FLAGS === "string" && process.env.FEATURE_FLAGS.trim()?.split(",") || []; +var FEATURE_FLAGS = new Set( + Object.keys(FeatureFlagFeature).filter( + (key) => featureFlagsRaw.includes(key) + ) +); + +// settings/serverSettings.ts +import { parseIntOrUndefined as parseIntOrUndefined2 } from "file:///Users/sophia/code/owid/owid-grapher/packages/@ourworldindata/utils/dist/index.js"; +var __vite_injected_original_dirname3 = "/Users/sophia/code/owid/owid-grapher/settings"; +var baseDir = findProjectBaseDir(__vite_injected_original_dirname3); +if (baseDir === void 0) throw new Error("could not locate base package.json"); +dotenv2.config({ path: `${baseDir}/.env` }); +var serverSettings = process.env ?? {}; +var BASE_DIR = baseDir; +var DATA_API_FOR_ADMIN_UI = serverSettings.DATA_API_FOR_ADMIN_UI; +var BAKED_BASE_URL2 = BAKED_BASE_URL; +var VITE_PREVIEW = serverSettings.VITE_PREVIEW === "true"; +var ADMIN_BASE_URL2 = ADMIN_BASE_URL; +var BAKED_GRAPHER_URL2 = serverSettings.BAKED_GRAPHER_URL ?? `${BAKED_BASE_URL2}/grapher`; +var OPTIMIZE_SVG_EXPORTS = serverSettings.OPTIMIZE_SVG_EXPORTS === "true"; +var GITHUB_USERNAME = serverSettings.GITHUB_USERNAME ?? "owid-test"; +var GIT_DEFAULT_USERNAME = serverSettings.GIT_DEFAULT_USERNAME ?? "Our World in Data"; +var GIT_DEFAULT_EMAIL = serverSettings.GIT_DEFAULT_EMAIL ?? "info@ourworldindata.org"; +var BUGSNAG_API_KEY2 = serverSettings.BUGSNAG_API_KEY; +var BUGSNAG_NODE_API_KEY = serverSettings.BUGSNAG_NODE_API_KEY; +var BLOG_POSTS_PER_PAGE = parseIntOrUndefined2(serverSettings.BLOG_POSTS_PER_PAGE) ?? 21; +var BLOG_SLUG = serverSettings.BLOG_SLUG ?? "latest"; +var GRAPHER_DB_NAME = serverSettings.GRAPHER_DB_NAME ?? "owid"; +var GRAPHER_DB_USER = serverSettings.GRAPHER_DB_USER ?? "root"; +var GRAPHER_DB_PASS = serverSettings.GRAPHER_DB_PASS ?? ""; +var GRAPHER_DB_HOST = serverSettings.GRAPHER_DB_HOST ?? "localhost"; +var GRAPHER_DB_PORT = parseIntOrUndefined2(serverSettings.GRAPHER_DB_PORT) ?? 3306; +var GRAPHER_TEST_DB_NAME = serverSettings.GRAPHER_TEST_DB_NAME ?? "owid"; +var GRAPHER_TEST_DB_USER = serverSettings.GRAPHER_TEST_DB_USER ?? "root"; +var GRAPHER_TEST_DB_PASS = serverSettings.GRAPHER_TEST_DB_PASS ?? ""; +var GRAPHER_TEST_DB_HOST = serverSettings.GRAPHER_TEST_DB_HOST ?? "localhost"; +var GRAPHER_TEST_DB_PORT = parseIntOrUndefined2(serverSettings.GRAPHER_TEST_DB_PORT) ?? 3306; +var BAKED_SITE_DIR = serverSettings.BAKED_SITE_DIR ?? path2.resolve(BASE_DIR, "bakedSite"); +var SECRET_KEY = serverSettings.SECRET_KEY ?? "fejwiaof jewiafo jeioa fjieowajf isa fjidosajfgj"; +var SESSION_COOKIE_AGE = parseIntOrUndefined2(serverSettings.SESSION_COOKIE_AGE) ?? 1209600; +var ALGOLIA_SECRET_KEY = serverSettings.ALGOLIA_SECRET_KEY ?? ""; +var ALGOLIA_INDEXING = serverSettings.ALGOLIA_INDEXING === "true"; +var HTTPS_ONLY = serverSettings.HTTPS_ONLY !== "false"; +var GIT_DATASETS_DIR = serverSettings.GIT_DATASETS_DIR ?? `${BASE_DIR}/datasetsExport`; +var TMP_DIR = serverSettings.TMP_DIR ?? "/tmp"; +var UNCATEGORIZED_TAG_ID = parseIntOrUndefined2(serverSettings.UNCATEGORIZED_TAG_ID) ?? 375; +var BAKE_ON_CHANGE = serverSettings.BAKE_ON_CHANGE === "true"; +var DEPLOY_QUEUE_FILE_PATH = serverSettings.DEPLOY_QUEUE_FILE_PATH ?? `${BASE_DIR}/.queue`; +var DEPLOY_PENDING_FILE_PATH = serverSettings.DEPLOY_PENDING_FILE_PATH ?? `${BASE_DIR}/.pending`; +var CLOUDFLARE_AUD = serverSettings.CLOUDFLARE_AUD ?? ""; +var CATALOG_PATH = serverSettings.CATALOG_PATH ?? ""; +var GDOCS_PRIVATE_KEY = (serverSettings.GDOCS_PRIVATE_KEY ?? "").replaceAll('"', "").replaceAll("'", ""); +var GDOCS_CLIENT_ID = serverSettings.GDOCS_CLIENT_ID ?? ""; +var GDOCS_BACKPORTING_TARGET_FOLDER = serverSettings.GDOCS_BACKPORTING_TARGET_FOLDER ?? ""; +var GDOCS_IMAGES_BACKPORTING_TARGET_FOLDER = serverSettings.GDOCS_IMAGES_BACKPORTING_TARGET_FOLDER ?? ""; +var GDOCS_DONATE_FAQS_DOCUMENT_ID = serverSettings.GDOCS_DONATE_FAQS_DOCUMENT_ID ?? "194PNSFjgSlt9Zm5xYuDOF0l_GLKZbVxH2co3zCok_cE"; +var GDOCS_SHARED_DRIVE_ID = serverSettings.GDOCS_SHARED_DRIVE_ID ?? ""; +var GDOCS_DETAILS_ON_DEMAND_ID2 = serverSettings.GDOCS_DETAILS_ON_DEMAND_ID ?? ""; +var rcloneConfig = {}; +var rcloneConfigPath = path2.join(os.homedir(), ".config/rclone/rclone.conf"); +if (fs2.existsSync(rcloneConfigPath)) { + rcloneConfig = ini.parse(fs2.readFileSync(rcloneConfigPath, "utf-8")); +} +var IMAGE_HOSTING_R2_CDN_URL2 = serverSettings.IMAGE_HOSTING_R2_CDN_URL || ""; +var IMAGE_HOSTING_R2_BUCKET_PATH2 = serverSettings.IMAGE_HOSTING_R2_BUCKET_PATH || ""; +var IMAGE_HOSTING_R2_BUCKET_SUBFOLDER_PATH2 = IMAGE_HOSTING_R2_BUCKET_PATH2.slice( + IMAGE_HOSTING_R2_BUCKET_PATH2.indexOf("/") + 1 +); +var R2_ENDPOINT = serverSettings.R2_ENDPOINT || rcloneConfig["owid-r2"]?.endpoint || "https://078fcdfed9955087315dd86792e71a7e.r2.cloudflarestorage.com"; +var R2_ACCESS_KEY_ID = serverSettings.R2_ACCESS_KEY_ID || rcloneConfig["owid-r2"]?.access_key_id || ""; +var R2_SECRET_ACCESS_KEY = serverSettings.R2_SECRET_ACCESS_KEY || rcloneConfig["owid-r2"]?.secret_access_key || ""; +var R2_REGION = serverSettings.R2_REGION || rcloneConfig["owid-r2"]?.region || "auto"; +var GRAPHER_CONFIG_R2_BUCKET = serverSettings.GRAPHER_CONFIG_R2_BUCKET; +var GRAPHER_CONFIG_R2_BUCKET_PATH = serverSettings.GRAPHER_CONFIG_R2_BUCKET_PATH; +var BUILDKITE_API_ACCESS_TOKEN = serverSettings.BUILDKITE_API_ACCESS_TOKEN ?? ""; +var BUILDKITE_DEPLOY_CONTENT_PIPELINE_SLUG = serverSettings.BUILDKITE_DEPLOY_CONTENT_PIPELINE_SLUG || "owid-deploy-content-master"; +var BUILDKITE_BRANCH = serverSettings.BUILDKITE_BRANCH || "master"; +var BUILDKITE_DEPLOY_CONTENT_SLACK_CHANNEL = serverSettings.BUILDKITE_DEPLOY_CONTENT_SLACK_CHANNEL || "C06EWA0DK4H"; +var OPENAI_API_KEY = serverSettings.OPENAI_API_KEY ?? ""; +var SLACK_BOT_OAUTH_TOKEN = serverSettings.SLACK_BOT_OAUTH_TOKEN ?? ""; +var LEGACY_WORDPRESS_IMAGE_URL = serverSettings.LEGACY_WORDPRESS_IMAGE_URL ?? "https://assets.ourworldindata.org/uploads"; +var ENV_IS_STAGING = ADMIN_BASE_URL2.includes( + "http://staging-site" +); + +// site/SiteConstants.ts +import { faRss } from "file:///Users/sophia/code/owid/owid-grapher/node_modules/@fortawesome/free-solid-svg-icons/index.mjs"; +import { + faXTwitter, + faFacebookSquare, + faInstagram, + faThreads, + faLinkedin, + faBluesky +} from "file:///Users/sophia/code/owid/owid-grapher/node_modules/@fortawesome/free-brands-svg-icons/index.mjs"; +var polyfillFeatures = [ + "es2019", + // Array.flat, Array.flatMap, Object.fromEntries, ... + "es2020", + // String.matchAll, Promise.allSettled, ... + "es2021", + // String.replaceAll, Promise.any, ... + "es2022", + // Array.at, String.at, ... + "es2023", + // Array.findLast, Array.toReversed, Array.toSorted, Array.with, ... + "IntersectionObserver", + "IntersectionObserverEntry", + "ResizeObserver", + "globalThis" + // some dependencies use this +]; +var POLYFILL_VERSION = "4.8.0"; +var POLYFILL_URL = `https://cdnjs.cloudflare.com/polyfill/v3/polyfill.min.js?version=${POLYFILL_VERSION}&features=${polyfillFeatures.join( + "," +)}`; +var DATA_INSIGHTS_ATOM_FEED_NAME = "atom-data-insights.xml"; +var DATA_INSIGHT_ATOM_FEED_PROPS = { + title: "Atom feed for Daily Data Insights", + href: `https://ourworldindata.org/${DATA_INSIGHTS_ATOM_FEED_NAME}` +}; +var RSS_FEEDS = [ + { + title: "Research & Writing RSS Feed", + url: "/atom.xml", + icon: faRss + }, + { + title: "Daily Data Insights RSS Feed", + url: `/${DATA_INSIGHTS_ATOM_FEED_NAME}`, + icon: faRss + } +]; + +// site/viteUtils.tsx +import { sortBy } from "file:///Users/sophia/code/owid/owid-grapher/packages/@ourworldindata/utils/dist/index.js"; +import urljoin from "file:///Users/sophia/code/owid/owid-grapher/node_modules/url-join/lib/url-join.js"; +var VITE_DEV_URL = process.env.VITE_DEV_URL ?? "http://localhost:8090"; +var VITE_ASSET_SITE_ENTRY = "site/owid.entry.ts"; +var VITE_ASSET_ADMIN_ENTRY = "adminSiteClient/admin.entry.ts"; +var VITE_ENTRYPOINT_INFO = { + ["site" /* Site */]: { + entryPointFile: VITE_ASSET_SITE_ENTRY, + outDir: "assets", + outName: "owid" + }, + ["admin" /* Admin */]: { + entryPointFile: VITE_ASSET_ADMIN_ENTRY, + outDir: "assets-admin", + outName: "admin" + } +}; + +// vite.config-common.mts +import { defineConfig } from "file:///Users/sophia/code/owid/owid-grapher/node_modules/vite/dist/node/index.js"; +import pluginReact from "file:///Users/sophia/code/owid/owid-grapher/node_modules/@vitejs/plugin-react/dist/index.mjs"; +import pluginChecker from "file:///Users/sophia/code/owid/owid-grapher/node_modules/vite-plugin-checker/dist/esm/main.js"; +var defineViteConfigForEntrypoint = (entrypoint) => { + const entrypointInfo = VITE_ENTRYPOINT_INFO[entrypoint]; + return defineConfig({ + publicDir: false, + // don't copy public folder to dist + resolve: { + // prettier-ignore + alias: { + "@ourworldindata/grapher/src": "@ourworldindata/grapher/src", + // need this for imports of @ourworldindata/grapher/src/core/grapher.scss to work + // we alias to the packages source files in dev and prod: + // this means we get instant dev updates when we change one of them, + // and the prod build builds them all as esm modules, which helps with tree shaking + // Idea from https://github.com/LinusBorg/vue-lib-template/blob/3775e49b20a7c3349dd49321cad2ed7f9d575057/packages/playground/vite.config.ts + "@ourworldindata/components": "@ourworldindata/components/src/index.ts", + "@ourworldindata/core-table": "@ourworldindata/core-table/src/index.ts", + "@ourworldindata/explorer": "@ourworldindata/explorer/src/index.ts", + "@ourworldindata/grapher": "@ourworldindata/grapher/src/index.ts", + "@ourworldindata/types": "@ourworldindata/types/src/index.ts", + "@ourworldindata/utils": "@ourworldindata/utils/src/index.ts" + } + }, + css: { + devSourcemap: true + }, + define: { + // Replace all clientSettings with their respective values, i.e. assign e.g. BUGSNAG_API_KEY to process.env.BUGSNAG_API_KEY + // it's important to note that we only expose values that are present in the clientSettings file - not any other things that are stored in .env + ...Object.fromEntries( + Object.entries(clientSettings_exports).map(([key, value]) => [ + `process.env.${key}`, + JSON.stringify(value) + ]) + ) + }, + build: { + manifest: true, + // creates a manifest.json file, which we use to determine which files to load in prod + emptyOutDir: true, + outDir: `dist/${entrypointInfo.outDir}`, + sourcemap: true, + target: ["chrome66", "firefox78", "safari12"], + // see docs/browser-support.md + rollupOptions: { + input: { + [entrypointInfo.outName]: entrypointInfo.entryPointFile + }, + output: { + assetFileNames: `${entrypointInfo.outName}.css`, + entryFileNames: `${entrypointInfo.outName}.mjs` + } + } + }, + plugins: [ + pluginReact({ + babel: { + parserOpts: { + plugins: ["decorators-legacy"] + // needed so mobx decorators work correctly + } + } + }), + pluginChecker({ + typescript: { + buildMode: true, + tsconfigPath: "tsconfig.vite-checker.json" + } + }) + ], + server: { + port: 8090, + warmup: { clientFiles: [VITE_ASSET_SITE_ENTRY] } + }, + preview: { + port: 8090 + } + }); +}; + +// vite.config-site.mts +var vite_config_site_default = defineViteConfigForEntrypoint("site" /* Site */); +export { + vite_config_site_default as default +}; +//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["site/viteUtils.tsx", "settings/findBaseDir.ts", "settings/serverSettings.ts", "settings/clientSettings.ts", "site/SiteConstants.ts", "vite.config-common.mts", "vite.config-site.mts"],
  "sourcesContent": ["import React from \"react\"\nimport findBaseDir from \"../settings/findBaseDir.js\"\nimport fs from \"fs-extra\"\nimport {\n    ENV,\n    BAKED_BASE_URL,\n    VITE_PREVIEW,\n} from \"../settings/serverSettings.js\"\nimport { POLYFILL_URL } from \"./SiteConstants.js\"\nimport type { Manifest, ManifestChunk } from \"vite\"\nimport { sortBy } from \"@ourworldindata/utils\"\nimport urljoin from \"url-join\"\n\nconst VITE_DEV_URL = process.env.VITE_DEV_URL ?? \"http://localhost:8090\"\n\nexport const VITE_ASSET_SITE_ENTRY = \"site/owid.entry.ts\"\nexport const VITE_ASSET_ADMIN_ENTRY = \"adminSiteClient/admin.entry.ts\"\n\nexport enum ViteEntryPoint {\n    Site = \"site\",\n    Admin = \"admin\",\n}\n\nexport const VITE_ENTRYPOINT_INFO = {\n    [ViteEntryPoint.Site]: {\n        entryPointFile: VITE_ASSET_SITE_ENTRY,\n        outDir: \"assets\",\n        outName: \"owid\",\n    },\n    [ViteEntryPoint.Admin]: {\n        entryPointFile: VITE_ASSET_ADMIN_ENTRY,\n        outDir: \"assets-admin\",\n        outName: \"admin\",\n    },\n}\n\n// We ALWAYS load polyfills.\n\nconst polyfillScript = <script key=\"polyfill\" src={POLYFILL_URL} />\nconst polyfillPreload = (\n    <link\n        key=\"polyfill-preload\"\n        rel=\"preload\"\n        href={POLYFILL_URL}\n        as=\"script\"\n        // Cloudflare's Early Hints generation for this URL fumbles the `&amp;` contained in this link; so we disable this for \"Early Hints\" for now.\n        // See https://github.com/cloudflare/workers-sdk/issues/6527\n        // Cloudflare disables Early Hints generation for any <link> that doesn't just contain `rel`, `href`, `as` - so the actual name of this\n        // attr doesn't actually matter.\n        data-cloudflare-disable-early-hints\n    />\n)\n\ninterface Assets {\n    forHeader: React.ReactElement[]\n    forFooter: React.ReactElement[]\n}\n\n// in dev: we need to load several vite core scripts and plugins; other than that we only need to load the entry point, and vite will take care of the rest.\nconst devAssets = (entrypoint: ViteEntryPoint, baseUrl: string): Assets => {\n    return {\n        forHeader: [polyfillPreload],\n        forFooter: [\n            polyfillScript,\n            <script\n                key=\"vite-react-preamble\" // https://vitejs.dev/guide/backend-integration.html\n                type=\"module\"\n                dangerouslySetInnerHTML={{\n                    __html: `import RefreshRuntime from '${baseUrl}/@react-refresh'\n  RefreshRuntime.injectIntoGlobalHook(window)\n  window.$RefreshReg$ = () => {}\n  window.$RefreshSig$ = () => (type) => type\n  window.__vite_plugin_react_preamble_installed__ = true`,\n                }}\n            />,\n            <script\n                key=\"vite-plugin-checker\"\n                type=\"module\"\n                src={`${baseUrl}/@vite-plugin-checker-runtime-entry`}\n            />,\n            <script\n                key=\"vite-client\"\n                type=\"module\"\n                src={`${baseUrl}/@vite/client`}\n            />,\n            <script\n                key={entrypoint}\n                type=\"module\"\n                src={`${baseUrl}/${VITE_ENTRYPOINT_INFO[entrypoint].entryPointFile}`}\n            />,\n        ],\n    }\n}\n\n// Goes through the manifest.json files that vite creates, finds all the assets that are required for the given entry point,\n// and creates the appropriate <link> and <script> tags for them.\nexport const createTagsForManifestEntry = (\n    manifest: Manifest,\n    entry: string,\n    assetBaseUrl: string\n): Assets => {\n    const createTags = (entry: string): React.ReactElement[] => {\n        const manifestEntry =\n            Object.values(manifest).find((e) => e.file === entry) ??\n            (manifest[entry] as ManifestChunk | undefined)\n        let assets = [] as React.ReactElement[]\n\n        if (!manifestEntry && !entry.endsWith(\".css\"))\n            throw new Error(`Could not find manifest entry for ${entry}`)\n\n        const assetUrl = urljoin(assetBaseUrl, manifestEntry?.file ?? entry)\n\n        if (entry.endsWith(\".css\")) {\n            assets = [\n                ...assets,\n                <link\n                    key={`${entry}-preload`}\n                    rel=\"preload\"\n                    href={assetUrl}\n                    as=\"style\"\n                />,\n                <link key={entry} rel=\"stylesheet\" href={assetUrl} />,\n            ]\n        } else if (entry.match(/\\.[cm]?(js|jsx|ts|tsx)$/)) {\n            // explicitly reference the entry; preload it and its dependencies\n            if (manifestEntry?.isEntry) {\n                assets = [\n                    ...assets,\n                    <script\n                        key={entry}\n                        type=\"module\"\n                        src={assetUrl}\n                        data-attach-owid-error-handler\n                    />,\n                ]\n            }\n\n            assets = [\n                ...assets,\n                <link\n                    key={`${entry}-preload`}\n                    rel=\"modulepreload\" // see https://developer.chrome.com/blog/modulepreload/\n                    href={assetUrl}\n                />,\n            ]\n        }\n\n        // we need to recurse into both the module imports and imported css files, and add tags for them as well\n        // also, we need to take care of the order here, so the imported file is loaded before the importing file\n        if (manifestEntry?.css) {\n            assets = [...manifestEntry.css.flatMap(createTags), ...assets]\n        }\n        if (manifestEntry?.imports) {\n            assets = [...manifestEntry.imports.flatMap(createTags), ...assets]\n        }\n        return assets\n    }\n\n    const assets = createTags(entry)\n    return {\n        forHeader: assets.filter((el) => el.type === \"link\"),\n        forFooter: assets.filter((el) => el.type === \"script\"),\n    }\n}\n\n// in prod: we need to make sure that we include <script> and <link> tags that are required for the entry point.\n// this could be, for example: owid.mjs, common.mjs, owid.css, common.css. (plus Google Fonts and polyfills)\nconst prodAssets = (entrypoint: ViteEntryPoint, baseUrl: string): Assets => {\n    const baseDir = findBaseDir(__dirname)\n    const entrypointInfo = VITE_ENTRYPOINT_INFO[entrypoint]\n    const manifestPath = `${baseDir}/dist/${entrypointInfo.outDir}/.vite/manifest.json`\n    let manifest\n    try {\n        manifest = fs.readJsonSync(manifestPath) as Manifest\n    } catch (err) {\n        throw new Error(\n            `Could not read the build manifest ('${manifestPath}'), which is required for production.\n            If you're running in VITE_PREVIEW mode, wait for the build to finish and then reload this page.`,\n            { cause: err }\n        )\n    }\n\n    const assetBaseUrl = `${baseUrl}/${entrypointInfo.outDir}/`\n    const assets = createTagsForManifestEntry(\n        manifest,\n        entrypointInfo.entryPointFile,\n        assetBaseUrl\n    )\n\n    return {\n        // sort for some kind of consistency: first modulepreload, then preload, then stylesheet\n        forHeader: sortBy([polyfillPreload, ...assets.forHeader], \"props.rel\"),\n        forFooter: [polyfillScript, ...assets.forFooter],\n    }\n}\n\nconst useProductionAssets = ENV === \"production\" || VITE_PREVIEW\n\nconst viteAssets = (entrypoint: ViteEntryPoint, prodBaseUrl?: string) =>\n    useProductionAssets\n        ? prodAssets(entrypoint, prodBaseUrl ?? \"\")\n        : devAssets(entrypoint, VITE_DEV_URL)\n\nexport const viteAssetsForAdmin = () => viteAssets(ViteEntryPoint.Admin)\nexport const viteAssetsForSite = () => viteAssets(ViteEntryPoint.Site)\n\nexport const generateEmbedSnippet = () => {\n    // Make sure we're using an absolute URL here, since we don't know in what context the embed snippet is used.\n    const assets = viteAssets(ViteEntryPoint.Site, BAKED_BASE_URL)\n\n    const serializedAssets = [...assets.forHeader, ...assets.forFooter].map(\n        (el) => ({\n            tag: el.type,\n            props: el.props,\n        })\n    )\n\n    const scriptCount = serializedAssets.filter(\n        (asset) =>\n            asset.tag === \"script\" && !asset.props.dangerouslySetInnerHTML // onload doesn't fire on inline scripts, so need to handle that separately\n    ).length\n\n    return `\nconst assets = ${JSON.stringify(serializedAssets, undefined, 2)};\nlet loadedScripts = 0;\n\nconst onLoad = () => {\n    loadedScripts++;\n    if (loadedScripts === ${scriptCount}) {\n        window.MultiEmbedderSingleton.embedAll();\n    }\n}\n\nfor (const asset of assets) {\n    const el = document.createElement(asset.tag);\n    for (const [key, value] of Object.entries(asset.props)) {\n        el.setAttribute(key, value);\n    }\n    if (asset.props && asset.props.dangerouslySetInnerHTML) {\n        el.text = asset.props.dangerouslySetInnerHTML.__html\n    } else if (asset.tag === \"script\") {\n        el.onload = onLoad;\n    }\n    document.head.appendChild(el);\n}`\n}\n", "const __vite_injected_original_dirname = \"/Users/sophia/code/owid/owid-grapher/settings\";const __vite_injected_original_filename = \"/Users/sophia/code/owid/owid-grapher/settings/findBaseDir.ts\";const __vite_injected_original_import_meta_url = \"file:///Users/sophia/code/owid/owid-grapher/settings/findBaseDir.ts\";import path from \"path\"\nimport fs from \"fs\"\n\n/**\n * With our code residing either in some src folder or in the `itsJustJavascript` folder, it's not\n * always straightforward to know where to find a config file like `.env`.\n * Here, we just traverse the directory tree upwards until we find a `package.json` file, which\n * should indicate that we have found the root directory of the `owid-grapher` repo.\n */\nexport default function findProjectBaseDir(from: string): string | undefined {\n    if (!fs.existsSync) return undefined // if fs.existsSync doesn't exist, we're probably running in the browser\n\n    let dir = path.dirname(from)\n\n    while (dir.length) {\n        if (fs.existsSync(path.resolve(dir, \"package.json\"))) return dir\n\n        const parentDir = path.resolve(dir, \"..\")\n        // break if we have reached the file system root\n        if (parentDir === dir) break\n        else dir = parentDir\n    }\n\n    return undefined\n}\n", "const __vite_injected_original_dirname = \"/Users/sophia/code/owid/owid-grapher/settings\";const __vite_injected_original_filename = \"/Users/sophia/code/owid/owid-grapher/settings/serverSettings.ts\";const __vite_injected_original_import_meta_url = \"file:///Users/sophia/code/owid/owid-grapher/settings/serverSettings.ts\";// This is where server-side only, potentially sensitive settings enter from the environment\n// DO NOT store sensitive strings in this file itself, as it is checked in to git!\n\nimport path from \"path\"\nimport dotenv from \"dotenv\"\nimport findBaseDir from \"./findBaseDir.js\"\nimport fs from \"fs\"\nimport ini from \"ini\"\nimport os from \"os\"\n\nconst baseDir = findBaseDir(__dirname)\nif (baseDir === undefined) throw new Error(\"could not locate base package.json\")\n\ndotenv.config({ path: `${baseDir}/.env` })\n\nimport * as clientSettings from \"./clientSettings.js\"\nimport { parseIntOrUndefined } from \"@ourworldindata/utils\"\n\nconst serverSettings = process.env ?? {}\n\nexport const BASE_DIR: string = baseDir\nexport const ENV: \"development\" | \"production\" = clientSettings.ENV\n\nexport const ADMIN_SERVER_PORT: number = clientSettings.ADMIN_SERVER_PORT\nexport const ADMIN_SERVER_HOST: string = clientSettings.ADMIN_SERVER_HOST\nexport const DATA_API_FOR_ADMIN_UI: string | undefined =\n    serverSettings.DATA_API_FOR_ADMIN_UI\nexport const BAKED_BASE_URL: string = clientSettings.BAKED_BASE_URL\n\nexport const VITE_PREVIEW: boolean = serverSettings.VITE_PREVIEW === \"true\"\n\nexport const ADMIN_BASE_URL: string = clientSettings.ADMIN_BASE_URL\n\nexport const BAKED_GRAPHER_URL: string =\n    serverSettings.BAKED_GRAPHER_URL ?? `${BAKED_BASE_URL}/grapher`\n\nexport const OPTIMIZE_SVG_EXPORTS: boolean =\n    serverSettings.OPTIMIZE_SVG_EXPORTS === \"true\"\n\nexport const GITHUB_USERNAME: string =\n    serverSettings.GITHUB_USERNAME ?? \"owid-test\"\nexport const GIT_DEFAULT_USERNAME: string =\n    serverSettings.GIT_DEFAULT_USERNAME ?? \"Our World in Data\"\nexport const GIT_DEFAULT_EMAIL: string =\n    serverSettings.GIT_DEFAULT_EMAIL ?? \"info@ourworldindata.org\"\n\nexport const BUGSNAG_API_KEY: string | undefined =\n    serverSettings.BUGSNAG_API_KEY\nexport const BUGSNAG_NODE_API_KEY: string | undefined =\n    serverSettings.BUGSNAG_NODE_API_KEY\n\nexport const BLOG_POSTS_PER_PAGE: number =\n    parseIntOrUndefined(serverSettings.BLOG_POSTS_PER_PAGE) ?? 21\nexport const BLOG_SLUG: string = serverSettings.BLOG_SLUG ?? \"latest\"\n\nexport const GRAPHER_DB_NAME: string = serverSettings.GRAPHER_DB_NAME ?? \"owid\"\nexport const GRAPHER_DB_USER: string = serverSettings.GRAPHER_DB_USER ?? \"root\"\nexport const GRAPHER_DB_PASS: string = serverSettings.GRAPHER_DB_PASS ?? \"\"\nexport const GRAPHER_DB_HOST: string =\n    serverSettings.GRAPHER_DB_HOST ?? \"localhost\"\n// The OWID stack uses 3307, but incase it's unset, assume user is running a local setup\nexport const GRAPHER_DB_PORT: number =\n    parseIntOrUndefined(serverSettings.GRAPHER_DB_PORT) ?? 3306\n\nexport const GRAPHER_TEST_DB_NAME: string =\n    serverSettings.GRAPHER_TEST_DB_NAME ?? \"owid\"\nexport const GRAPHER_TEST_DB_USER: string =\n    serverSettings.GRAPHER_TEST_DB_USER ?? \"root\"\nexport const GRAPHER_TEST_DB_PASS: string =\n    serverSettings.GRAPHER_TEST_DB_PASS ?? \"\"\nexport const GRAPHER_TEST_DB_HOST: string =\n    serverSettings.GRAPHER_TEST_DB_HOST ?? \"localhost\"\n// The OWID stack uses 3307, but incase it's unset, assume user is running a local setup\nexport const GRAPHER_TEST_DB_PORT: number =\n    parseIntOrUndefined(serverSettings.GRAPHER_TEST_DB_PORT) ?? 3306\n\nexport const BAKED_SITE_DIR: string =\n    serverSettings.BAKED_SITE_DIR ?? path.resolve(BASE_DIR, \"bakedSite\") // Where the static build output goes\nexport const SECRET_KEY: string =\n    serverSettings.SECRET_KEY ??\n    \"fejwiaof jewiafo jeioa fjieowajf isa fjidosajfgj\"\nexport const SESSION_COOKIE_AGE: number =\n    parseIntOrUndefined(serverSettings.SESSION_COOKIE_AGE) ?? 1209600\nexport const ALGOLIA_SECRET_KEY: string =\n    serverSettings.ALGOLIA_SECRET_KEY ?? \"\"\nexport const ALGOLIA_INDEXING: boolean =\n    serverSettings.ALGOLIA_INDEXING === \"true\"\n\n// Wordpress target setting\nexport const HTTPS_ONLY: boolean = serverSettings.HTTPS_ONLY !== \"false\"\n\nexport const GIT_DATASETS_DIR: string =\n    serverSettings.GIT_DATASETS_DIR ?? `${BASE_DIR}/datasetsExport` //  Where the git exports go\nexport const TMP_DIR: string = serverSettings.TMP_DIR ?? \"/tmp\"\nexport const UNCATEGORIZED_TAG_ID: number =\n    parseIntOrUndefined(serverSettings.UNCATEGORIZED_TAG_ID) ?? 375\n\n// Should the static site output be baked when relevant database items change\nexport const BAKE_ON_CHANGE: boolean = serverSettings.BAKE_ON_CHANGE === \"true\"\nexport const DEPLOY_QUEUE_FILE_PATH: string =\n    serverSettings.DEPLOY_QUEUE_FILE_PATH ?? `${BASE_DIR}/.queue`\nexport const DEPLOY_PENDING_FILE_PATH: string =\n    serverSettings.DEPLOY_PENDING_FILE_PATH ?? `${BASE_DIR}/.pending`\nexport const CLOUDFLARE_AUD: string = serverSettings.CLOUDFLARE_AUD ?? \"\"\n\n// Either remote catalog `https://owid-catalog.nyc3.digitaloceanspaces.com/` or local catalog `.../etl/data/`\n// Note that Cloudflare proxy on `https://catalog.ourworldindata.org` does not support range requests yet\n// It is empty (turned off) by default for now, in the future it should be\n// `https://owid-catalog.nyc3.digitaloceanspaces.com/` by default\nexport const CATALOG_PATH: string = serverSettings.CATALOG_PATH ?? \"\"\n\n// make and bash handle spaces in env variables differently.\n// no quotes - wait-for-mysql.sh will break: \"PRIVATE: command not found\"\n// quotes - wait-for-mysql.sh will work, but the variable will be double-quoted in node: '\"-----BEGIN PRIVATE etc...\"'\n// escaped spaces - wait-for-mysql.sh will work, but the backslashes will exist in node: \"-----BEGIN\\ PRIVATE\\ etc...\"\nexport const GDOCS_PRIVATE_KEY: string = (\n    serverSettings.GDOCS_PRIVATE_KEY ?? \"\"\n)\n    .replaceAll('\"', \"\")\n    .replaceAll(\"'\", \"\")\nexport const GDOCS_CLIENT_EMAIL: string = clientSettings.GDOCS_CLIENT_EMAIL\nexport const GDOCS_CLIENT_ID: string = serverSettings.GDOCS_CLIENT_ID ?? \"\"\nexport const GDOCS_BACKPORTING_TARGET_FOLDER: string =\n    serverSettings.GDOCS_BACKPORTING_TARGET_FOLDER ?? \"\"\n\nexport const GDOCS_IMAGES_BACKPORTING_TARGET_FOLDER: string =\n    serverSettings.GDOCS_IMAGES_BACKPORTING_TARGET_FOLDER ?? \"\"\n\nexport const GDOCS_DONATE_FAQS_DOCUMENT_ID: string =\n    serverSettings.GDOCS_DONATE_FAQS_DOCUMENT_ID ??\n    \"194PNSFjgSlt9Zm5xYuDOF0l_GLKZbVxH2co3zCok_cE\"\n\nexport const GDOCS_SHARED_DRIVE_ID = serverSettings.GDOCS_SHARED_DRIVE_ID ?? \"\"\n\nexport const GDOCS_DETAILS_ON_DEMAND_ID =\n    serverSettings.GDOCS_DETAILS_ON_DEMAND_ID ?? \"\"\n\n// Load R2 credentials from rclone config\nlet rcloneConfig: any = {}\nconst rcloneConfigPath = path.join(os.homedir(), \".config/rclone/rclone.conf\")\nif (fs.existsSync(rcloneConfigPath)) {\n    rcloneConfig = ini.parse(fs.readFileSync(rcloneConfigPath, \"utf-8\"))\n}\n\n// e.g. https://images-staging.owid.io/\nexport const IMAGE_HOSTING_R2_CDN_URL: string =\n    serverSettings.IMAGE_HOSTING_R2_CDN_URL || \"\"\n// e.g. owid-image-hosting-staging/development\nexport const IMAGE_HOSTING_R2_BUCKET_PATH: string =\n    serverSettings.IMAGE_HOSTING_R2_BUCKET_PATH || \"\"\n// e.g. development\nexport const IMAGE_HOSTING_R2_BUCKET_SUBFOLDER_PATH: string =\n    IMAGE_HOSTING_R2_BUCKET_PATH.slice(\n        IMAGE_HOSTING_R2_BUCKET_PATH.indexOf(\"/\") + 1\n    )\n// extract R2 credentials from rclone config as defaults\nexport const R2_ENDPOINT: string =\n    serverSettings.R2_ENDPOINT ||\n    rcloneConfig[\"owid-r2\"]?.endpoint ||\n    \"https://078fcdfed9955087315dd86792e71a7e.r2.cloudflarestorage.com\"\nexport const R2_ACCESS_KEY_ID: string =\n    serverSettings.R2_ACCESS_KEY_ID ||\n    rcloneConfig[\"owid-r2\"]?.access_key_id ||\n    \"\"\nexport const R2_SECRET_ACCESS_KEY: string =\n    serverSettings.R2_SECRET_ACCESS_KEY ||\n    rcloneConfig[\"owid-r2\"]?.secret_access_key ||\n    \"\"\nexport const R2_REGION: string =\n    serverSettings.R2_REGION || rcloneConfig[\"owid-r2\"]?.region || \"auto\"\n\nexport const GRAPHER_CONFIG_R2_BUCKET: string | undefined =\n    serverSettings.GRAPHER_CONFIG_R2_BUCKET\nexport const GRAPHER_CONFIG_R2_BUCKET_PATH: string | undefined =\n    serverSettings.GRAPHER_CONFIG_R2_BUCKET_PATH\n\nexport const DATA_API_URL: string = clientSettings.DATA_API_URL\n\nexport const FEATURE_FLAGS = clientSettings.FEATURE_FLAGS\n\nexport const BUILDKITE_API_ACCESS_TOKEN: string =\n    serverSettings.BUILDKITE_API_ACCESS_TOKEN ?? \"\"\nexport const BUILDKITE_DEPLOY_CONTENT_PIPELINE_SLUG: string =\n    serverSettings.BUILDKITE_DEPLOY_CONTENT_PIPELINE_SLUG ||\n    \"owid-deploy-content-master\"\nexport const BUILDKITE_BRANCH: string =\n    serverSettings.BUILDKITE_BRANCH || \"master\"\nexport const BUILDKITE_DEPLOY_CONTENT_SLACK_CHANNEL: string =\n    serverSettings.BUILDKITE_DEPLOY_CONTENT_SLACK_CHANNEL || \"C06EWA0DK4H\" // #content-updates\n\nexport const OPENAI_API_KEY: string = serverSettings.OPENAI_API_KEY ?? \"\"\n\nexport const SLACK_BOT_OAUTH_TOKEN: string =\n    serverSettings.SLACK_BOT_OAUTH_TOKEN ?? \"\"\n\nexport const LEGACY_WORDPRESS_IMAGE_URL: string =\n    serverSettings.LEGACY_WORDPRESS_IMAGE_URL ??\n    \"https://assets.ourworldindata.org/uploads\"\n\n// search evaluation\nexport const SEARCH_EVAL_URL: string =\n    \"https://pub-ec761fe0df554b02bc605610f3296000.r2.dev\"\n\n// We currently use ENV=production on staging servers, it'd be better to have ENV=staging\n// but that would require changing a lot of code\nexport const ENV_IS_STAGING: boolean = ADMIN_BASE_URL.includes(\n    \"http://staging-site\"\n)\n", "const __vite_injected_original_dirname = \"/Users/sophia/code/owid/owid-grapher/settings\";const __vite_injected_original_filename = \"/Users/sophia/code/owid/owid-grapher/settings/clientSettings.ts\";const __vite_injected_original_import_meta_url = \"file:///Users/sophia/code/owid/owid-grapher/settings/clientSettings.ts\";// All of this information is available to the client-side code\n// DO NOT retrieve sensitive information from the environment in here! :O\n// Settings in here will be made available to the client-side code that is\n// bundled and shipped out to our users.\n\nimport dotenv from \"dotenv\"\nimport findBaseDir from \"./findBaseDir.js\"\n\nif (typeof __dirname !== \"undefined\") {\n    // only run this code in node, not in the browser.\n    // in the browser, process.env is already populated by vite.\n    const baseDir = findBaseDir(__dirname)\n    if (baseDir) dotenv.config({ path: `${baseDir}/.env` })\n}\n\nimport { parseIntOrUndefined } from \"@ourworldindata/utils\"\n\nexport const ENV: \"development\" | \"production\" =\n    process.env.ENV === \"production\" ? \"production\" : \"development\"\n\nexport const BUGSNAG_API_KEY: string | undefined = process.env.BUGSNAG_API_KEY\nexport const SENTRY_DSN: string | undefined = process.env.SENTRY_DSN\nexport const ADMIN_SERVER_PORT: number =\n    parseIntOrUndefined(process.env.ADMIN_SERVER_PORT) ?? 3030\nexport const ADMIN_SERVER_HOST: string =\n    process.env.ADMIN_SERVER_HOST ?? \"localhost\"\nexport const BAKED_BASE_URL: string =\n    process.env.BAKED_BASE_URL ??\n    `http://${ADMIN_SERVER_HOST}:${ADMIN_SERVER_PORT}`\n\nexport const BAKED_GRAPHER_URL: string =\n    process.env.BAKED_GRAPHER_URL ?? `${BAKED_BASE_URL}/grapher`\nexport const BAKED_GRAPHER_EXPORTS_BASE_URL: string =\n    process.env.BAKED_GRAPHER_EXPORTS_BASE_URL ?? `${BAKED_GRAPHER_URL}/exports`\nexport const BAKED_SITE_EXPORTS_BASE_URL: string =\n    process.env.BAKED_SITE_EXPORTS_BASE_URL ?? `${BAKED_BASE_URL}/exports`\n\nexport const GRAPHER_DYNAMIC_THUMBNAIL_URL: string =\n    process.env.GRAPHER_DYNAMIC_THUMBNAIL_URL ?? `${BAKED_GRAPHER_URL}`\n\nexport const EXPLORER_DYNAMIC_THUMBNAIL_URL: string =\n    process.env.EXPLORER_DYNAMIC_THUMBNAIL_URL ?? `${BAKED_BASE_URL}/explorers`\n\nexport const GRAPHER_DYNAMIC_CONFIG_URL: string =\n    process.env.GRAPHER_DYNAMIC_CONFIG_URL ?? `${BAKED_GRAPHER_URL}`\n\nexport const MULTI_DIM_DYNAMIC_CONFIG_URL: string =\n    process.env.MULTI_DIM_DYNAMIC_CONFIG_URL ?? `${BAKED_BASE_URL}/multi-dim`\n\nexport const ADMIN_BASE_URL: string =\n    process.env.ADMIN_BASE_URL ??\n    `http://${ADMIN_SERVER_HOST}:${ADMIN_SERVER_PORT}`\n// e.g. \"https://api.ourworldindata.org/v1/indicators/\" or \"https://api-staging.owid.io/user/v1/indicators/\"\nexport const DATA_API_URL: string =\n    process.env.DATA_API_URL ?? \"https://api.ourworldindata.org/v1/indicators/\"\n\nexport const ALGOLIA_ID: string = process.env.ALGOLIA_ID ?? \"\"\nexport const ALGOLIA_SEARCH_KEY: string = process.env.ALGOLIA_SEARCH_KEY ?? \"\"\nexport const ALGOLIA_INDEX_PREFIX: string =\n    process.env.ALGOLIA_INDEX_PREFIX ?? \"\"\n\nexport const DONATE_API_URL: string =\n    process.env.DONATE_API_URL ?? \"http://localhost:8788/donation/donate\"\n\nexport const RECAPTCHA_SITE_KEY: string =\n    process.env.RECAPTCHA_SITE_KEY ?? \"6LcJl5YUAAAAAATQ6F4vl9dAWRZeKPBm15MAZj4Q\"\n\n// e.g. \"GTM-N2D4V8S\" (our production GTM container)\nexport const GOOGLE_TAG_MANAGER_ID: string =\n    process.env.GOOGLE_TAG_MANAGER_ID ?? \"\"\n\nexport const TOPICS_CONTENT_GRAPH: boolean =\n    process.env.TOPICS_CONTENT_GRAPH === \"true\"\n\nexport const GDOCS_CLIENT_EMAIL: string = process.env.GDOCS_CLIENT_EMAIL ?? \"\"\nexport const GDOCS_BASIC_ARTICLE_TEMPLATE_URL: string =\n    process.env.GDOCS_BASIC_ARTICLE_TEMPLATE_URL ?? \"\"\n\nexport const IMAGE_HOSTING_R2_CDN_URL: string =\n    process.env.IMAGE_HOSTING_R2_CDN_URL || \"\"\n// e.g. owid-image-hosting-staging/development\nexport const IMAGE_HOSTING_R2_BUCKET_PATH: string =\n    process.env.IMAGE_HOSTING_R2_BUCKET_PATH || \"\"\n// e.g. development\nexport const IMAGE_HOSTING_R2_BUCKET_SUBFOLDER_PATH: string =\n    IMAGE_HOSTING_R2_BUCKET_PATH.slice(\n        IMAGE_HOSTING_R2_BUCKET_PATH.indexOf(\"/\") + 1\n    )\n\n// Link to production wizard.  You need Tailscale to access it in production.\nexport const ETL_WIZARD_URL: string =\n    process.env.ETL_WIZARD_URL ?? `http://${ADMIN_SERVER_HOST}:8053/`\n\n// Production ETL API runs on http://etl-prod-2:8083/v1 (you need Tailscale to access it)\nexport const ETL_API_URL: string =\n    process.env.ETL_API_URL ?? `http://${ADMIN_SERVER_HOST}:8081/api/v1`\n\nexport const GDOCS_DETAILS_ON_DEMAND_ID: string =\n    process.env.GDOCS_DETAILS_ON_DEMAND_ID ?? \"\"\n\nexport const PUBLISHED_AT_FORMAT = \"ddd, MMM D, YYYY HH:mm\"\n\n// Feature flags: FEATURE_FLAGS is a comma-separated list of flags, and they need to be part of this enum to be considered\nexport enum FeatureFlagFeature {\n    MultiDimDataPage = \"MultiDimDataPage\",\n}\nconst featureFlagsRaw =\n    (typeof process.env.FEATURE_FLAGS === \"string\" &&\n        process.env.FEATURE_FLAGS.trim()?.split(\",\")) ||\n    []\nexport const FEATURE_FLAGS: Set<FeatureFlagFeature> = new Set(\n    Object.keys(FeatureFlagFeature).filter((key) =>\n        featureFlagsRaw.includes(key)\n    ) as FeatureFlagFeature[]\n)\n", "const __vite_injected_original_dirname = \"/Users/sophia/code/owid/owid-grapher/site\";const __vite_injected_original_filename = \"/Users/sophia/code/owid/owid-grapher/site/SiteConstants.ts\";const __vite_injected_original_import_meta_url = \"file:///Users/sophia/code/owid/owid-grapher/site/SiteConstants.ts\";import { faRss } from \"@fortawesome/free-solid-svg-icons\"\nimport {\n    faXTwitter,\n    faFacebookSquare,\n    faInstagram,\n    faThreads,\n    faLinkedin,\n    faBluesky,\n} from \"@fortawesome/free-brands-svg-icons\"\n\n// See https://cdnjs.cloudflare.com/polyfill/ for a list of all supported features\nconst polyfillFeatures = [\n    \"es2019\", // Array.flat, Array.flatMap, Object.fromEntries, ...\n    \"es2020\", // String.matchAll, Promise.allSettled, ...\n    \"es2021\", // String.replaceAll, Promise.any, ...\n    \"es2022\", // Array.at, String.at, ...\n    \"es2023\", // Array.findLast, Array.toReversed, Array.toSorted, Array.with, ...\n    \"IntersectionObserver\",\n    \"IntersectionObserverEntry\",\n    \"ResizeObserver\",\n    \"globalThis\", // some dependencies use this\n]\nconst POLYFILL_VERSION = \"4.8.0\"\nexport const POLYFILL_URL: string = `https://cdnjs.cloudflare.com/polyfill/v3/polyfill.min.js?version=${POLYFILL_VERSION}&features=${polyfillFeatures.join(\n    \",\"\n)}`\n\nexport const DEFAULT_LOCAL_BAKE_DIR = \"localBake\"\n\nexport const GRAPHER_PREVIEW_CLASS = \"grapherPreview\"\n\nexport const SMALL_BREAKPOINT_MEDIA_QUERY = \"(max-width: 768px)\"\n\nexport const TOUCH_DEVICE_MEDIA_QUERY =\n    \"(hover: none), (pointer: coarse), (pointer: none)\"\n\nexport const DATA_INSIGHTS_ATOM_FEED_NAME = \"atom-data-insights.xml\"\n\nexport const DATA_INSIGHT_ATOM_FEED_PROPS = {\n    title: \"Atom feed for Daily Data Insights\",\n    href: `https://ourworldindata.org/${DATA_INSIGHTS_ATOM_FEED_NAME}`,\n}\n\nexport const DEFAULT_TOMBSTONE_REASON =\n    \"Our World in Data is designed to be an evergreen publication. This \" +\n    \"means that when a page cannot be updated due to outdated data or \" +\n    \"missing information, we prefer to remove it rather than present \" +\n    \"incomplete or inaccurate research and data to our readers.\"\n\nexport const SOCIALS = [\n    {\n        title: \"X\",\n        url: \"https://x.com/ourworldindata\",\n        icon: faXTwitter,\n    },\n    {\n        title: \"Instagram\",\n        url: \"https://www.instagram.com/ourworldindata/\",\n        icon: faInstagram,\n    },\n    {\n        title: \"Threads\",\n        url: \"https://www.threads.net/@ourworldindata\",\n        icon: faThreads,\n    },\n    {\n        title: \"Facebook\",\n        url: \"https://facebook.com/ourworldindata\",\n        icon: faFacebookSquare,\n    },\n    {\n        title: \"LinkedIn\",\n        url: \"https://www.linkedin.com/company/ourworldindata\",\n        icon: faLinkedin,\n    },\n    {\n        title: \"Bluesky\",\n        url: \"https://bsky.app/profile/ourworldindata.org\",\n        icon: faBluesky,\n    },\n]\n\nexport const RSS_FEEDS = [\n    {\n        title: \"Research & Writing RSS Feed\",\n        url: \"/atom.xml\",\n        icon: faRss,\n    },\n    {\n        title: \"Daily Data Insights RSS Feed\",\n        url: `/${DATA_INSIGHTS_ATOM_FEED_NAME}`,\n        icon: faRss,\n    },\n]\n", "const __vite_injected_original_dirname = \"/Users/sophia/code/owid/owid-grapher\";const __vite_injected_original_filename = \"/Users/sophia/code/owid/owid-grapher/vite.config-common.mts\";const __vite_injected_original_import_meta_url = \"file:///Users/sophia/code/owid/owid-grapher/vite.config-common.mts\";import { defineConfig } from \"vite\"\nimport pluginReact from \"@vitejs/plugin-react\"\nimport pluginChecker from \"vite-plugin-checker\"\nimport * as clientSettings from \"./settings/clientSettings.js\"\nimport {\n    VITE_ASSET_SITE_ENTRY,\n    VITE_ENTRYPOINT_INFO,\n    ViteEntryPoint,\n} from \"./site/viteUtils.js\"\n\n// https://vitejs.dev/config/\nexport const defineViteConfigForEntrypoint = (entrypoint: ViteEntryPoint) => {\n    const entrypointInfo = VITE_ENTRYPOINT_INFO[entrypoint]\n\n    return defineConfig({\n        publicDir: false, // don't copy public folder to dist\n        resolve: {\n            // prettier-ignore\n            alias: {\n                \"@ourworldindata/grapher/src\": \"@ourworldindata/grapher/src\", // need this for imports of @ourworldindata/grapher/src/core/grapher.scss to work\n                // we alias to the packages source files in dev and prod:\n                // this means we get instant dev updates when we change one of them,\n                // and the prod build builds them all as esm modules, which helps with tree shaking\n                // Idea from https://github.com/LinusBorg/vue-lib-template/blob/3775e49b20a7c3349dd49321cad2ed7f9d575057/packages/playground/vite.config.ts\n                \"@ourworldindata/components\": \"@ourworldindata/components/src/index.ts\",\n                \"@ourworldindata/core-table\": \"@ourworldindata/core-table/src/index.ts\",\n                \"@ourworldindata/explorer\": \"@ourworldindata/explorer/src/index.ts\",\n                \"@ourworldindata/grapher\": \"@ourworldindata/grapher/src/index.ts\",\n                \"@ourworldindata/types\": \"@ourworldindata/types/src/index.ts\",\n                \"@ourworldindata/utils\": \"@ourworldindata/utils/src/index.ts\",\n            },\n        },\n        css: {\n            devSourcemap: true,\n        },\n        define: {\n            // Replace all clientSettings with their respective values, i.e. assign e.g. BUGSNAG_API_KEY to process.env.BUGSNAG_API_KEY\n            // it's important to note that we only expose values that are present in the clientSettings file - not any other things that are stored in .env\n            ...Object.fromEntries(\n                Object.entries(clientSettings).map(([key, value]) => [\n                    `process.env.${key}`,\n                    JSON.stringify(value),\n                ])\n            ),\n        },\n        build: {\n            manifest: true, // creates a manifest.json file, which we use to determine which files to load in prod\n            emptyOutDir: true,\n            outDir: `dist/${entrypointInfo.outDir}`,\n            sourcemap: true,\n            target: [\"chrome66\", \"firefox78\", \"safari12\"], // see docs/browser-support.md\n            rollupOptions: {\n                input: {\n                    [entrypointInfo.outName]: entrypointInfo.entryPointFile,\n                },\n                output: {\n                    assetFileNames: `${entrypointInfo.outName}.css`,\n                    entryFileNames: `${entrypointInfo.outName}.mjs`,\n                },\n            },\n        },\n        plugins: [\n            pluginReact({\n                babel: {\n                    parserOpts: {\n                        plugins: [\"decorators-legacy\"], // needed so mobx decorators work correctly\n                    },\n                },\n            }),\n            pluginChecker({\n                typescript: {\n                    buildMode: true,\n                    tsconfigPath: \"tsconfig.vite-checker.json\",\n                },\n            }),\n        ],\n        server: {\n            port: 8090,\n            warmup: { clientFiles: [VITE_ASSET_SITE_ENTRY] },\n        },\n        preview: {\n            port: 8090,\n        },\n    })\n}\n", "const __vite_injected_original_dirname = \"/Users/sophia/code/owid/owid-grapher\";const __vite_injected_original_filename = \"/Users/sophia/code/owid/owid-grapher/vite.config-site.mts\";const __vite_injected_original_import_meta_url = \"file:///Users/sophia/code/owid/owid-grapher/vite.config-site.mts\";import { ViteEntryPoint } from \"./site/viteUtils.tsx\"\nimport { defineViteConfigForEntrypoint } from \"./vite.config-common.mts\"\n\nexport default defineViteConfigForEntrypoint(ViteEntryPoint.Site)\n"],
  "mappings": "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",
  "names": ["fs", "path", "dotenv", "fs", "__vite_injected_original_dirname", "__vite_injected_original_dirname", "baseDir", "FeatureFlagFeature", "parseIntOrUndefined", "__vite_injected_original_dirname", "__vite_injected_original_dirname", "dotenv", "BAKED_BASE_URL", "ADMIN_BASE_URL", "BAKED_GRAPHER_URL", "BUGSNAG_API_KEY", "parseIntOrUndefined", "path", "GDOCS_DETAILS_ON_DEMAND_ID", "path", "fs", "IMAGE_HOSTING_R2_CDN_URL", "IMAGE_HOSTING_R2_BUCKET_PATH", "IMAGE_HOSTING_R2_BUCKET_SUBFOLDER_PATH", "ADMIN_BASE_URL"]
}
