Merge pull request #21 from prezly/feature/dev-10834-implement-change…

…s-to-contact-cards-in-new-themes [DEV-10834] Update ContactNode type, use it in email content format
prezly · May 23, 2023 · 1ad13b5 · 1ad13b5
2 parents 4825f36 + a81db63
commit 1ad13b5
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/content-format/src/nodes/ContactNode.ts b/packages/content-format/src/nodes/ContactNode.ts
@@ -1,5 +1,5 @@
 import { Element } from '../Element';
-import { isObject, isUuid } from '../validation';
+import { isBoolean, isEnum, isObject, isUuid } from '../validation';
 
 interface NewsroomContact {
     uuid: string;
@@ -9,6 +9,8 @@ export interface ContactNode extends Element<typeof ContactNode.TYPE> {
     uuid: string;
     reference: NewsroomContact['uuid'] | null;
     contact: ContactNode.ContactInfo;
+    layout: ContactNode.Layout;
+    show_avatar: boolean;
 }
 
 export namespace ContactNode {
@@ -28,12 +30,22 @@ export namespace ContactNode {
         address: string;
     }
 
+    export enum Layout {
+        CARD = 'card',
+        SIGNATURE = 'signature',
+    }
+
     export function isContactNode(value: any): value is ContactNode {
         return Element.isElement(value, TYPE);
     }
 
     export function validateContactNode(value: any): ContactNode | null {
-        const isValid = isContactNode(value) && isUuid(value.uuid) && isObject(value.contact);
+        const isValid =
+            isContactNode(value) &&
+            isUuid(value.uuid) &&
+            isObject(value.contact) &&
+            isEnum(value.layout, ContactNode.Layout) &&
+            isBoolean(value.show_avatar);
 
         return isValid ? value : null;
     }

diff --git a/packages/email-content-format/src/index.ts b/packages/email-content-format/src/index.ts
@@ -39,6 +39,7 @@ export namespace InlineNode {
 export type BlockNode =
     | AttachmentNode
     | BookmarkNode
+    | ContactNode
     | CoverageNode
     | DividerNode
     | EmbedNode
@@ -59,6 +60,7 @@ export namespace BlockNode {
     export function isBlockNode(value: any): value is BlockNode {
         return (
             AttachmentNode.isAttachmentNode(value) ||
+            ContactNode.isContactNode(value) ||
             CoverageNode.isCoverageNode(value) ||
             DividerNode.isDividerNode(value) ||
             EmbedNode.isEmbedNode(value) ||
@@ -80,6 +82,7 @@ export namespace BlockNode {
     export function validateBlockNode(value: any): BlockNode | null {
         return (
             AttachmentNode.validateAttachmentNode(value) ??
+            ContactNode.validateContactNode(value) ??
             CoverageNode.validateCoverageNode(value) ??
             DividerNode.validateDividerNode(value) ??
             EmbedNode.validateEmbedNode(value) ??
@@ -219,6 +222,7 @@ export namespace AttachmentNode {
 }
 
 export import BookmarkNode = Core.BookmarkNode;
+export import ContactNode = Core.ContactNode;
 export import CoverageNode = Core.CoverageNode;
 export import DividerNode = Core.DividerNode;
 export import EmbedNode = Core.EmbedNode;