🔨 Fix chart loading issues and eslint issues

owid · Feb 2, 2025 · 6e7189a · 6e7189a
1 parent 2ac02cf
commit 6e7189a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 15 deletions.
diff --git a/baker/GrapherImageBaker.tsx b/baker/GrapherImageBaker.tsx
@@ -10,13 +10,9 @@ import {
     GrapherProgrammaticInterface,
     GrapherState,
 } from "@ourworldindata/grapher"
-import { MultipleOwidVariableDataDimensionsMap } from "@ourworldindata/utils"
 import path from "path"
 import * as db from "../db/db.js"
-import {
-    grapherSlugToExportFileKey,
-    grapherUrlToSlugAndQueryStr,
-} from "./GrapherBakingUtils.js"
+import { grapherSlugToExportFileKey } from "./GrapherBakingUtils.js"
 import { BAKED_GRAPHER_URL } from "../settings/clientSettings.js"
 import { DATA_API_URL } from "../settings/serverSettings.js"
 

diff --git a/functions/_common/metadataTools.ts b/functions/_common/metadataTools.ts
@@ -1,4 +1,4 @@
-import { Grapher, GrapherState } from "@ourworldindata/grapher"
+import { GrapherState } from "@ourworldindata/grapher"
 import {
     OwidTableSlugs,
     OwidOrigin,

diff --git a/packages/@ourworldindata/grapher/src/core/Grapher.tsx b/packages/@ourworldindata/grapher/src/core/Grapher.tsx
@@ -186,8 +186,6 @@ import classnames from "classnames"
 import { GrapherAnalytics } from "./GrapherAnalytics"
 import { legacyToCurrentGrapherQueryParams } from "./GrapherUrlMigrations"
 import { ChartInterface } from "../chart/ChartInterface"
-import { MarimekkoChartManager } from "../stackedCharts/MarimekkoChartConstants"
-import { FacetChartManager } from "../facetChart/FacetChartConstants"
 import {
     StaticChartRasterizer,
     type GrapherExport,

diff --git a/site/DataPageV2Content.tsx b/site/DataPageV2Content.tsx
@@ -17,11 +17,9 @@ import {
 import StickyNav from "./blocks/StickyNav.js"
 import {
     ADMIN_BASE_URL,
-    BAKED_BASE_URL,
     BAKED_GRAPHER_URL,
     DATA_API_URL,
 } from "../settings/clientSettings.js"
-import Image from "./gdocs/components/Image.js"
 import AboutThisData from "./AboutThisData.js"
 import DataPageResearchAndWriting from "./DataPageResearchAndWriting.js"
 import MetadataSection from "./MetadataSection.js"

diff --git a/site/gdocs/components/Chart.tsx b/site/gdocs/components/Chart.tsx
@@ -43,6 +43,8 @@ export default function Chart({
 
     const url = Url.fromURL(d.url)
     const resolvedUrl = linkedChart.resolvedUrl
+    const resolvedUrlParsed = Url.fromURL(resolvedUrl)
+    const slug = resolvedUrlParsed.slug!
     const isExplorer = linkedChart.configType === ChartConfigType.Explorer
     const isMultiDim = linkedChart.configType === ChartConfigType.MultiDim
     const hasControls = url.queryParams.hideControls !== "true"
@@ -137,17 +139,14 @@ export default function Chart({
                                 target="_blank"
                                 rel="noopener"
                             >
-                                <GrapherImage
-                                    slug={resolvedUrl}
-                                    alt={d.title}
-                                />
+                                <GrapherImage url={resolvedUrl} alt={d.title} />
                             </a>
                         )
                     )}
                 </figure>
             ) : (
                 // TODO: 2025-01-05 Daniel - this is a crude first version, this entire control has to be touched again
-                <GrapherWithFallback slug={resolvedUrl} config={chartConfig} />
+                <GrapherWithFallback slug={slug} config={chartConfig} />
             )}
             {d.caption ? (
                 <figcaption>