🚧 staging environment - entry emulator

adminSiteClient/gdocsDeploy.ts

@@ -59,6 +59,7 @@ export const checkIsLightningUpdate = (
         "cover-color": true,
         "cover-image": true,
         "hide-citation": true,
+        "sidebar-toc": true,
         body: true,
         dateline: true,
         details: true,

baker/SiteBaker.tsx

@@ -316,6 +316,7 @@ export class SiteBaker {
 
     // Bake all GDoc posts
     async bakeGDocPosts() {
+        await db.getConnection()
         if (!this.bakeSteps.has("gdocPosts")) return
         const publishedGdocs = await Gdoc.getPublishedGdocs()
 

db/migrateWpPostsToArchieMl.ts

@@ -168,6 +168,7 @@ const migrate = async (): Promise<void> => {
                     // Provide an empty array to prevent the sticky nav from rendering at all
                     // Because if it isn't defined, it tries to automatically populate itself
                     "sticky-nav": isEntry ? [] : undefined,
+                    "sidebar-toc": true,
                 },
                 relatedCharts,
                 published: false,

db/model/Gdoc/Gdoc.ts

@@ -633,6 +633,7 @@ export class Gdoc extends BaseEntity implements OwidGdocInterface {
                         "simple-text",
                         "sticky-left",
                         "sticky-right",
+                        "table",
                         "text"
                     ),
                 },

db/model/Gdoc/archieToEnriched.ts

@@ -121,28 +121,39 @@ function generateStickyNav(
 }
 
 function generateToc(
-    body: OwidEnrichedGdocBlock[]
+    body: OwidEnrichedGdocBlock[],
+    // For linear topic pages, we record h1s & h2s
+    // For the sdg-toc, we record h2s & h3s (as it was developed before we decided to use h1s as our top level heading)
+    { primary, secondary }: { primary: number; secondary: number }
 ): TocHeadingWithTitleSupertitle[] {
     const toc: TocHeadingWithTitleSupertitle[] = []
 
-    // track h2s and h3s for the SDG table of contents
     body.forEach((block) =>
         traverseEnrichedBlocks(block, (child) => {
             if (child.type === "heading") {
                 const { level, text, supertitle } = child
                 const titleString = spansToSimpleString(text)
-                const supertitleString =
-                    supertitle && spansToSimpleString(supertitle)
-                if (titleString && (level === 2 || level === 3)) {
+                const supertitleString = supertitle
+                    ? spansToSimpleString(supertitle)
+                    : ""
+                if (titleString && (level === primary || level === secondary)) {
                     toc.push({
                         title: titleString,
                         supertitle: supertitleString,
                         text: titleString,
                         slug: urlSlug(`${supertitleString} ${titleString}`),
-                        isSubheading: level === 3,
+                        isSubheading: level === secondary,
                     })
                 }
             }
+            if (child.type === "all-charts") {
+                toc.push({
+                    title: child.heading,
+                    text: child.heading,
+                    slug: ALL_CHARTS_ID,
+                    isSubheading: false,
+                })
+            }
         })
     )
 
@@ -255,7 +266,13 @@ export const archieToEnriched = (text: string): OwidGdocContent => {
     // Parse elements of the ArchieML into enrichedBlocks
     parsed.body = compact(parsed.body.map(parseRawBlocksToEnrichedBlocks))
 
-    parsed.toc = generateToc(parsed.body)
+    // the sdg-toc was based on h2s and h3s, but linear topic pages are using h1s and h2s
+    // It would be nice to standardise this but it would require a migration, updating CSS, updating Gdocs, etc.
+    const isTocForSidebar = parsed["sidebar-toc"] === "true"
+    const headingLevels = isTocForSidebar
+        ? { primary: 1, secondary: 2 }
+        : { primary: 2, secondary: 3 }
+    parsed.toc = generateToc(parsed.body, headingLevels)
 
     const parsedRefs = parseRefs({
         refs: [...(parsed.refs ?? []), ...rawInlineRefs],

db/model/Gdoc/archieToGdoc.ts

@@ -49,6 +49,7 @@ function* owidArticleToArchieMLStringGenerator(
         }
         yield "[]"
     }
+    yield* propertyToArchieMLString("sidebar-toc", article)
     // TODO: inline refs
     yieldMultiBlockPropertyIfDefined("summary", article, article.summary)
     yield* propertyToArchieMLString("hide-citation", article)

db/model/Gdoc/enrichedToRaw.ts

@@ -34,6 +34,7 @@ import {
     RawBlockAlign,
     RawBlockEntrySummary,
     RawBlockVideo,
+    RawBlockTable,
 } from "@ourworldindata/utils"
 import { spanToHtmlString } from "./gdocUtils.js"
 import { match, P } from "ts-pattern"
@@ -400,5 +401,24 @@ export function enrichedBlockToRawBlock(
                 },
             }
         })
+        .with({ type: "table" }, (b): RawBlockTable => {
+            return {
+                type: b.type,
+                value: {
+                    template: b.template,
+                    rows: b.rows.map((row) => ({
+                        type: row.type,
+                        value: {
+                            cells: row.cells.map((cell) => ({
+                                type: cell.type,
+                                value: cell.content.map(
+                                    enrichedBlockToRawBlock
+                                ),
+                            })),
+                        },
+                    })),
+                },
+            }
+        })
         .exhaustive()
 }

db/model/Gdoc/exampleEnrichedBlocks.ts

@@ -441,4 +441,91 @@ export const enrichedBlockExamples: Record<
         items: [{ text: "Hello", slug: "#link-to-something" }],
         parseErrors: [],
     },
+    table: {
+        type: "table",
+        template: "header-row",
+        rows: [
+            {
+                type: "table-row",
+                cells: [
+                    {
+                        type: "table-cell",
+                        content: [
+                            {
+                                type: "text",
+                                value: [
+                                    {
+                                        spanType: "span-simple-text",
+                                        text: "City",
+                                    },
+                                ],
+                                parseErrors: [],
+                            },
+                            {
+                                type: "text",
+                                value: [
+                                    {
+                                        spanType: "span-simple-text",
+                                        text: "Continent",
+                                    },
+                                ],
+                                parseErrors: [],
+                            },
+                        ],
+                    },
+                    {
+                        type: "table-cell",
+                        content: [
+                            {
+                                type: "text",
+                                value: [
+                                    {
+                                        spanType: "span-simple-text",
+                                        text: "Wellington",
+                                    },
+                                ],
+                                parseErrors: [],
+                            },
+                            {
+                                type: "text",
+                                value: [
+                                    {
+                                        spanType: "span-simple-text",
+                                        text: "Zealandia",
+                                    },
+                                ],
+                                parseErrors: [],
+                            },
+                        ],
+                    },
+                    {
+                        type: "table-cell",
+                        content: [
+                            {
+                                type: "text",
+                                value: [
+                                    {
+                                        spanType: "span-simple-text",
+                                        text: "Addis Ababa",
+                                    },
+                                ],
+                                parseErrors: [],
+                            },
+                            {
+                                type: "text",
+                                value: [
+                                    {
+                                        spanType: "span-simple-text",
+                                        text: "Africa",
+                                    },
+                                ],
+                                parseErrors: [],
+                            },
+                        ],
+                    },
+                ],
+            },
+        ],
+        parseErrors: [],
+    },
 }