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.

test(soup): cover row-click fallback location routing (#5045)

Evan Hutnik4769baff3676
diff --git a/apps/web/src/features/next-soup/utils.test.ts b/apps/web/src/features/next-soup/utils.test.ts
index fcc47685ad..e948a7e2f6 100644
--- a/apps/web/src/features/next-soup/utils.test.ts
+++ b/apps/web/src/features/next-soup/utils.test.ts
@@ -15,7 +15,7 @@ vi.mock('@service-connection/websocket', () => ({
import type { ChannelEntityTarget, EntityData } from '@entity';
import type { UnifiedNotification } from '@notifications';
-import { getChannelEntityTarget } from './utils';
+import { getChannelEntityTarget, getRowClickFallbackLocation } from './utils';
const sendNotification = (id: string, messageId: string): UnifiedNotification =>
({
@@ -210,3 +210,71 @@ describe('getChannelEntityTarget', () => {
expect(getChannelEntityTarget(entity)).toBeUndefined();
});
});
+
+const emailHit = (messageId: string, content: string) => ({
+ type: 'email' as const,
+ content,
+ sender: 'Sender',
+ senderId: 'sender-1',
+ sentAt: '2026-07-14T00:00:00.000Z',
+ location: { type: 'email' as const, messageId },
+});
+
+const callHit = (transcriptId: string) => ({
+ type: 'call_record' as const,
+ id: transcriptId,
+ content: 'hit content',
+ senderId: 'speaker-1',
+ sentAt: '2026-07-14T00:00:00.000Z',
+ videoSeconds: 0,
+ location: { type: 'call_record' as const, callId: 'call-1', transcriptId },
+});
+
+const searchEntity = (
+ type: 'email' | 'call',
+ contentHitData: unknown[] | null
+): EntityData =>
+ ({
+ type,
+ id: `${type}-1`,
+ search: {
+ nameHighlight: null,
+ senderHighlightTerms: null,
+ contentHitData,
+ source: 'service',
+ },
+ }) as unknown as EntityData;
+
+describe('getRowClickFallbackLocation', () => {
+ it('returns no location for an email row, even with content hits', () => {
+ const entity = searchEntity('email', [
+ emailHit('old-msg', 'a long matched snippet of text'),
+ emailHit('newer-msg', 'short'),
+ ]);
+ expect(getRowClickFallbackLocation(entity)).toBeUndefined();
+ });
+
+ it('returns no location for an email row without search data', () => {
+ const entity = { type: 'email', id: 'e1' } as unknown as EntityData;
+ expect(getRowClickFallbackLocation(entity)).toBeUndefined();
+ });
+
+ it('keeps the snippet-hit fallback for call rows', () => {
+ const entity = searchEntity('call', [callHit('seg-1'), callHit('seg-2')]);
+ expect(getRowClickFallbackLocation(entity)).toEqual({
+ type: 'call_record',
+ callId: 'call-1',
+ transcriptId: 'seg-1',
+ });
+ });
+
+ it('returns no location for a call row without content hits', () => {
+ const entity = searchEntity('call', null);
+ expect(getRowClickFallbackLocation(entity)).toBeUndefined();
+ });
+
+ it('returns no location for non-snippet entities', () => {
+ const entity = { type: 'document', id: 'd1' } as unknown as EntityData;
+ expect(getRowClickFallbackLocation(entity)).toBeUndefined();
+ });
+});
diff --git a/apps/web/src/features/next-soup/utils.ts b/apps/web/src/features/next-soup/utils.ts
index f5c0ba9b47..8ce9524a58 100644
--- a/apps/web/src/features/next-soup/utils.ts
+++ b/apps/web/src/features/next-soup/utils.ts
@@ -454,6 +454,19 @@ export async function navigateChannelEntityToTarget(
);
}
+/**
+ * Location a plain row click falls back to when no explicit location is given.
+ * Email rows open like plain soup rows — at the latest message, expanded —
+ * so only non-email snippet entities (calls) fall back to their row hit.
+ * Clicking a specific content hit still passes an explicit location.
+ */
+export const getRowClickFallbackLocation = (
+ entity: EntityData
+): SearchLocation | undefined =>
+ isHitSnippetEntity(entity) && !isEmailEntity(entity)
+ ? getSnippetHit(entity)?.location
+ : undefined;
+
/**
* Opens an entity in a split, handling navigation to specific locations within the entity.
* Supports both regular entities (channel, email, etc.) and document entities.
@@ -468,11 +481,8 @@ export const openEntityInSplitFromUnifiedList = async (
const { allowDuplicate, openInNewSplit, splitHandle, mergeHistory } = options;
let { location } = options;
- // Email rows open like plain soup rows — at the latest message, expanded —
- // so only non-email snippet entities (calls) fall back to their row hit.
- // Clicking a specific content hit still passes an explicit location.
- if (!location && isHitSnippetEntity(entity) && !isEmailEntity(entity)) {
- location = getSnippetHit(entity)?.location;
+ if (!location) {
+ location = getRowClickFallbackLocation(entity);
}
// Get dependencies internally