Merge branch 'malj2548' into staging

equinor · Oct 4, 2024 · c2d54e5 · c2d54e5
2 parents ec3be2f + cca5235
commit c2d54e5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/web/pageComponents/pageTemplates/News.tsx b/web/pageComponents/pageTemplates/News.tsx
@@ -136,6 +136,12 @@ const NewsPage = ({ data: news }: ArticleProps) => {
 
   const openGraphImages = getOpenGraphImages((openGraphImage?.asset ? openGraphImage : null) || heroImage?.image)
   /*   appInsights.trackPageView({ name: slug, uri: fullUrl }) */
+
+  const formattedContent = content.map(block => ({
+    ...block,
+    markDefs: block.markDefs || [], 
+  }));
+
   return (
     <>
       <NextSeo
@@ -152,11 +158,6 @@ const NewsPage = ({ data: news }: ArticleProps) => {
           url: fullUrl,
           images: openGraphImages,
         }}
-        // twitter={{
-        //   handle: '@handle',
-        //   site: '@site',
-        //   cardType: 'summary_large_image',
-        // }}
       ></NextSeo>
       <NewsArticleJsonLd
         url={fullUrl}
@@ -210,14 +211,14 @@ const NewsPage = ({ data: news }: ArticleProps) => {
               </LeadParagraph>
             )}
 
-            {content && content.length > 0 && (
+          {content && content.length > 0 && (
               <Blocks
-                value={content}
+                value={formattedContent}
                 proseClassName="prose-article"
                 className="p-0 max-w-viewport mx-auto"
                 includeFootnotes
               />
-            )}
+            )} 
             <div className="mt-8 mb-2 px-layout-lg max-w-viewport mx-auto">
               <Footnotes blocks={[...ingress, ...content]} />
             </div>

diff --git a/web/pageComponents/shared/portableText/components/Footnotes.tsx b/web/pageComponents/shared/portableText/components/Footnotes.tsx
@@ -14,9 +14,8 @@ function Footnotes({ blocks }: { blocks: PortableTextBlock[] }) {
     // make an array of the mark definitions of those blocks
     //@ts-ignore
     .reduce((acc, curr) => {
-      //TODO: look into more correct reduce
-      //@ts-ignore
-      return [...acc, ...curr?.markDefs]
+      const markDefs = Array.isArray(curr?.markDefs) ? curr.markDefs : []
+      return [...acc, ...markDefs]
     }, [])
     // find all the footnote mark definitions
     //@ts-ignore