use serializeChartConfig

owid · Sep 3, 2024 · eff6e94 · eff6e94
1 parent 7ba6412
commit eff6e94
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/adminSiteServer/apiRouter.ts b/adminSiteServer/apiRouter.ts
@@ -321,7 +321,11 @@ const saveNewChart = async (
             INSERT INTO chart_configs (id, patch, full)
             VALUES (?, ?, ?)
         `,
-        [configId, JSON.stringify(patchConfig), JSON.stringify(fullConfig)]
+        [
+            configId,
+            serializeChartConfig(patchConfig),
+            serializeChartConfig(fullConfig),
+        ]
     )
 
     // add a new chart to the charts table
@@ -397,7 +401,11 @@ const updateExistingChart = async (
                 cc.full=?
             WHERE c.id = ?
         `,
-        [JSON.stringify(patchConfig), JSON.stringify(fullConfig), chartId]
+        [
+            serializeChartConfig(patchConfig),
+            serializeChartConfig(fullConfig),
+            chartId,
+        ]
     )
 
     // update charts row

diff --git a/db/model/ChartConfigs.ts b/db/model/ChartConfigs.ts
@@ -1,4 +1,8 @@
-import { DbInsertChartConfig, GrapherInterface } from "@ourworldindata/types"
+import {
+    DbInsertChartConfig,
+    GrapherInterface,
+    serializeChartConfig,
+} from "@ourworldindata/types"
 
 import * as db from "../db.js"
 
@@ -28,7 +32,11 @@ export async function updateExistingConfigPair(
                 full = ?
             WHERE id = ?
         `,
-        [JSON.stringify(patchConfig), JSON.stringify(fullConfig), configId]
+        [
+            serializeChartConfig(patchConfig),
+            serializeChartConfig(fullConfig),
+            configId,
+        ]
     )
 }
 
@@ -63,6 +71,6 @@ async function updateExistingConfig(
             SET ?? = ?
             WHERE id = ?
         `,
-        [column, JSON.stringify(config), configId]
+        [column, serializeChartConfig(config), configId]
     )
 }