Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(channels): open the user card from an agent's message avatar (#9189)

Eric Hayes45cff4ac4ce5
diff --git a/apps/web/src/features/channel/Message/SenderIcon.test.tsx b/apps/web/src/features/channel/Message/SenderIcon.test.tsx
index 0089b4d652..94dad857e2 100644
--- a/apps/web/src/features/channel/Message/SenderIcon.test.tsx
+++ b/apps/web/src/features/channel/Message/SenderIcon.test.tsx
@@ -3,10 +3,26 @@ import { MACRO_AGENT_PRINCIPAL_ID } from '@core/constant/macroAgent';
import { MACRO_NEW_PRINCIPAL_ID } from '@core/constant/macroNew';
import type { MessageData } from '@core/messages/types';
import { cleanup, render } from '@solidjs/testing-library';
+import type { JSX } from 'solid-js';
import { afterEach, describe, expect, it, vi } from 'vitest';
import { MessageProvider } from './context';
import { SenderIcon } from './SenderIcon';
+vi.mock('@core/component/UserCardTrigger', () => ({
+ UserCardTrigger: (props: {
+ user: { displayName: string; id?: string };
+ trigger: JSX.Element;
+ }) => (
+ <span
+ data-testid="user-card"
+ data-name={props.user.displayName}
+ data-id={props.user.id}
+ >
+ {props.trigger}
+ </span>
+ ),
+}));
+
vi.mock('@core/component/UserIcon', () => ({
UserIcon: (props: { id: string }) => (
<span data-testid="user-icon">{props.id}</span>
@@ -68,6 +84,31 @@ describe('SenderIcon', () => {
expect(queryByTestId('user-icon')).toBeNull();
});
+ it('gives a team agent the user card that leads to its settings', () => {
+ const { getByTestId } = renderSender(
+ message(`bot|${TEAM_BOT_ID}`, {
+ type: 'bot',
+ id: TEAM_BOT_ID,
+ name: 'Helper',
+ avatar_url: 'https://cdn/helper.png',
+ })
+ );
+ const card = getByTestId('user-card');
+ expect(card.dataset.name).toBe('Helper');
+ expect(card.dataset.id).toBe(`bot|${TEAM_BOT_ID}`);
+ expect(card.querySelector('[data-testid="bot-icon"]')).not.toBeNull();
+ });
+
+ it('gives a first-party agent the user card', () => {
+ const { getByTestId } = renderSender(message(MACRO_AGENT_PRINCIPAL_ID));
+ expect(getByTestId('user-card').dataset.id).toBe(MACRO_AGENT_PRINCIPAL_ID);
+ });
+
+ it('leaves people to the card UserIcon already draws', () => {
+ const { queryByTestId } = renderSender(message('macro|[email protected]'));
+ expect(queryByTestId('user-card')).toBeNull();
+ });
+
it('draws people through UserIcon', () => {
const { getByTestId } = renderSender(message('macro|[email protected]'));
expect(getByTestId('user-icon').textContent).toBe('macro|[email protected]');
diff --git a/apps/web/src/features/channel/Message/SenderIcon.tsx b/apps/web/src/features/channel/Message/SenderIcon.tsx
index 0deb3badfc..da62f9b510 100644
--- a/apps/web/src/features/channel/Message/SenderIcon.tsx
+++ b/apps/web/src/features/channel/Message/SenderIcon.tsx
@@ -1,6 +1,12 @@
import { firstPartyBotMark } from '@core/component/firstPartyBotMark';
+import { UserCardTrigger } from '@core/component/UserCardTrigger';
import { UserIcon } from '@core/component/UserIcon';
-import { senderFromStorageId } from '@queries/messages/message-sender';
+import type { UserCardTarget } from '@core/component/userCardActions';
+import { isTouchDevice } from '@core/mobile/isTouchDevice';
+import {
+ getBotDisplayName,
+ senderFromStorageId,
+} from '@queries/messages/message-sender';
import type { MessageSender } from '@service-storage/messages';
import { cn } from '@ui';
import { Show } from 'solid-js';
@@ -15,13 +21,18 @@ type SenderIconProps = {
export function SenderIcon(props: SenderIconProps) {
const message = useMessage();
+ const sender = (): MessageSender =>
+ message().sender ?? senderFromStorageId(message().sender_id);
+
// Team bots render their uploaded avatar; first-party bots have none and
// keep their brand mark, which UserIcon draws the same way the mention menu
// does.
const botSender = (): MessageSender | undefined => {
- const sender = message().sender ?? senderFromStorageId(message().sender_id);
- if (sender.type !== 'bot' || firstPartyBotMark(sender.id)) return undefined;
- return sender;
+ const current = sender();
+ if (current.type !== 'bot' || firstPartyBotMark(current.id)) {
+ return undefined;
+ }
+ return current;
};
// Someone outside Macro, such as a WhatsApp participant, has no principal.
@@ -32,6 +43,34 @@ export function SenderIcon(props: SenderIconProps) {
: undefined;
};
+ // An agent's avatar hovers like a person's, with the card that leads to its
+ // settings. UserIcon gives people that card but draws bots without one.
+ const agentCard = (): UserCardTarget | undefined => {
+ const current = sender();
+ if (message().guest_name || current.type !== 'bot') return undefined;
+ return {
+ displayName:
+ getBotDisplayName(message().sender_id, current) ?? current.id,
+ id: message().sender_id,
+ photoUrl: current.avatar_url ?? undefined,
+ };
+ };
+
+ const avatar = () => (
+ <Show
+ when={
+ message().guest_name
+ ? { name: message().guest_name, avatar_url: null }
+ : (externalAuthor() ?? botSender())
+ }
+ fallback={<UserIcon id={message().sender_id} size="fill" />}
+ >
+ {(bot) => (
+ <BotIcon name={bot().name} avatarUrl={bot().avatar_url} size="fill" />
+ )}
+ </Show>
+ );
+
return (
<div
class={cn('shrink-0 size-(--user-icon-width)', props.class, {
@@ -40,19 +79,15 @@ export function SenderIcon(props: SenderIconProps) {
aria-hidden={props.hidden ? 'true' : undefined}
>
{!props.hidden && (
- <Show
- when={
- message().guest_name
- ? { name: message().guest_name, avatar_url: null }
- : (externalAuthor() ?? botSender())
- }
- fallback={<UserIcon id={message().sender_id} size="fill" />}
- >
- {(bot) => (
- <BotIcon
- name={bot().name}
- avatarUrl={bot().avatar_url}
- size="fill"
+ <Show when={agentCard()} fallback={avatar()}>
+ {(user) => (
+ <UserCardTrigger
+ placement="left"
+ triggerAs="div"
+ triggerClass="size-full"
+ triggerTabIndex={isTouchDevice() ? 0 : -1}
+ user={user()}
+ trigger={avatar()}
/>
)}
</Show>
diff --git a/docs/agent-guide/navigation.md b/docs/agent-guide/navigation.md
index caaf96ffa8..5a40639ffc 100644
--- a/docs/agent-guide/navigation.md
+++ b/docs/agent-guide/navigation.md
@@ -990,7 +990,8 @@ the person's name and email above Copy email, Copy name, Open contact (CRM teams
only), DM, and Assign task. An agent's or bot's card offers Settings instead of
DM when the viewer can configure it: Macro opens Settings → Agents, an agent the
viewer manages opens straight into its Edit agent form, and a plain bot opens
-its page under Settings → Bots. Touch devices have no hover, so tapping the mention
+its page under Settings → Bots. An agent's avatar beside its channel messages
+opens the same card. Touch devices have no hover, so tapping the mention
or the picture opens that same card as a bottom sheet; any action there runs and
dismisses the sheet. Desktop keeps click-to-DM on the picture itself, which touch
drops in favour of the card's DM action.