chore: LayoutBlock

deno-runtime/lib/accessors/builders/MessageBuilder.ts

@@ -1,4 +1,4 @@
-import { Block } from '@rocket.chat/ui-kit';
+import { LayoutBlock } from '@rocket.chat/ui-kit';
 
 import type { IMessageBuilder } from '@rocket.chat/apps-engine/definition/accessors/IMessageBuilder.ts';
 import type { RocketChatAssociationModel as _RocketChatAssociationModel } from '@rocket.chat/apps-engine/definition/metadata/RocketChatAssociations.ts';
@@ -184,7 +184,7 @@ export class MessageBuilder implements IMessageBuilder {
         return this.msg;
     }
 
-    public addBlocks(blocks: BlockBuilder | Array<IBlock | Block>) {
+    public addBlocks(blocks: BlockBuilder | Array<IBlock | LayoutBlock>) {
         if (!Array.isArray(this.msg.blocks)) {
             this.msg.blocks = [];
         }
@@ -198,7 +198,7 @@ export class MessageBuilder implements IMessageBuilder {
         return this as IMessageBuilder;
     }
 
-    public setBlocks(blocks: BlockBuilder | Array<IBlock | Block>) {
+    public setBlocks(blocks: BlockBuilder | Array<IBlock | LayoutBlock>) {
         if (blocks instanceof BlockBuilder) {
             this.msg.blocks = blocks.getBlocks();
         } else {

src/definition/accessors/IMessageBuilder.ts

@@ -1,4 +1,4 @@
-import type { Block } from '@rocket.chat/ui-kit';
+import type { LayoutBlock } from '@rocket.chat/ui-kit';
 
 import type { IMessage, IMessageAttachment } from '../messages';
 import type { RocketChatAssociationModel } from '../metadata';
@@ -210,19 +210,19 @@ export interface IMessageBuilder {
      * Adds a block collection to the message's
      * own collection
      */
-    addBlocks(blocks: BlockBuilder | Array<IBlock | Block>): IMessageBuilder;
+    addBlocks(blocks: BlockBuilder | Array<IBlock | LayoutBlock>): IMessageBuilder;
 
     /**
      * Sets the block collection of the message
      *
      * @param blocks
      */
-    setBlocks(blocks: BlockBuilder | Array<IBlock | Block>): IMessageBuilder;
+    setBlocks(blocks: BlockBuilder | Array<IBlock | LayoutBlock>): IMessageBuilder;
 
     /**
      * Gets the block collection of the message
      */
-    getBlocks(): Array<IBlock | Block>;
+    getBlocks(): Array<IBlock | LayoutBlock>;
 
     /**
      * Adds a custom field to the message.

src/definition/messages/IMessage.ts

@@ -1,4 +1,4 @@
-import type { Block } from '@rocket.chat/ui-kit';
+import type { LayoutBlock } from '@rocket.chat/ui-kit';
 
 import type { IRoom } from '../rooms';
 import type { IBlock } from '../uikit';
@@ -26,7 +26,7 @@ export interface IMessage {
     groupable?: boolean;
     parseUrls?: boolean;
     customFields?: { [key: string]: any };
-    blocks?: Array<IBlock | Block>;
+    blocks?: Array<IBlock | LayoutBlock>;
     starred?: Array<{ _id: string }>;
     pinned?: boolean;
     pinnedAt?: Date;

src/definition/uikit/IUIKitSurface.ts

@@ -1,4 +1,4 @@
-import type { Block, ButtonElement, TextObject } from '@rocket.chat/ui-kit';
+import type { ButtonElement, LayoutBlock, TextObject } from '@rocket.chat/ui-kit';
 
 import type { IBlock, IButtonElement, ITextObject } from './blocks';
 
@@ -13,7 +13,7 @@ export interface IUIKitSurface {
     id: string;
     type: UIKitSurfaceType;
     title: ITextObject | TextObject;
-    blocks: Array<IBlock | Block>;
+    blocks: Array<IBlock | LayoutBlock>;
     close?: IButtonElement | ButtonElement;
     submit?: IButtonElement | ButtonElement;
     state?: object;

src/server/accessors/MessageBuilder.ts

@@ -1,4 +1,4 @@
-import type { Block } from '@rocket.chat/ui-kit';
+import type { LayoutBlock } from '@rocket.chat/ui-kit';
 
 import type { IMessageBuilder } from '../../definition/accessors';
 import type { IMessage, IMessageAttachment } from '../../definition/messages';
@@ -177,7 +177,7 @@ export class MessageBuilder implements IMessageBuilder {
         return this.msg;
     }
 
-    public addBlocks(blocks: BlockBuilder | Array<IBlock | Block>) {
+    public addBlocks(blocks: BlockBuilder | Array<IBlock | LayoutBlock>) {
         if (!Array.isArray(this.msg.blocks)) {
             this.msg.blocks = [];
         }
@@ -191,7 +191,7 @@ export class MessageBuilder implements IMessageBuilder {
         return this;
     }
 
-    public setBlocks(blocks: BlockBuilder | Array<IBlock | Block>) {
+    public setBlocks(blocks: BlockBuilder | Array<IBlock | LayoutBlock>) {
         if (blocks instanceof BlockBuilder) {
             this.msg.blocks = blocks.getBlocks();
         } else {

src/server/messages/Message.ts

@@ -1,4 +1,4 @@
-import type { Block } from '@rocket.chat/ui-kit';
+import type { LayoutBlock } from '@rocket.chat/ui-kit';
 
 import type { IMessage, IMessageAttachment, IMessageFile, IMessageReactions } from '../../definition/messages';
 import type { IUser, IUserLookup } from '../../definition/users';
@@ -40,7 +40,7 @@ export class Message implements IMessage {
 
     public file?: IMessageFile;
 
-    public blocks?: Array<Block>;
+    public blocks?: Array<LayoutBlock>;
 
     public starred?: Array<{ _id: string }>;
 

src/server/misc/UIHelper.ts

@@ -1,4 +1,4 @@
-import type { Block } from '@rocket.chat/ui-kit';
+import type { LayoutBlock } from '@rocket.chat/ui-kit';
 import { v4 as uuid } from 'uuid';
 
 import type { IBlock } from '../../definition/uikit';
@@ -10,8 +10,8 @@ export class UIHelper {
      * @param appId the appId that will be assigned to
      * @returns the array of block with the ids properties assigned
      */
-    public static assignIds(blocks: Array<IBlock | Block>, appId: string): Array<IBlock | Block> {
-        blocks.forEach((block: (IBlock | Block) & { appId?: string; blockId?: string; elements?: Array<any> }) => {
+    public static assignIds(blocks: Array<IBlock | LayoutBlock>, appId: string): Array<IBlock | LayoutBlock> {
+        blocks.forEach((block: (IBlock | LayoutBlock) & { appId?: string; blockId?: string; elements?: Array<any> }) => {
             if (!block.appId) {
                 block.appId = appId;
             }