fix various issues after rebase

adminSiteClient/EditorBasicTab.tsx

@@ -50,7 +50,7 @@ import {
 
 @observer
 class DimensionSlotView<
-    Editor extends AbstractChartEditor
+    Editor extends AbstractChartEditor,
 > extends React.Component<{
     slot: DimensionSlot
     editor: Editor
@@ -334,7 +334,7 @@ class DimensionSlotView<
 
 @observer
 class VariablesSection<
-    Editor extends AbstractChartEditor
+    Editor extends AbstractChartEditor,
 > extends React.Component<{
     editor: Editor
     database: EditorDatabase
@@ -369,7 +369,7 @@ class VariablesSection<
 
 @observer
 export class EditorBasicTab<
-    Editor extends AbstractChartEditor
+    Editor extends AbstractChartEditor,
 > extends React.Component<{
     editor: Editor
     database: EditorDatabase

adminSiteClient/EditorTextTab.tsx

@@ -23,7 +23,7 @@ import { isChartViewEditorInstance } from "./ChartViewEditor.js"
 
 @observer
 export class EditorTextTab<
-    Editor extends AbstractChartEditor
+    Editor extends AbstractChartEditor,
 > extends Component<{ editor: Editor; errorMessages: ErrorMessages }> {
     @action.bound onSlug(slug: string) {
         this.props.editor.grapherState.slug = slugify(slug)

adminSiteClient/GrapherConfigGridEditor.tsx

@@ -595,7 +595,7 @@ export class GrapherConfigGridEditor extends React.Component<GrapherConfigGridEd
                 )
             }
         }
-        if (this.selectedRow) this.updatePreviewToRow()
+        if (this.selectedRow) void this.updatePreviewToRow()
         await this.sendPatches(action.patches)
     }
 
@@ -848,7 +848,7 @@ export class GrapherConfigGridEditor extends React.Component<GrapherConfigGridEd
         if (row1 !== this.selectedRow) {
             this.hasUncommitedRichEditorChanges = false
             this.selectedRow = row1
-            this.updatePreviewToRow()
+            void this.updatePreviewToRow()
         }
         this.selectionEndRow = row2
         if (column1 !== this.selectedColumn) {

adminSiteServer/testPageRouter.tsx

@@ -36,10 +36,8 @@ import { ExplorerChartCreationMode } from "@ourworldindata/explorer"
 import { getPlainRouteWithROTransaction } from "./plainRouterHelpers.js"
 import {
     ColorSchemes,
-    FetchingGrapher,
     GrapherProgrammaticInterface,
 } from "@ourworldindata/grapher"
-import { GrapherFigureView } from "../site/GrapherFigureView.js"
 
 const IS_LIVE = ADMIN_BASE_URL === "https://owid.cloud"
 const DEFAULT_COMPARISON_URL = "https://ourworldindata.org"

baker/GrapherImageBaker.tsx

@@ -65,9 +65,8 @@ export async function bakeGrapherToSvgAndPng(
 export async function getGraphersAndRedirectsBySlug(
     knex: db.KnexReadonlyTransaction
 ) {
-    const { graphersBySlug, graphersById } = await getPublishedGraphersBySlug(
-        knex
-    )
+    const { graphersBySlug, graphersById } =
+        await getPublishedGraphersBySlug(knex)
 
     const redirectQuery = await db.knexRaw<
         Pick<DbPlainChartSlugRedirect, "slug" | "chart_id">

packages/@ourworldindata/explorer/src/Explorer.tsx

@@ -509,7 +509,7 @@ export class Explorer
     @action.bound updateGrapherFromExplorer() {
         switch (this.explorerProgram.chartCreationMode) {
             case ExplorerChartCreationMode.FromGrapherId:
-                this.updateGrapherFromExplorerUsingGrapherId()
+                void this.updateGrapherFromExplorerUsingGrapherId()
                 break
             case ExplorerChartCreationMode.FromVariableIds:
                 void this.updateGrapherFromExplorerUsingVariableIds()

packages/@ourworldindata/grapher/src/core/FetchingGrapher.tsx

@@ -7,10 +7,7 @@ import {
 import React from "react"
 import { Grapher, GrapherState } from "./Grapher.js"
 import { loadVariableDataAndMetadata } from "./loadVariable.js"
-import {
-    legacyToOwidTableAndDimensions,
-    legacyToOwidTableAndDimensionsWithMandatorySlug,
-} from "./LegacyToOwidTable.js"
+import { legacyToOwidTableAndDimensionsWithMandatorySlug } from "./LegacyToOwidTable.js"
 import { OwidTable } from "@ourworldindata/core-table"
 import { isEqual } from "@ourworldindata/utils"
 

packages/@ourworldindata/grapher/src/core/Grapher.tsx

@@ -172,11 +172,7 @@ import {
     DefaultChartClass,
 } from "../chart/ChartTypeMap"
 import { Entity, SelectionArray } from "../selection/SelectionArray"
-import {
-    legacyToOwidTableAndDimensions,
-    legacyToOwidTableAndDimensionsWithMandatorySlug,
-} from "./LegacyToOwidTable"
-import { ScatterPlotManager } from "../scatterCharts/ScatterPlotChartConstants"
+import { legacyToOwidTableAndDimensionsWithMandatorySlug } from "./LegacyToOwidTable"
 import {
     autoDetectSeriesStrategy,
     autoDetectYColumnSlugs,
@@ -1085,7 +1081,7 @@ export class GrapherState {
     get typeExceptWhenLineChartAndSingleTimeThenWillBeBarChart(): GrapherChartType {
         return this.isLineChartThatTurnedIntoDiscreteBarActive
             ? GRAPHER_CHART_TYPES.DiscreteBar
-            : this.activeChartType ?? GRAPHER_CHART_TYPES.LineChart
+            : (this.activeChartType ?? GRAPHER_CHART_TYPES.LineChart)
     }
 
     @computed get isLineChart(): boolean {
@@ -1394,8 +1390,8 @@ export class GrapherState {
         return !isStatic
             ? "underline"
             : shouldIncludeDetailsInStaticExport
-            ? "superscript"
-            : "none"
+              ? "superscript"
+              : "none"
     }
 
     // required derived properties

packages/@ourworldindata/grapher/src/core/LegacyToOwidTable.ts

@@ -361,8 +361,8 @@ export const legacyToOwidTableAndDimensions = (
             const entityName =
                 joinedVariablesTable.entityIdToNameMap.get(entityId)
             return entityName && selectedEntityColors
-                ? selectedEntityColors[entityName] ??
-                      ErrorValueTypes.UndefinedButShouldBeString
+                ? (selectedEntityColors[entityName] ??
+                      ErrorValueTypes.UndefinedButShouldBeString)
                 : ErrorValueTypes.UndefinedButShouldBeString
         }
 
@@ -456,7 +456,7 @@ const fullJoinTables = (
     // not exist in the first table
     const firstTableDuplicateForIndices: [
         OwidTable | undefined,
-        string[] | undefined
+        string[] | undefined,
     ] = [tables[0], sharedColumnNames]
     const defsToAddPerTable = [firstTableDuplicateForIndices]
         .concat(zip(tables, columnsToAddPerTable))
@@ -646,8 +646,8 @@ const columnDefFromOwidVariable = (
     const type = isContinent
         ? ColumnTypeNames.Continent
         : variable.type
-        ? variableTypeToColumnType(variable.type)
-        : ColumnTypeNames.NumberOrString
+          ? variableTypeToColumnType(variable.type)
+          : ColumnTypeNames.NumberOrString
 
     // Sorted values for ordinal columns
     const sort =

site/DataPageV2Content.tsx

@@ -1,11 +1,7 @@
-import { useMemo, useEffect } from "react"
+import { useMemo } from "react"
 import {
     FetchingGrapher,
-    fetchInputTableForConfig,
-    Grapher,
     GrapherProgrammaticInterface,
-    GrapherState,
-    MapChart,
 } from "@ourworldindata/grapher"
 import {
     REUSE_THIS_WORK_SECTION_ID,
@@ -34,7 +30,6 @@ import MetadataSection from "./MetadataSection.js"
 import TopicTags from "./TopicTags.js"
 import { AttachmentsContext } from "./gdocs/AttachmentsContext.js"
 import { DocumentContext } from "./gdocs/DocumentContext.js"
-import { reaction } from "mobx"
 import { GrapherWithFallback } from "./GrapherWithFallback.js"
 
 declare global {