feat: merges action into button

Author: Evan Greer

src/__tests__/IterableEmbeddedMessageElementsButton.test.ts

@@ -1,5 +1,4 @@
 import { IterableEmbeddedMessageElementsButton } from '../embedded/classes/IterableEmbeddedMessageElementsButton';
-import { IterableEmbeddedMessageElementsButtonAction } from '../embedded/classes/IterableEmbeddedMessageElementsButtonAction';
 import { Iterable } from '../core/classes/Iterable';
 
 describe('IterableEmbeddedMessageButton', () => {
@@ -14,14 +13,12 @@ describe('IterableEmbeddedMessageButton', () => {
       action: { type: 'openUrl', data: 'https://example.com' },
     };
 
-    const button = IterableEmbeddedMessageElementsButton.fromDict(dict);
+    const button = new IterableEmbeddedMessageElementsButton(dict);
 
     expect(button).toBeInstanceOf(IterableEmbeddedMessageElementsButton);
     expect(button.id).toBe('button-123');
     expect(button.title).toBe('Click Me!');
-    expect(button.action).toBeInstanceOf(
-      IterableEmbeddedMessageElementsButtonAction
-    );
+    expect(button.action).toBeInstanceOf(Object);
     expect(button.action?.type).toBe('openUrl');
     expect(button.action?.data).toBe('https://example.com');
   });
@@ -31,7 +28,7 @@ describe('IterableEmbeddedMessageButton', () => {
 
     const dict = { id: 'button-123' };
 
-    const button = IterableEmbeddedMessageElementsButton.fromDict(dict);
+    const button = new IterableEmbeddedMessageElementsButton(dict);
 
     expect(button).toBeInstanceOf(IterableEmbeddedMessageElementsButton);
     expect(button.id).toBe('button-123');
@@ -47,23 +44,23 @@ describe('IterableEmbeddedMessageButton', () => {
       title: 'Click Me!',
     };
 
-    const button = IterableEmbeddedMessageElementsButton.fromDict(dict);
+    const button = new IterableEmbeddedMessageElementsButton(dict);
 
     expect(button).toBeInstanceOf(IterableEmbeddedMessageElementsButton);
     expect(button.id).toBe('button-123');
     expect(button.title).toBe('Click Me!');
     expect(button.action).toBeUndefined();
   });
 
-  it('should throw an error if id is missing in fromDict', () => {
+  it('should throw an error if id is missing', () => {
     Iterable.logger.log('iterableEmbeddedMessageButton_fromDict_missing_id');
 
     const dict = {
       title: 'Click Me!',
       action: { type: 'openUrl', data: 'https://example.com' },
     };
-
-    expect(() => IterableEmbeddedMessageElementsButton.fromDict(dict)).toThrow(
+    // @ts-expect-error - id is purposely missing
+    expect(() => new IterableEmbeddedMessageElementsButton(dict)).toThrow(
       'id is required'
     );
   });
@@ -78,13 +75,11 @@ describe('IterableEmbeddedMessageButton', () => {
       action: { type: 'close' },
     };
 
-    const button = IterableEmbeddedMessageElementsButton.fromDict(dict);
+    const button = new IterableEmbeddedMessageElementsButton(dict);
 
     expect(button).toBeInstanceOf(IterableEmbeddedMessageElementsButton);
     expect(button.id).toBe('button-123');
-    expect(button.action).toBeInstanceOf(
-      IterableEmbeddedMessageElementsButtonAction
-    );
+    expect(button.action).toBeInstanceOf(Object);
     expect(button.action?.type).toBe('close');
     expect(button.action?.data).toBeUndefined();
   });

src/__tests__/IterableEmbeddedMessageElementsButtonAction.test.ts

@@ -67,8 +67,8 @@ export class IterableEmbeddedMessageElements {
       ? IterableEmbeddedMessageDefaultAction.fromDict(dict.defaultAction)
       : undefined;
 
-    const buttons = dict.buttons?.map((button) =>
-      IterableEmbeddedMessageElementsButton.fromDict(button)
+    const buttons = dict.buttons?.map(
+      (button) => new IterableEmbeddedMessageElementsButton(button)
     );
 
     const text = dict.text?.map((text) =>

src/embedded/classes/IterableEmbeddedMessageElements.ts

@@ -1,5 +1,3 @@
-import { IterableEmbeddedMessageElementsButtonAction } from './IterableEmbeddedMessageElementsButtonAction';
-
 /**
  * IterableEmbeddedMessageElementsButton represents a button in an embedded message.
  */
@@ -9,45 +7,30 @@ export class IterableEmbeddedMessageElementsButton {
   /** The title for the embedded message button */
   readonly title?: string;
   /** The action for the embedded message button */
-  readonly action?: IterableEmbeddedMessageElementsButtonAction;
+  readonly action?: {
+    type: string;
+    data?: string;
+  };
 
   /**
    * Creates an instance of IterableEmbeddedMessageButton.
    *
-   * @param id - The ID for the embedded message button.
-   * @param title - The title for the embedded message button.
-   * @param action - The action for the embedded message button.
-   */
-  constructor(
-    id: string,
-    title?: string,
-    action?: IterableEmbeddedMessageElementsButtonAction
-  ) {
-    this.id = id;
-    this.title = title;
-    this.action = action;
-  }
-
-  /**
-   * Creates an instance of `IterableEmbeddedMessageButton` from a dictionary object.
-   *
    * @param dict - The dictionary object containing the properties to initialize the `IterableEmbeddedMessageButton` instance.
-   * @returns A new instance of `IterableEmbeddedMessageButton` initialized with the provided dictionary properties.
    */
-  static fromDict(
-    dict: Partial<EmbeddedMessageElementsButtonDict>
-  ): IterableEmbeddedMessageElementsButton {
+  constructor(dict: EmbeddedMessageElementsButtonDict) {
     if (!dict.id) {
       throw new Error('id is required');
     }
-    const action = dict.action
-      ? IterableEmbeddedMessageElementsButtonAction.fromDict(dict.action)
-      : undefined;
-    return new IterableEmbeddedMessageElementsButton(
-      dict.id,
-      dict.title,
-      action
-    );
+
+    this.id = dict.id;
+    this.title = dict.title;
+
+    if (dict.action) {
+      this.action = {
+        type: dict.action.type,
+        data: dict.action.data,
+      };
+    }
   }
 }
 
@@ -60,5 +43,8 @@ export interface EmbeddedMessageElementsButtonDict {
   /** The title for the embedded message button */
   title?: string;
   /** The action for the embedded message button */
-  action?: IterableEmbeddedMessageElementsButtonAction;
+  action?: {
+    type: string;
+    data?: string;
+  };
 }

src/embedded/classes/IterableEmbeddedMessageElementsButton.ts

@@ -1,5 +1,4 @@
 export * from './IterableEmbeddedManager';
 export * from './IterableEmbeddedPlacement';
 export * from './IterableEmbeddedMessageElementsButton';
-export * from './IterableEmbeddedMessageElementsButtonAction';
 export * from './IterableEmbeddedMessageMetadata';