🔨 migrate charts from typeorm to knex

.vscode/launch.json

@@ -129,4 +129,4 @@
             "port": 9000
         }
     ]
-}
+}

adminSiteClient/ChartEditor.ts

@@ -11,6 +11,7 @@ import {
     type RawPageview,
     Topic,
     PostReference,
+    ChartRedirect,
     DimensionProperty,
 } from "@ourworldindata/utils"
 import { computed, observable, runInAction, when } from "mobx"
@@ -56,12 +57,6 @@ export const getFullReferencesCount = (references: References): number => {
     )
 }
 
-export interface ChartRedirect {
-    id: number
-    slug: string
-    chartId: number
-}
-
 export interface Namespace {
     name: string
     description?: string

adminSiteClient/ChartEditorPage.tsx

@@ -25,6 +25,7 @@ import {
     Topic,
     GrapherInterface,
     GrapherStaticFormat,
+    ChartRedirect,
     DimensionProperty,
 } from "@ourworldindata/types"
 import { Grapher } from "@ourworldindata/grapher"
@@ -34,7 +35,6 @@ import {
     EditorDatabase,
     Log,
     References,
-    ChartRedirect,
     ChartEditorManager,
     Dataset,
     getFullReferencesCount,

adminSiteClient/EditorReferencesTab.tsx

@@ -2,14 +2,17 @@ import React from "react"
 import { observer } from "mobx-react"
 import {
     ChartEditor,
-    ChartRedirect,
     References,
     getFullReferencesCount,
 } from "./ChartEditor.js"
 import { computed, action, observable, runInAction } from "mobx"
 import { BAKED_GRAPHER_URL } from "../settings/clientSettings.js"
 import { AdminAppContext, AdminAppContextType } from "./AdminAppContext.js"
-import { stringifyUnknownError, formatValue } from "@ourworldindata/utils"
+import {
+    stringifyUnknownError,
+    formatValue,
+    ChartRedirect,
+} from "@ourworldindata/utils"
 
 const BASE_URL = BAKED_GRAPHER_URL.replace(/^https?:\/\//, "")
 

adminSiteServer/adminRouter.tsx

@@ -42,7 +42,7 @@ import {
     renderDataPageV2,
     renderPreviewDataPageOrGrapherPage,
 } from "../baker/GrapherBaker.js"
-import { Chart } from "../db/model/Chart.js"
+import { getChartConfigBySlug } from "../db/model/Chart.js"
 import { getVariableMetadata } from "../db/model/Variable.js"
 import { DbPlainDatasetFile, DbPlainDataset } from "@ourworldindata/types"
 
@@ -324,11 +324,12 @@ adminRouter.get("/datapage-preview/:id", async (req, res) => {
 })
 
 adminRouter.get("/grapher/:slug", async (req, res) => {
-    const entity = await Chart.getBySlug(req.params.slug)
-    if (!entity) throw new JsonError("No such chart", 404)
-
     const previewDataPageOrGrapherPage = db.knexReadonlyTransaction(
-        async (knex) => renderPreviewDataPageOrGrapherPage(entity.config, knex)
+        async (knex) => {
+            const entity = await getChartConfigBySlug(knex, req.params.slug)
+            if (!entity) throw new JsonError("No such chart", 404)
+            return renderPreviewDataPageOrGrapherPage(entity.config, knex)
+        }
     )
     res.send(previewDataPageOrGrapherPage)
 })