🐛 (admin) mark unpublished charts as drafts

owid · Sep 4, 2024 · d5ecaed · d5ecaed
1 parent 3cc05db
commit d5ecaed
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/adminSiteServer/apiRouter.ts b/adminSiteServer/apiRouter.ts
@@ -573,7 +573,12 @@ getRouteWithROTransaction(apiRouter, "/charts.json", async (req, res, trx) => {
 
     await assignTagsForCharts(trx, charts)
 
-    return { charts }
+    return {
+        charts: charts.map((chart) => ({
+            ...chart,
+            isPublished: chart.isPublished === "true",
+        })),
+    }
 })
 
 getRouteWithROTransaction(apiRouter, "/charts.csv", async (req, res, trx) => {
@@ -1254,9 +1259,10 @@ getRouteWithROTransaction(
             variable.catalogPath += `#${variable.shortName}`
         }
 
-        const charts = await db.knexRaw<OldChartFieldList>(
-            trx,
-            `-- sql
+        const charts = (
+            await db.knexRaw<OldChartFieldList>(
+                trx,
+                `-- sql
                 SELECT ${oldChartFieldList}
                 FROM charts
                 JOIN chart_configs ON chart_configs.id = charts.configId
@@ -1266,8 +1272,12 @@ getRouteWithROTransaction(
                 WHERE cd.variableId = ?
                 GROUP BY charts.id
             `,
-            [variableId]
-        )
+                [variableId]
+            )
+        ).map((chart) => ({
+            ...chart,
+            isPublished: chart.isPublished === "true",
+        }))
 
         await assignTagsForCharts(trx, charts)
 
@@ -1497,7 +1507,10 @@ getRouteWithROTransaction(
             [datasetId]
         )
 
-        dataset.charts = charts
+        dataset.charts = charts.map((chart) => ({
+            ...chart,
+            isPublished: chart.isPublished === "true",
+        }))
 
         await assignTagsForCharts(trx, charts)
 
@@ -1894,7 +1907,10 @@ getRouteWithROTransaction(
             `,
             uncategorized ? [] : [tagId]
         )
-        tag.charts = charts
+        tag.charts = charts.map((chart) => ({
+            ...chart,
+            isPublished: chart.isPublished === "true",
+        }))
 
         await assignTagsForCharts(trx, charts)
 

diff --git a/db/model/Chart.ts b/db/model/Chart.ts
@@ -420,7 +420,7 @@ export interface OldChartFieldList {
     type: string
     internalNotes: string
     variantName: string
-    isPublished: boolean
+    isPublished: string | null
     tab: string
     hasChartTab: boolean
     hasMapTab: boolean