Fix normalization for typesless nodes inside toplevel elements

navikt · Nov 29, 2024 · fb4b2ec · fb4b2ec
1 parent ec5c734
commit fb4b2ec
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 5 deletions.
diff --git a/frontend/src/plate/plugins/normalize-node.test.ts b/frontend/src/plate/plugins/normalize-node.test.ts
@@ -1,20 +1,24 @@
 import { describe, expect, it } from 'bun:test';
-import { saksbehandlerPlugins } from '@app/plate/plugins/plugin-sets/saksbehandler';
+import { ELEMENT_MALTEKSTSEKSJON, ELEMENT_REDIGERBAR_MALTEKST } from '@app/plate/plugins/element-types';
+import { normalizeNodePlugin } from '@app/plate/plugins/normalize-node';
+import { TemplateSections } from '@app/plate/template-sections';
 import { createSimpleParagraph } from '@app/plate/templates/helpers';
 import {
   type BulletListElement,
   type H1Element,
   type KabalValue,
   type ListItemContainerElement,
   type ListItemElement,
+  type MaltekstseksjonElement,
   type ParagraphElement,
+  type RedigerbarMaltekstElement,
   TextAlign,
 } from '@app/plate/types';
 import { BaseParagraphPlugin, replaceNode } from '@udecode/plate-common';
 import { createPlateEditor } from '@udecode/plate-core/react';
 import { BaseBulletedListPlugin, BaseListItemContentPlugin, BaseListItemPlugin } from '@udecode/plate-list';
 
-const createEditor = (value: KabalValue) => createPlateEditor({ plugins: saksbehandlerPlugins, value });
+const createEditor = (value: KabalValue) => createPlateEditor({ plugins: [normalizeNodePlugin], value });
 
 describe('normalize node with missing type prop', () => {
   it('should fix LICs', () => {
@@ -65,4 +69,38 @@ describe('normalize node with missing type prop', () => {
 
     expect(editor.children).toEqual([defaultedNode]);
   });
+
+  it('should fix descendants inside redigerbar maltekst (top level element)', () => {
+    const invalidParagraph: ParagraphElement = { children: [{ text: 'some text' }] } as ParagraphElement;
+    const invalidRedigerbarMaltekst: RedigerbarMaltekstElement = {
+      type: ELEMENT_REDIGERBAR_MALTEKST,
+      section: TemplateSections.ANFOERSLER,
+      children: [invalidParagraph],
+    };
+    const invalidMaltekstseksjon: MaltekstseksjonElement = {
+      type: ELEMENT_MALTEKSTSEKSJON,
+      section: TemplateSections.REGELVERK_TITLE,
+      textIdList: [],
+      children: [invalidRedigerbarMaltekst],
+    };
+
+    const editor = createEditor([createSimpleParagraph()]);
+
+    replaceNode(editor, { at: [0], nodes: invalidMaltekstseksjon });
+
+    const validParagraph: ParagraphElement = { children: [{ text: 'some text' }] } as ParagraphElement;
+    const validRedigerbarMaltekst: RedigerbarMaltekstElement = {
+      type: ELEMENT_REDIGERBAR_MALTEKST,
+      section: TemplateSections.ANFOERSLER,
+      children: [validParagraph],
+    };
+    const validMaltekstseksjon: MaltekstseksjonElement = {
+      type: ELEMENT_MALTEKSTSEKSJON,
+      section: TemplateSections.REGELVERK_TITLE,
+      textIdList: [],
+      children: [validRedigerbarMaltekst],
+    };
+
+    expect(editor.children).toEqual([validMaltekstseksjon]);
+  });
 });
diff --git a/frontend/src/plate/plugins/normalize-node.ts b/frontend/src/plate/plugins/normalize-node.ts
@@ -103,19 +103,33 @@ export const normalizeNodePlugin = createPlatePlugin({
 
         const [parentNode] = parentEntry;
 
+        if (isEditor(parentNode)) {
+          pushLog(
+            'Missing node type, element at top level in editor. Setting type to paragraph.',
+            options,
+            LogLevel.WARN,
+          );
+
+          return setNodes(
+            editor,
+            { type: BaseParagraphPlugin.node.type, align: TextAlign.LEFT },
+            { at: [], match: (n) => n === node },
+          );
+        }
+
         const isParentTopLevelElement = isTopLevelElement(parentNode);
 
-        if (isParentTopLevelElement || isEditor(parentNode)) {
+        if (isParentTopLevelElement) {
           pushLog(
-            `Missing node type, element at top level in "${isParentTopLevelElement ? parentNode.type : 'editor'}". Setting type to paragraph.`,
+            `Missing node type, element at top level in "${parentNode.type}". Setting type to paragraph.`,
             options,
             LogLevel.WARN,
           );
 
           return setNodes(
             editor,
             { type: BaseParagraphPlugin.node.type, align: TextAlign.LEFT },
-            { at: path, match: (n) => n === node },
+            { match: (n) => n === node },
           );
         }