@buildcanada/charts 0.1.0 → 0.2.0

package/src/grapher/mapCharts/GlobeController.ts

@@ -9,7 +9,7 @@ import {
     excludeUndefined,
     PartialBy,
     PointVector,
-    checkIsOwidContinent,
+    checkIsContinent,
     getCountryNamesForRegion,
     getRegionByName,
     checkHasMembers,
@@ -105,8 +105,8 @@ export class GlobeController {
         void this.rotateTo(target)
     }
 
-    jumpToOwidContinent(continent: GlobeRegionName): void {
-        const target = calculateTargetForOwidContinent(continent)
+    jumpToContinent(continent: GlobeRegionName): void {
+        const target = calculateTargetForContinent(continent)
         this.jumpTo(target)
     }
 
@@ -115,8 +115,8 @@ export class GlobeController {
         if (target) this.showGlobeAndRotateTo(target)
     }
 
-    rotateToOwidContinent(continent: GlobeRegionName): void {
-        const target = calculateTargetForOwidContinent(continent)
+    rotateToContinent(continent: GlobeRegionName): void {
+        const target = calculateTargetForContinent(continent)
         this.showGlobeAndRotateTo(target)
     }
 
@@ -269,7 +269,7 @@ function calculateZoomToFitForBounds(bounds: Bounds): number {
     return zoom
 }
 
-function calculateTargetForOwidContinent(continent: GlobeRegionName): Target {
+function calculateTargetForContinent(continent: GlobeRegionName): Target {
     const viewport = GLOBE_VIEWPORTS[continent]
     return { coords: viewport.rotation, zoom: viewport.zoom }
 }
@@ -296,13 +296,13 @@ function calculateTargetForSelection(
         )
     }
 
-    // if a single owid continent is selected, then rotate to it
+    // if a single continent is selected, then rotate to it
     // (the hard-coded coords/zoom values are nicer than dynamically computing it)
     if (
         selection.selectedRegions.length === 1 &&
-        checkIsOwidContinent(selection.selectedRegions[0])
+        checkIsContinent(selection.selectedRegions[0])
     ) {
-        return calculateTargetForOwidContinent(
+        return calculateTargetForContinent(
             MAP_REGION_NAMES[
                 selection.selectedRegions[0].name
             ] as GlobeRegionName

package/src/grapher/mapCharts/MapChartState.ts

@@ -11,7 +11,7 @@ import {
 import {
     CoreColumn,
     ErrorValueTypes,
-    OwidTable,
+    ChartsTable,
 } from "../../core-table/index.js"
 import { match, P } from "ts-pattern"
 import {
@@ -64,7 +64,7 @@ export class MapChartState implements ChartState, ColorScaleManager {
         makeObservable(this)
     }
 
-    transformTable(table: OwidTable): OwidTable {
+    transformTable(table: ChartsTable): ChartsTable {
         // Drop non-mappable entities from the table
         table = this.dropNonMapEntities(table)
 
@@ -79,12 +79,12 @@ export class MapChartState implements ChartState, ColorScaleManager {
     }
 
     private transformTableForSingleMapColumn(
-        table: OwidTable,
+        table: ChartsTable,
         mapColumnInfo: Extract<
             MapColumnInfo,
             { type: "historical" | "projected" }
         >
-    ): OwidTable {
+    ): ChartsTable {
         return table
             .dropRowsWithErrorValuesForColumn(mapColumnInfo.slug)
             .interpolateColumnWithTolerance(mapColumnInfo.slug, {
@@ -94,9 +94,9 @@ export class MapChartState implements ChartState, ColorScaleManager {
     }
 
     private transformTableForCombinedMapColumn(
-        table: OwidTable,
+        table: ChartsTable,
         mapColumnInfo: Extract<MapColumnInfo, { type: "historical+projected" }>
-    ): OwidTable {
+    ): ChartsTable {
         const { historicalSlug, projectedSlug, combinedSlug } = mapColumnInfo
 
         // Interpolate both columns separately
@@ -121,14 +121,14 @@ export class MapChartState implements ChartState, ColorScaleManager {
         return table
     }
 
-    transformTableForSelection(table: OwidTable): OwidTable {
+    transformTableForSelection(table: ChartsTable): ChartsTable {
         table = this.addMissingMapEntities(table)
         table = this.dropNonMapEntitiesForSelection(table)
         table = this.dropAntarctica(table)
         return table
     }
 
-    private dropAntarctica(table: OwidTable): OwidTable {
+    private dropAntarctica(table: ChartsTable): ChartsTable {
         // We prefer to not offer Antarctica in the entity selector on the map
         // tab to avoid confusion since it's shown on the globe, but not on the map.
         return table.filterByEntityNamesUsingIncludeExcludePattern({
@@ -136,7 +136,7 @@ export class MapChartState implements ChartState, ColorScaleManager {
         })
     }
 
-    private dropNonMapEntities(table: OwidTable): OwidTable {
+    private dropNonMapEntities(table: ChartsTable): ChartsTable {
         // For Canada region, filter by Canadian provinces/territories
         if (this.mapConfig.region === MapRegionName.Canada) {
             const entityNamesToSelect =
@@ -150,12 +150,12 @@ export class MapChartState implements ChartState, ColorScaleManager {
         return table.filterByEntityNames(entityNamesToSelect)
     }
 
-    private dropNonMapEntitiesForSelection(table: OwidTable): OwidTable {
+    private dropNonMapEntitiesForSelection(table: ChartsTable): ChartsTable {
         const { selectionArray, mapConfig } = this
 
         const allMappableCountryNames = mappableCountries.map((c) => c.name)
         const allRegionNames = regions
-            .filter((r) => checkHasMembers(r) && r.code !== "OWID_WRL")
+            .filter((r) => checkHasMembers(r) && r.code !== "WRL")
             .map((r) => r.name)
 
         const mappableCountryNameSet = new Set(allMappableCountryNames)
@@ -204,7 +204,7 @@ export class MapChartState implements ChartState, ColorScaleManager {
         )
     }
 
-    private addMissingMapEntities(table: OwidTable): OwidTable {
+    private addMissingMapEntities(table: ChartsTable): ChartsTable {
         // the given table might not have data for all mappable countries, but
         // on the map tab, we do want every country to be selectable, even if
         // it doesn't have data for any of the years. that's why we add a
@@ -227,7 +227,7 @@ export class MapChartState implements ChartState, ColorScaleManager {
         return table
     }
 
-    @computed get inputTable(): OwidTable {
+    @computed get inputTable(): ChartsTable {
         const { mapColumnInfo } = this
         const { table } = this.manager
 
@@ -239,14 +239,14 @@ export class MapChartState implements ChartState, ColorScaleManager {
             : table
     }
 
-    @computed get transformedTableFromGrapher(): OwidTable {
+    @computed get transformedTableFromGrapher(): ChartsTable {
         return (
             this.manager.transformedTable ??
             this.transformTable(this.inputTable)
         )
     }
 
-    @computed get transformedTable(): OwidTable {
+    @computed get transformedTable(): ChartsTable {
         let table = this.transformedTableFromGrapher
 
         // A target time is set for faceted maps
@@ -364,7 +364,7 @@ export class MapChartState implements ChartState, ColorScaleManager {
         if (mapColumn.isMissing) return []
         if (targetTime === undefined) return []
 
-        return mapColumn.owidRows
+        return mapColumn.dataRows
             .map((row) => {
                 const { entityName, value, originalTime } = row
                 const color =

package/src/grapher/mapCharts/MapSparkline.tsx

@@ -6,10 +6,10 @@ import {
     AxisConfigInterface,
     ColumnSlug,
     EntityName,
-    OwidVariableRoundingMode,
+    VariableRoundingMode,
     Time,
 } from "../../types/index.js"
-import { OwidTable } from "../../core-table/index.js"
+import { ChartsTable } from "../../core-table/index.js"
 import { LineChart } from "../lineCharts/LineChart"
 import { LineChartState } from "../lineCharts/LineChartState"
 import { Bounds, checkIsVeryShortUnit } from "../../utils/index.js"
@@ -28,7 +28,7 @@ const SPARKLINE_NUDGE = 3 // step away from the axis
 export interface MapSparklineManager {
     mapColumnSlug: ColumnSlug
     mapColumnInfo: MapColumnInfo
-    timeSeriesTable: OwidTable
+    timeSeriesTable: ChartsTable
     targetTime?: Time
     entityName: EntityName
     lineColorScale?: ColorScale
@@ -64,7 +64,7 @@ export class MapSparkline extends React.Component<MapSparklineProps> {
         return this.manager.mapColumnSlug
     }
 
-    @computed private get sparklineTable(): OwidTable {
+    @computed private get sparklineTable(): ChartsTable {
         return this.manager.timeSeriesTable
             .filterByEntityNames([this.manager.entityName])
             .columnFilter(
@@ -200,7 +200,7 @@ export class MapSparkline extends React.Component<MapSparklineProps> {
 
         const { mapColumnSlug, formatValueForTooltip } = this.manager
 
-        const roundingMode = OwidVariableRoundingMode.decimalPlaces
+        const roundingMode = VariableRoundingMode.decimalPlaces
         const { yAxisConfig } = this.sparklineManager,
             yColumn = this.sparklineTable.get(mapColumnSlug),
             minVal = _.min([yColumn.minValue, yAxisConfig?.min]) ?? 0,

package/src/grapher/mapCharts/MapTooltip.tsx

@@ -20,12 +20,12 @@ import { ColorScale } from "../color/ColorScale"
 import {
     Time,
     EntityName,
-    OwidVariableRow,
+    VariableRow,
     AxisConfigInterface,
     ColumnSlug,
     PrimitiveType,
 } from "../../types/index.js"
-import { CoreColumn, OwidTable } from "../../core-table/index.js"
+import { CoreColumn, ChartsTable } from "../../core-table/index.js"
 import {
     calculateTrendDirection,
     excludeUndefined,
@@ -43,7 +43,7 @@ interface MapTooltipProps {
     mapColumnInfo: MapColumnInfo
     position?: PointVector
     lineColorScale: ColorScale
-    timeSeriesTable: OwidTable
+    timeSeriesTable: ChartsTable
     targetTime?: Time // show tooltip values for a specific point in time
     targetTimes?: [Time, Time] // show tooltip values for a specific time range (start and end times)
     sparklineWidth?: number
@@ -109,30 +109,30 @@ export class MapTooltip
     }
 
     // Table pre-filtered by targetTime, excludes time series
-    @computed private get entityTable(): OwidTable {
+    @computed private get entityTable(): ChartsTable {
         const table =
             this.props.manager.transformedTable ?? this.props.manager.table
         return table.filterByEntityNames([this.entityName])
     }
 
-    @computed get timeSeriesTable(): OwidTable {
+    @computed get timeSeriesTable(): ChartsTable {
         return this.props.timeSeriesTable
     }
 
     @computed private get startDatum():
-        | OwidVariableRow<number | string>
+        | VariableRow<number | string>
         | undefined {
         if (this.startTime === undefined) return undefined
-        return this.mapColumn.owidRowByEntityNameAndTime
+        return this.mapColumn.dataRowByEntityNameAndTime
             .get(this.entityName)
             ?.get(this.startTime)
     }
 
     @computed private get endDatum():
-        | OwidVariableRow<number | string>
+        | VariableRow<number | string>
         | undefined {
         if (this.endTime === undefined) return undefined
-        return this.mapColumn.owidRowByEntityNameAndTime
+        return this.mapColumn.dataRowByEntityNameAndTime
             .get(this.entityName)
             ?.get(this.endTime)
     }
@@ -175,7 +175,7 @@ export class MapTooltip
                 { type: "historical+projected" },
                 (info) =>
                     this.entityTable.get(info.slugForIsProjectionColumn)
-                        .owidRows[0]?.value
+                        .dataRows[0]?.value
             )
             .exhaustive()
     }
@@ -341,7 +341,7 @@ function MapTooltipValue({
     isProjection = false,
 }: {
     mapColumn: CoreColumn
-    datum?: OwidVariableRow<number | string>
+    datum?: VariableRow<number | string>
     formattedValue?: string
     colorScale: ColorScale
     isProjection?: boolean
@@ -370,8 +370,8 @@ function MapTooltipRangeValues({
     colorScale,
 }: {
     mapColumn: CoreColumn
-    startDatum?: OwidVariableRow<number | string>
-    endDatum?: OwidVariableRow<number | string>
+    startDatum?: VariableRow<number | string>
+    endDatum?: VariableRow<number | string>
     formattedStartValue?: ReturnType<MapFormatValueForTooltip>
     formattedEndValue?: ReturnType<MapFormatValueForTooltip>
     colorScale: ColorScale

package/src/grapher/modal/DownloadModal.scss

@@ -224,7 +224,7 @@
                 }
 
                 a {
-                    @include owid-link-90;
+                    @include link-90;
                     color: $gray-80;
                 }
             }
@@ -257,7 +257,7 @@
         }
 
         a {
-            @include owid-link-60;
+            @include link-60;
             text-underline-offset: 2px;
         }
     }
@@ -287,7 +287,7 @@
         }
 
         a {
-            @include owid-link-90;
+            @include link-90;
             color: $gray-70;
         }
     }

package/src/grapher/modal/DownloadModal.tsx

@@ -30,14 +30,14 @@ import {
     faSpinner,
 } from "@fortawesome/free-solid-svg-icons"
 import {
-    OwidColumnDef,
-    OwidOrigin,
+    ColumnDef,
+    Origin,
     QueryParams,
     type GrapherImageDownloadEvent,
 } from "../../types/index.js"
 import {
-    BlankOwidTable,
-    OwidTable,
+    BlankChartsTable,
+    ChartsTable,
     CoreColumn,
 } from "../../core-table/index.js"
 import { Modal } from "./Modal"
@@ -63,9 +63,9 @@ export interface DownloadModalManager {
     baseUrl?: string
     queryStr?: string
     externalQueryParams?: QueryParams
-    inputTable?: OwidTable
-    transformedTable?: OwidTable
-    filteredTableForDisplay?: OwidTable
+    inputTable?: ChartsTable
+    transformedTable?: ChartsTable
+    filteredTableForDisplay?: ChartsTable
     yColumnsFromDimensionsOrSlugsOrAuto?: CoreColumn[]
     detailsOrderedByReference?: string[]
     activeModal?: GrapherModal
@@ -601,8 +601,8 @@ interface DataDownloadContextClientSide extends DataDownloadContextBase {
     shortColNames: boolean
 
     // Only needed for local CSV generation
-    fullTable: OwidTable
-    filteredTable: OwidTable
+    fullTable: ChartsTable
+    filteredTable: ChartsTable
     activeColumnSlugs: string[] | undefined
 }
 
@@ -653,12 +653,12 @@ const getDownloadUrl = (
 }
 
 export const getNonRedistributableInfo = (
-    table: OwidTable | undefined
+    table: ChartsTable | undefined
 ): { cols: CoreColumn[] | undefined; sourceLinks: string[] | undefined } => {
     if (!table) return { cols: undefined, sourceLinks: undefined }
 
     const nonRedistributableCols = table.columnsAsArray.filter(
-        (col) => (col.def as OwidColumnDef).nonRedistributable
+        (col) => (col.def as ColumnDef).nonRedistributable
     )
 
     if (!nonRedistributableCols.length)
@@ -666,7 +666,7 @@ export const getNonRedistributableInfo = (
 
     const sourceLinks = nonRedistributableCols
         .map((col) => {
-            const def = col.def as OwidColumnDef
+            const def = col.def as ColumnDef
             return def.sourceLink ?? def.origins?.[0]?.urlMain
         })
         .filter((link): link is string => !!link)
@@ -716,7 +716,7 @@ metadata <- fromJSON("${props.metadataUrl}")`,
     )
 }
 
-const SourceAndCitationSection = ({ table }: { table?: OwidTable }) => {
+const SourceAndCitationSection = ({ table }: { table?: ChartsTable }) => {
     // Sources can come either from origins (new format) or from the source field of the column (old format)
     const origins =
         table?.defs
@@ -728,7 +728,7 @@ const SourceAndCitationSection = ({ table }: { table?: OwidTable }) => {
             .map((col) => col.source)
             .filter((s) => s !== undefined && s.dataPublishedBy !== undefined)
             .map(
-                (s): OwidOrigin => ({
+                (s): Origin => ({
                     producer: s.dataPublishedBy,
                     urlMain: s.link,
                 })
@@ -756,19 +756,19 @@ const SourceAndCitationSection = ({ table }: { table?: OwidTable }) => {
     )
 
     // Find the highest processing level of all columns
-    const owidProcessingLevel = table?.columnsAsArray
-        .map((col) => (col.def as OwidColumnDef).owidProcessingLevel)
+    const processingLevel = table?.columnsAsArray
+        .map((col) => (col.def as ColumnDef).processingLevel)
         .reduce((prev, curr) => {
             if (prev === "major" || curr === "major") return "major" as const
             if (prev === "minor" || curr === "minor") return "minor" as const
             return undefined
         }, undefined)
 
-    const sourceIsOwid =
+    const sourceIsExternal =
         attributions.length === 1 &&
         attributions[0].toLowerCase() === "our world in data"
-    const processingLevelPhrase = !sourceIsOwid
-        ? getPhraseForProcessingLevel(owidProcessingLevel)
+    const processingLevelPhrase = !sourceIsExternal
+        ? getPhraseForProcessingLevel(processingLevel)
         : undefined
     const fullProcessingPhrase = processingLevelPhrase ? (
         <>
@@ -802,7 +802,7 @@ const SourceAndCitationSection = ({ table }: { table?: OwidTable }) => {
 
 const ApiAndCodeExamplesSection = (props: {
     downloadCtxBase: DataDownloadContextBase
-    firstYColDef?: OwidColumnDef
+    firstYColDef?: ColumnDef
 }) => {
     const [onlyVisible, setOnlyVisible] = useState(false)
     const [shortColNames, setShortColNames] = useState(true)
@@ -841,12 +841,7 @@ const ApiAndCodeExamplesSection = (props: {
                     <p className="grapher_label-2-regular">
                         Use these URLs to programmatically access this chart's
                         data and configure your requests with the options below.{" "}
-                        <a
-                            href="https://docs.owid.io/projects/etl/api/"
-                            data-track-note="chart_download_modal_api_docs"
-                        >
-                            Our documentation provides more information
-                        </a>{" "}
+                        <span>Documentation provides more information</span>{" "}
                         on how to use the API, and you can find a few code
                         examples below.
                     </p>
@@ -946,11 +941,11 @@ export const DownloadModalDataTab = (props: DownloadModalProps) => {
                 props.manager.baseUrl ??
                 `/grapher/${props.manager.displaySlug}`,
 
-            fullTable: props.manager.inputTable ?? BlankOwidTable(),
+            fullTable: props.manager.inputTable ?? BlankChartsTable(),
             filteredTable:
                 (props.manager.isOnTableTab
                     ? props.manager.filteredTableForDisplay
-                    : props.manager.transformedTable) ?? BlankOwidTable(),
+                    : props.manager.transformedTable) ?? BlankChartsTable(),
             activeColumnSlugs: props.manager.activeColumnSlugs,
         }
     }, [
@@ -1065,7 +1060,7 @@ export const DownloadModalDataTab = (props: DownloadModalProps) => {
         </p>
     )
 
-    const firstYColDef = yColumns?.[0]?.def as OwidColumnDef | undefined
+    const firstYColDef = yColumns?.[0]?.def as ColumnDef | undefined
 
     const fullDataDescription = `Includes all entities and time points`
     const filteredDataDescription = `Includes only the entities and time points currently visible in the chart`

package/src/grapher/modal/SourcesDescriptions.scss

@@ -81,7 +81,7 @@
     }
 
     a {
-        @include owid-link-60;
+        @include link-60;
         color: inherit;
     }
 }

package/src/grapher/modal/SourcesKeyDataTable.tsx

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import { Fragment } from "react"
 import cx from "classnames"
-import { OwidProcessingLevel, excludeNull } from "../../utils/index.js"
+import { ProcessingLevel, excludeNull } from "../../utils/index.js"
 import {
     makeSource,
     makeLastUpdated,
@@ -19,7 +19,7 @@ interface SourcesKeyDataTableProps {
     lastUpdated?: string
     nextUpdate?: string
     unit?: string
-    owidProcessingLevel?: OwidProcessingLevel
+    processingLevel?: ProcessingLevel
     link?: string
     unitConversionFactor?: number
     isEmbeddedInADataPage?: boolean // true by default

package/src/grapher/modal/SourcesModal.tsx

@@ -8,7 +8,7 @@ import {
     excludeUndefined,
     DisplaySource,
     prepareSourcesForDisplay,
-    OwidSource,
+    Source,
     IndicatorTitleWithFragments,
     joinTitleFragments,
     getCitationShort,
@@ -30,7 +30,7 @@ import { action, computed, makeObservable, observable } from "mobx"
 import { observer } from "mobx-react"
 import { faPencilAlt } from "@fortawesome/free-solid-svg-icons"
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
-import { OwidColumnDef } from "../../types/index.js"
+import { ColumnDef } from "../../types/index.js"
 import { CoreColumn } from "../../core-table/index.js"
 import { Modal } from "./Modal"
 import { SourcesKeyDataTable } from "./SourcesKeyDataTable"
@@ -97,7 +97,7 @@ export class SourcesModal extends React.Component<SourcesModalProps> {
 
     @computed private get modalBounds(): Bounds {
         const maxWidth = MAX_CONTENT_WIDTH + 220
-        // using 15px instead of 16px to make sure the modal fully covers the OWID logo in the header
+        // using 15px instead of 16px to make sure the modal fully covers the logo in the header
         const padWidth = Math.max(15, (this.frameBounds.width - maxWidth) / 2)
         return this.frameBounds.padHeight(15).padWidth(padWidth)
     }
@@ -182,7 +182,7 @@ export class SourcesModal extends React.Component<SourcesModalProps> {
     ): React.ReactElement | null {
         if (!column) return null
         return (
-            <Source
+            <SourceDisplay
                 column={column}
                 editBaseUrl={this.editBaseUrl}
                 isEmbeddedInADataPage={
@@ -343,7 +343,7 @@ interface SourceProps {
 }
 
 @observer
-export class Source extends React.Component<SourceProps> {
+export class SourceDisplay extends React.Component<SourceProps> {
     constructor(props: SourceProps) {
         super(props)
         makeObservable(this)
@@ -353,7 +353,7 @@ export class Source extends React.Component<SourceProps> {
         return this.props.column
     }
 
-    @computed get def(): OwidColumnDef & { source?: OwidSource } {
+    @computed get def(): ColumnDef & { source?: Source } {
         return { ...this.column.def, source: this.column.source }
     }
 
@@ -361,7 +361,7 @@ export class Source extends React.Component<SourceProps> {
         return getCitationShort(
             this.def.origins ?? [],
             getAttributionFragmentsFromVariable(this.def),
-            this.def.owidProcessingLevel
+            this.def.processingLevel
         )
     }
 
@@ -373,13 +373,13 @@ export class Source extends React.Component<SourceProps> {
             getAttributionFragmentsFromVariable(this.def),
             this.def.presentation?.attributionShort,
             this.def.presentation?.titleVariant,
-            this.def.owidProcessingLevel,
+            this.def.processingLevel,
             undefined,
             undefined
         )
     }
 
-    @computed private get source(): OwidSource {
+    @computed private get source(): Source {
         return this.def.source ?? {}
     }
 
@@ -391,8 +391,8 @@ export class Source extends React.Component<SourceProps> {
         if (!this.props.editBaseUrl) return undefined
 
         // point user directly to the variable edit page if possible
-        if (this.def.owidVariableId) {
-            return `${this.props.editBaseUrl}/variables/${this.def.owidVariableId}`
+        if (this.def.variableId) {
+            return `${this.props.editBaseUrl}/variables/${this.def.variableId}`
         }
 
         // if that's not possible, point user to the dataset edit page
@@ -450,11 +450,11 @@ export class Source extends React.Component<SourceProps> {
     }
 
     @computed private get hideSourcesForDisplay(): boolean {
-        // the "Continent" variable curated by OWID is used in many charts but doesn't come with useful source information.
+        // the "Continent" variable is used in many charts but doesn't come with useful source information.
         // that's why we hide the sources section for this indicator for now, but we might decide to show it in the future.
         return (
-            !!this.def.owidVariableId &&
-            isContinentsVariableId(this.def.owidVariableId)
+            !!this.def.variableId &&
+            isContinentsVariableId(this.def.variableId)
         )
     }
 
@@ -496,7 +496,7 @@ export class Source extends React.Component<SourceProps> {
                 )}
                 <SourcesKeyDataTable
                     attribution={this.attributions}
-                    owidProcessingLevel={this.def.owidProcessingLevel}
+                    processingLevel={this.def.processingLevel}
                     dateRange={this.def.timespan}
                     lastUpdated={this.lastUpdated}
                     nextUpdate={this.nextUpdate}

package/src/grapher/scatterCharts/ScatterPlotChart.tsx

@@ -23,7 +23,7 @@ import {
     DEFAULT_GRAPHER_BOUNDS,
 } from "../core/GrapherConstants"
 import {
-    OwidTable,
+    ChartsTable,
     isNotErrorValue,
     CoreColumn,
 } from "../../core-table/index.js"
@@ -120,7 +120,7 @@ export class ScatterPlotChart
         return this.chartState.colorScale
     }
 
-    @computed private get transformedTable(): OwidTable {
+    @computed private get transformedTable(): ChartsTable {
         return this.chartState.transformedTable
     }
 

package/src/grapher/scatterCharts/ScatterPlotChartConstants.ts

@@ -1,6 +1,6 @@
 import { ScaleLinear } from "d3-scale"
 import { Quadtree } from "d3-quadtree"
-import { OwidTable } from "../../core-table/index.js"
+import { ChartsTable } from "../../core-table/index.js"
 import { DualAxis } from "../axis/Axis"
 import { ChartManager } from "../chart/ChartManager"
 import { NoDataModalManager } from "../noDataModal/NoDataModal"
@@ -29,7 +29,7 @@ export interface ScatterPlotManager extends ChartManager {
     scatterPointLabelStrategy?: ScatterPointLabelStrategy
     addCountryMode?: EntitySelectionMode
     xOverrideTime?: Time | undefined
-    tableAfterAuthorTimelineAndActiveChartTransform?: OwidTable
+    tableAfterAuthorTimelineAndActiveChartTransform?: ChartsTable
     startTime?: Time
     endTime?: Time
     hasTimeline?: boolean