Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(inbox): card layouts for channel, email, and calls (#4725)
dev-rb884846a25c49
diff --git a/js/app/packages/app/component/next-soup/soup-view/views/inbox/inbox-card-layouts.tsx b/js/app/packages/app/component/next-soup/soup-view/views/inbox/inbox-card-layouts.tsxindex 032b3ae2e8..71b3a0fe16 100644--- a/js/app/packages/app/component/next-soup/soup-view/views/inbox/inbox-card-layouts.tsx+++ b/js/app/packages/app/component/next-soup/soup-view/views/inbox/inbox-card-layouts.tsx@@ -1,18 +1,21 @@import { ListPropertyValue } from '@app/component/next-soup/soup-view/views/tasks/list-property-value';-import { MediaViewerDialog } from '@channel/Media/MediaViewerDialog';-import { type MediaItem, mapMediaItems } from '@channel/Media/media-items';+import { formatCallDuration } from '@block-call/utils';import { BotIcon } from '@channel/Message/BotIcon';import { MACRO_AI_BOT_ID, MACRO_AI_NAME } from '@channel/macroAi';import { EntityIcon, getEntityIconType } from '@core/component/EntityIcon';-import { ItemPreview } from '@core/component/ItemPreview';import { StaticMarkdown } from '@core/component/LexicalMarkdown/component/core/StaticMarkdown';-import { unifiedListMarkdownTheme } from '@core/component/LexicalMarkdown/theme';+import {+ createTheme,+ twoLineClampMarkdownTheme,+ unifiedListMarkdownTheme,+} from '@core/component/LexicalMarkdown/theme';import { UserIcon } from '@core/component/UserIcon';import { isMacroAgentId } from '@core/constant/macroAgent';import { useUserId } from '@core/context/user';import { tryMacroId, useDisplayName } from '@core/user';import { plural } from '@core/util/string';import {+ DraftBadge,type EntityData,isGithubPrEntity,type Notification,@@ -28,6 +31,7 @@ import ArrowBendUpLeftIcon from '@phosphor-icons/core/regular/arrow-bend-up-leftimport AtIcon from '@phosphor-icons/core/regular/at.svg?component-solid';import ChatCircleIcon from '@phosphor-icons/core/regular/chat-circle.svg?component-solid';import ChatTextIcon from '@phosphor-icons/core/regular/chat-text.svg?component-solid';+import PaperclipIcon from '@phosphor-icons/core/regular/paperclip.svg?component-solid';import PhoneIcon from '@phosphor-icons/core/regular/phone.svg?component-solid';import UserPlusIcon from '@phosphor-icons/core/regular/user-plus.svg?component-solid';import {@@ -37,18 +41,9 @@ import {import type { PropertyApiValues, Property as PropertyT } from '@property/types';import { senderFromStorageId } from '@queries/channel/message-sender';import { useBulkSaveEntityPropertiesMutation } from '@queries/properties/entity';-import { stringToItemType } from '@service-storage/client';import { EntityType } from '@service-storage/generated/schemas';import { Avatar, cn, Tooltip } from '@ui';-import {- createMemo,- createSignal,- For,- type JSX,- Match,- Show,- Switch,-} from 'solid-js';+import { createMemo, For, type JSX, Match, Show, Switch } from 'solid-js';import { Dynamic } from 'solid-js/web';import { match, P } from 'ts-pattern';import { InboxCard, type InboxCardAttachment } from './InboxCard';@@ -422,7 +417,7 @@ const channelLocation = (entity: EntityData): string | undefined => {return undefined;}if (entity.channelType === 'direct_message') return undefined;- return entity.name.startsWith('#') ? entity.name : `#${entity.name}`;+ return entity.name.startsWith('#') ? entity.name.slice(1) : entity.name;};const entityLocation = (entity: EntityData): string | undefined => {@@ -529,6 +524,20 @@ function BaseCard(props: {);}+const inlineWrappingMarkdownTheme = createTheme(+ {+ root: 'md inline pr-[2px] cursor-default',+ paragraph: 'md-p text-[1em] inline',+ },+ twoLineClampMarkdownTheme+);++/** Fallback shown in place of message text when a message is just attachments. */+const attachmentSummary = (count: number): string | undefined =>+ count <= 0+ ? undefined+ : `sent ${count === 1 ? 'an' : count} ${plural('attachment', count)}`;+export function ChannelCardLayout(props: InboxCardLayoutProps) {const entity = createMemo(() => props.item.entity);@@ -569,21 +578,28 @@ export function ChannelCardLayout(props: InboxCardLayoutProps) {return participant;});- const senderLabel = () =>- messageSenderId() === currentUserId() ? 'You' : messageSenderName();+ const senderLabel = () => {+ if (messageSenderId() === currentUserId()) return 'You';+ return isDM() ? undefined : messageSenderName();+ };const text = createMemo(() => {- const location = channelLocation(entity());+ const value = entity();+ const location = channelLocation(value);const tag = getNotificationTag(props.item.notification);- const sender = isDM() ? entity().name || messageSenderName() : '';+ const sender = isDM() ? value.name || messageSenderName() : '';let action = '';if (tag === 'document_mention' && isDM()) {action = 'shared a document with you';}- const content = itemContent(entity(), props.item.notification);+ const content = itemContent(value, props.item.notification);+ const latestMessage =+ value.type === 'channel' ? value.latestRootMessage : undefined;++ const contentIsAttachmentSummary = !content?.trim() && !!latestMessage;return {title: buildActionLabel({@@ -591,7 +607,8 @@ export function ChannelCardLayout(props: InboxCardLayoutProps) {action,location,}),- content,+ content: contentIsAttachmentSummary ? attachmentSummary(1) : content,+ contentIsAttachmentSummary,};});@@ -630,19 +647,24 @@ export function ChannelCardLayout(props: InboxCardLayoutProps) {</InboxCard.Title></InboxCard.Header>- <div class="col-start-2 row-start-2 flex min-w-0 items-center gap-1 text-sm">- <InboxCard.Content class="truncate">+ <div class="col-start-2 row-start-2 min-w-0 text-sm">+ <InboxCard.Content class="line-clamp-2 min-h-[2lh]"><Show when={senderLabel()}><span class="whitespace-nowrap mr-1">{senderLabel()}:</span></Show><Show when={text().content?.trim()}>{(value) => (- <StaticMarkdown- markdown={value()}- singleLine- theme={unifiedListMarkdownTheme}- />+ <>+ <Show when={text().contentIsAttachmentSummary}>+ <PaperclipIcon class="mr-0.5 inline size-3.5 align-[-0.125em]" />+ </Show>+ <StaticMarkdown+ markdown={value()}+ singleLine+ theme={inlineWrappingMarkdownTheme}+ />+ </>)}</Show></InboxCard.Content>@@ -698,12 +720,6 @@ export function ChannelMessageCardLayout(props: InboxCardLayoutProps) {);}-/** Fallback shown in place of message text when a message is just attachments. */-const attachmentSummary = (count: number): string | undefined =>- count <= 0- ? undefined- : `sent ${count === 1 ? 'an' : count} ${plural('attachment', count)}`;-export function ChannelThreadCardLayout(props: InboxCardLayoutProps) {const isLatestNotificationReply = createMemo(() => {const notification = props.item.notification;@@ -751,46 +767,13 @@ export function ChannelThreadCardLayout(props: InboxCardLayoutProps) {const originalSenderLabel = () =>originalSenderId() === currentUserId() ? 'You' : originalSenderName();- // Media (images/videos) render in a clickable grid backed by the shared- // media viewer; non-media attachments keep their entity-preview tiles.- const mediaItems = createMemo<MediaItem[]>(() => {- if (- isLatestNotificationReply() ||- props.item.entity.type !== 'channel_thread'- )- return [];- return mapMediaItems(props.item.entity.attachments);- });-- const fileAttachments = createMemo<InboxCardAttachment[]>(() => {- if (- isLatestNotificationReply() ||- props.item.entity.type !== 'channel_thread'- )- return [];- return props.item.entity.attachments- .filter((attachment) => mapMediaItems([attachment]).length === 0)- .map(- (attachment): InboxCardAttachment => ({- id: attachment.entity_id,- fallback: () => (- <ItemPreview- id={attachment.entity_id}- type={stringToItemType(attachment.entity_type)}- />- ),- })- );- });-- const [viewerOpen, setViewerOpen] = createSignal(false);- const [viewerIndex, setViewerIndex] = createSignal(0);-const text = createMemo(() => {if (props.item.entity.type !== 'channel_thread') {return {title: '',content: '',+ contentIsAttachmentSummary: false,+ contextIsAttachmentSummary: false,};}@@ -801,18 +784,32 @@ export function ChannelThreadCardLayout(props: InboxCardLayoutProps) {let content: string | undefined;let context: string | undefined;+ let contentIsAttachmentSummary = false;+ let contextIsAttachmentSummary = false;if (metadata?.tag === 'channel_message_reply') {// Current message is the reply; the quoted context is the original (root).content = metadata.content.messageContent;+ if (!content.trim()) {+ const reply = props.item.entity.thread.preview.find(+ (candidate) => candidate.id === metadata.content.messageId+ );+ // Empty channel messages must contain at least one attachment. The+ // preview gives us the exact count when that reply is included.+ content = attachmentSummary(reply?.attachments.length || 1);+ contentIsAttachmentSummary = true;+ }const original = props.item.entity.content.trim();context = original.length? original: attachmentSummary(rootAttachments.length);+ contextIsAttachmentSummary = !original.length && !!context;} else {// Root message: fall back to an attachment summary when it has no text.content = itemContent(props.item.entity, props.item.notification);if (!content?.trim()) {- content = attachmentSummary(rootAttachments.length) ?? content;+ const summary = attachmentSummary(rootAttachments.length);+ content = summary ?? content;+ contentIsAttachmentSummary = !!summary;}}@@ -820,34 +817,36 @@ export function ChannelThreadCardLayout(props: InboxCardLayoutProps) {title: location,context,content,+ contentIsAttachmentSummary,+ contextIsAttachmentSummary,};});return (- <>- <InboxCard.Root- dimmed={!props.item.unread}- selected={props.selected}- highlighted={props.highlighted}- onClick={props.onClick}- >- <div class="col-start-1 row-start-2">- <InboxCard.Icon- fallback={- <ActionBubble tag={getNotificationTag(props.item.notification)} />- }- ></InboxCard.Icon>- </div>- <InboxCard.Body class="contents">- <div class={cn('col-start-2 row-start-2')}>- <InboxCard.Header class="self-center">- <InboxCard.Title class="flex items-center gap-1">- {text().title}- </InboxCard.Title>- </InboxCard.Header>-- {/* For replies, show the original message being replied to first,+ <InboxCard.Root+ dimmed={!props.item.unread}+ selected={props.selected}+ highlighted={props.highlighted}+ onClick={props.onClick}+ >+ <div class="col-start-1 row-start-2">+ <InboxCard.Icon+ fallback={+ <ActionBubble tag={getNotificationTag(props.item.notification)} />+ }+ ></InboxCard.Icon>+ </div>+ <InboxCard.Body class="contents">+ <div class={cn('col-start-2 row-start-2')}>+ <InboxCard.Header class="self-center">+ <InboxCard.Title class="flex items-center gap-1">+ {text().title}+ </InboxCard.Title>+ </InboxCard.Header>++ {/* For replies, show the original message being replied to first,with a left bar marking it as the quoted original. */}+ <div class="min-h-[2lh]"><Show when={isLatestNotificationReply() && text().context?.trim()}>{(context) => (<div class="flex min-w-0 items-center gap-1 border-l-2 border-edge-muted pl-2">@@ -855,6 +854,9 @@ export function ChannelThreadCardLayout(props: InboxCardLayoutProps) {{originalSenderLabel()}:</span><InboxCard.Content class="truncate text-sm text-ink/60">+ <Show when={text().contextIsAttachmentSummary}>+ <PaperclipIcon class="mr-0.5 inline size-3.5 align-[-0.125em]" />+ </Show><StaticMarkdownmarkdown={context()}singleLine@@ -865,56 +867,42 @@ export function ChannelThreadCardLayout(props: InboxCardLayoutProps) {)}</Show>- <div class="flex min-w-0 items-center gap-1">+ <InboxCard.Content+ class={cn(+ 'text-sm text-ink/60',+ isLatestNotificationReply() ? 'truncate' : 'line-clamp-2'+ )}+ ><Show when={!isDM()}>- <span class="flex gap-1 items-center text-sm whitespace-nowrap text-ink-extra-muted/80 group-data-unread/inbox-item:text-ink-muted">- {senderLabel()}:- </span>+ <span class="mr-1 whitespace-nowrap">{senderLabel()}:</span></Show><Show when={text().content?.trim()}>{(value) => (- <InboxCard.Content class="truncate text-sm text-ink/60">+ <>+ <Show when={text().contentIsAttachmentSummary}>+ <PaperclipIcon class="mr-0.5 inline size-3.5 align-[-0.125em]" />+ </Show><StaticMarkdownmarkdown={value()}singleLine- theme={unifiedListMarkdownTheme}+ theme={+ isLatestNotificationReply()+ ? unifiedListMarkdownTheme+ : inlineWrappingMarkdownTheme+ }/>- </InboxCard.Content>+ </>)}</Show>- </div>+ </InboxCard.Content></div>-- <Show when={mediaItems().length || fileAttachments().length}>- <div class="col-start-2 row-start-3 flex min-w-0 flex-col gap-2">- <Show when={mediaItems().length}>- <InboxCard.Attachments- items={mediaItems()}- onOpen={(index) => {- setViewerIndex(index);- setViewerOpen(true);- }}- />- </Show>- <Show when={fileAttachments().length}>- <InboxCard.Attachments items={fileAttachments()} />- </Show>- </div>- </Show>- </InboxCard.Body>- <InboxTimestamp- timestamp={props.item.timestamp}- class="col-start-3 row-start-2 self-start justify-self-end"- />- </InboxCard.Root>- <MediaViewerDialog- items={mediaItems}- open={viewerOpen()}- onOpenChange={setViewerOpen}- currentIndex={viewerIndex}- onCurrentIndexChange={setViewerIndex}+ </div>+ </InboxCard.Body>+ <InboxTimestamp+ timestamp={props.item.timestamp}+ class="col-start-3 row-start-2 self-start justify-self-end"/>- </>+ </InboxCard.Root>);}@@ -1128,12 +1116,16 @@ export function EmailCardLayout(props: InboxCardLayoutProps) {const senderName = createSenderDisplayName(senderId, senderFallbackName);const text = createMemo(() => {- const subject = props.item.entity.name;+ const entity = props.item.entity;return {sender: senderName(),- subject,- content: '',+ subject: entity.name,+ content:+ entity.type === 'email'+ ? (itemContent(entity, props.item.notification) ?? entity.snippet)+ : undefined,+ isDraft: entity.type === 'email' && entity.isDraft,};});@@ -1152,6 +1144,9 @@ export function EmailCardLayout(props: InboxCardLayoutProps) {<InboxCard.Body class="contents"><InboxCard.Header class="col-start-2 row-start-1 self-center"><InboxCard.Title class="flex items-center gap-1">+ <Show when={text().isDraft}>+ <DraftBadge />+ </Show>{text().sender}</InboxCard.Title></InboxCard.Header>@@ -1296,7 +1291,7 @@ export function GithubCardLayout(props: InboxCardLayoutProps) {<Show when={text().location}>{(location) => (- <InboxCard.Content class="col-start-2 row-start-3 truncate text-xs text-ink/40">+ <InboxCard.Content class="col-start-2 row-start-3 truncate text-sm text-ink/40">{location()}</InboxCard.Content>)}@@ -1310,6 +1305,11 @@ export function GithubCardLayout(props: InboxCardLayoutProps) {);}+function CallParticipantName(props: { id: string }) {+ const displayName = createSenderDisplayName(() => props.id);+ return <>{displayName()}</>;+}+export function CallCardLayout(props: InboxCardLayoutProps) {const senderId = () => props.item.notification?.sender_id ?? undefined;@@ -1321,7 +1321,6 @@ export function CallCardLayout(props: InboxCardLayoutProps) {const text = createMemo(() => {const entity = props.item.entity;- const content = itemContent(entity, props.item.notification);const location = entityLocation(entity);if (getNotificationTag(props.item.notification) === 'call_started') {@@ -1331,38 +1330,48 @@ export function CallCardLayout(props: InboxCardLayoutProps) {action: location ? 'started a call in' : 'started a call',location,}),- content,};}if (entity.type === 'call' && entity.status === 'MISSED') {return {- title: entity.name ? `Missed call in #${entity.name}` : 'Missed call',- content,+ title: entity.name ? `Missed call in ${entity.name}` : 'Missed call',};}if (entity.type === 'call' && entity.status === 'UNATTENDED') {return {title: entity.name- ? `Call unattended in #${entity.name}`+ ? `Call unattended in ${entity.name}`: 'Call unattended',- content,};}- return { title: entity.name ? `Call in #${entity.name}` : 'Call', content };+ return { title: entity.name ? `Call in ${entity.name}` : 'Call' };});+ const participantIds = () =>+ props.item.entity.type === 'call' ? props.item.entity.participantIds : [];++ const duration = () => {+ const entity = props.item.entity;+ if (entity.type !== 'call') {+ return getNotificationTag(props.item.notification) === 'call_started'+ ? 'In progress'+ : undefined;+ }+ if (entity.durationMs != null) return formatCallDuration(entity.durationMs);+ return entity.isActive ? 'In progress' : 'No duration';+ };+return (- <BaseCard- entityId={props.item.entity.id}+ <InboxCard.Root+ dimmed={!props.item.unread}selected={props.selected}highlighted={props.highlighted}onClick={props.onClick}- unread={props.item.unread}- timestamp={props.item.timestamp}- leading={+ >+ <div class="col-start-1 row-start-1 row-span-3"><InboxCard.Iconfallback={<EntityIcon@@ -1373,10 +1382,40 @@ export function CallCardLayout(props: InboxCardLayoutProps) {/>}></InboxCard.Icon>- }- title={text().title}- preview={text().content}- />+ </div>+ <InboxCard.Body class="contents">+ <InboxCard.Header class="col-start-2 row-start-1 self-center">+ <InboxCard.Title class="flex items-center gap-1">+ {text().title}+ </InboxCard.Title>+ </InboxCard.Header>++ <Show when={participantIds().length}>+ <InboxCard.Content class="col-start-2 row-start-2 truncate text-sm">+ <For each={participantIds()}>+ {(participantId, index) => (+ <>+ {index() > 0 ? ', ' : ''}+ <CallParticipantName id={participantId} />+ </>+ )}+ </For>+ </InboxCard.Content>+ </Show>++ <Show when={duration()}>+ {(value) => (+ <InboxCard.Content class="col-start-2 row-start-3 truncate text-sm">+ {value()}+ </InboxCard.Content>+ )}+ </Show>+ </InboxCard.Body>+ <InboxTimestamp+ timestamp={props.item.timestamp}+ class="col-start-3 row-start-1 self-start justify-self-end"+ />+ </InboxCard.Root>);}diff --git a/js/app/packages/entity/src/index.ts b/js/app/packages/entity/src/index.tsindex 0624a8e362..a7a6ceb9f8 100644--- a/js/app/packages/entity/src/index.ts+++ b/js/app/packages/entity/src/index.ts@@ -1,5 +1,6 @@// Export types+export { DraftBadge } from './components/Badges';export { MultiSelectCheckbox } from './components/MultiSelectCheckbox';export { ProjectBreadCrumb } from './components/ProjectBreadCrumb';export { UnreadIndicator } from './components/UnreadIndicator';