Merge branch 'main' into feat/fjern-familie-fra-url

navikt · Mar 13, 2024 · 3c01ad2 · 3c01ad2
2 parents 7ab684a + 930ae9f
commit 3c01ad2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/src/csp.ts b/src/csp.ts
@@ -26,6 +26,7 @@ export const cspMap = (dekoratorenUrl: string): Record<string, string[]> => {
         'connect-src': [
             "'self'",
             '*.nav.no',
+            'by26nl8j.apicdn.sanity.io',
             'amplitude.nav.no',
             '*.psplugin.com',
             'familie-dokument.dev.nav.no',

diff --git a/src/frontend/components/Felleskomponenter/Sanity/TekstBlock.tsx b/src/frontend/components/Felleskomponenter/Sanity/TekstBlock.tsx
@@ -109,6 +109,10 @@ const TekstBlock: React.FC<{
                         );
                     },
                 },
+                types: {
+                    flettefelt: props =>
+                        flettefeltTilTekst(props.value.flettefelt, flettefelter, valgtLocale),
+                },
             }}
         />
     ) : null;

diff --git a/src/frontend/utils/sanity.ts b/src/frontend/utils/sanity.ts
@@ -129,6 +129,8 @@ export const plainTekstHof =
                         ? pipe(node => node, ...transformedMarks)(child).text
                         : pipe(node => node)(child).text;
                     previousElementIsNonSpan = false;
+                } else if (child._type == 'flettefelt') {
+                    tekst += flettefeltTilTekst(child.flettefelt, flettefelter, spesifikkLocale);
                 } else {
                     previousElementIsNonSpan = true;
                 }