Fix type of EnrichedBlockCode

owid · Dec 17, 2024 · f21f3ef · f21f3ef
1 parent d707a42
commit f21f3ef
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 8 deletions.
diff --git a/db/model/Gdoc/enrichedToMarkdown.ts b/db/model/Gdoc/enrichedToMarkdown.ts
@@ -129,7 +129,9 @@ ${items}
         )
         .with({ type: "code" }, (b): string | undefined => {
             return (
-                "```\n" + b.text.map((text) => text.value).join("\n") + "\n```"
+                "```\n" +
+                b.text.map((text) => text.value.text).join("\n") +
+                "\n```"
             )
         })
         .with({ type: "donors" }, (_): string | undefined =>

diff --git a/db/model/Gdoc/enrichedToRaw.ts b/db/model/Gdoc/enrichedToRaw.ts
@@ -127,7 +127,10 @@ export function enrichedBlockToRawBlock(
             { type: "code" },
             (b): RawBlockCode => ({
                 type: b.type,
-                value: b.text,
+                value: b.text.map((text) => ({
+                    type: "text",
+                    value: text.value.text,
+                })),
             })
         )
         .with(

diff --git a/db/model/Gdoc/exampleEnrichedBlocks.ts b/db/model/Gdoc/exampleEnrichedBlocks.ts
@@ -125,8 +125,12 @@ export const enrichedBlockExamples: Record<
         type: "code",
         text: [
             {
-                type: "text",
-                value: '<iframe src="https://ourworldindata.org/grapher/children-per-woman-un?region=Africa&tab=map" loading="lazy" style="width: 100%; height: 600px; border: 0px none;" allow="web-share; clipboard-write"></iframe>',
+                type: "simple-text",
+                value: {
+                    spanType: "span-simple-text",
+                    text: '<iframe src="https://ourworldindata.org/grapher/children-per-woman-un?region=Africa&tab=map" loading="lazy" style="width: 100%; height: 600px; border: 0px none;" allow="web-share; clipboard-write"></iframe>',
+                },
+                parseErrors: [],
             },
         ],
         parseErrors: [],

diff --git a/db/model/Gdoc/rawToEnriched.ts b/db/model/Gdoc/rawToEnriched.ts
@@ -500,8 +500,12 @@ const parseCode = (raw: RawBlockCode): EnrichedBlockCode => {
     return {
         type: "code",
         text: raw.value.map((text) => ({
-            type: "text",
-            value: toAsciiQuotes(text.value),
+            type: "simple-text",
+            value: {
+                spanType: "span-simple-text",
+                text: toAsciiQuotes(text.value),
+            },
+            parseErrors: [],
         })),
         parseErrors: [],
     }

diff --git a/packages/@ourworldindata/types/src/gdocTypes/ArchieMlComponents.ts b/packages/@ourworldindata/types/src/gdocTypes/ArchieMlComponents.ts
@@ -93,7 +93,7 @@ export type RawBlockCode = {
 
 export type EnrichedBlockCode = {
     type: "code"
-    text: RawBlockText[]
+    text: EnrichedBlockSimpleText[]
 } & EnrichedBlockWithParseErrors
 
 export type RawBlockDonorList = {
@@ -368,6 +368,7 @@ export type EnrichedBlockSimpleText = {
     type: "simple-text"
     value: SpanSimpleText
 } & EnrichedBlockWithParseErrors
+
 export type RawBlockHtml = {
     type: "html"
     value: string

diff --git a/site/gdocs/components/ArticleBlock.tsx b/site/gdocs/components/ArticleBlock.tsx
@@ -249,7 +249,7 @@ export default function ArticleBlock({
         .with({ type: "code" }, (block) => (
             <CodeSnippet
                 className={getLayout("code-snippet", containerType)}
-                code={block.text.map((text) => text.value).join("\n")}
+                code={block.text.map((text) => text.value.text).join("\n")}
             />
         ))
         .with({ type: "donors" }, (_block) => (