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(activity): preserve live entity preview subscriptions (#6678)
teo895227a1cc5d
diff --git a/apps/web/src/features/property/hooks/usePropertyEntityDisplay.test.tsx b/apps/web/src/features/property/hooks/usePropertyEntityDisplay.test.tsxnew file mode 100644index 0000000000..ce2db62c67--- /dev/null+++ b/apps/web/src/features/property/hooks/usePropertyEntityDisplay.test.tsx@@ -0,0 +1,155 @@+import { QueryClient, useQuery } from '@tanstack/solid-query';+import { createRoot, createSignal, onCleanup } from 'solid-js';+import { afterEach, describe, expect, it, vi } from 'vitest';++const fixture = vi.hoisted(() => ({+ createPreview: undefined as (() => () => unknown) | undefined,+ preview: undefined as (() => unknown) | undefined,+ channelName: undefined as (() => string) | undefined,+ previewMounts: 0,+ previewDisposals: 0,+ channelMounts: 0,+}));++vi.mock('@core/component/EntityIcon', () => ({ EntityIcon: () => null }));+vi.mock('@core/component/UserIcon', () => ({ UserIcon: () => null }));+vi.mock('@core/constant/allBlocks', () => ({+ fileTypeToBlockName: (type: string) => type,+}));+vi.mock('../utils', () => ({+ entityTypeToItemType: (type: string) => type.toLowerCase(),+}));+vi.mock('@core/context/channels', () => ({+ useChannelName: () => {+ fixture.channelMounts++;+ return () => fixture.channelName?.() ?? '';+ },+}));+vi.mock('@core/user', () => ({+ getDisplayName: () => '',+ tryMacroId: () => undefined,+}));+vi.mock('@queries/preview', () => ({+ useItemPreview: () => {+ fixture.previewMounts++;+ onCleanup(() => fixture.previewDisposals++);+ return [fixture.createPreview?.() ?? (() => fixture.preview?.())];+ },+ isAccessiblePreviewItem: (item: { access?: string }) =>+ item.access === 'access',+}));++import { createLivePreviewBatcher } from '@queries/preview/live-batcher';+import { usePropertyEntityDisplay } from './usePropertyEntityDisplay';++const disposals: Array<() => void> = [];+afterEach(() => {+ for (const dispose of disposals.splice(0)) dispose();+ fixture.createPreview = undefined;+ fixture.preview = undefined;+ vi.useRealTimers();+ fixture.channelName = undefined;+ fixture.previewMounts = 0;+ fixture.previewDisposals = 0;+ fixture.channelMounts = 0;+});++function setup(type: 'DOCUMENT' | 'CHANNEL') {+ return createRoot((dispose) => {+ disposals.push(dispose);+ return usePropertyEntityDisplay(+ () => 'entity-1',+ () => type+ );+ });+}++describe('usePropertyEntityDisplay subscription ownership', () => {+ it('settles a live GraphQL preview batch without reacquiring itself', () => {+ vi.useFakeTimers();+ let starts = 0;+ const queryClient = new QueryClient();+ const disposeBatch = vi.fn();+ const batcher = createLivePreviewBatcher<string, unknown>({+ start: () => {+ // Bound the synchronous drain: a regression must fail instead of hanging the suite.+ if (++starts > 5) throw new Error('preview subscription feedback loop');+ return {+ value: {+ loading: false,+ access: 'access',+ name: 'Roadmap',+ fileType: 'md',+ },+ dispose: disposeBatch,+ };+ },+ });+ fixture.createPreview = () => {+ const [preview, setPreview] = createSignal<unknown>();+ const subscription = batcher.acquire('entity-1', 'entity-1', setPreview);+ onCleanup(subscription.dispose);+ // The real preview hook also constructs a disabled REST fallback.+ // TanStack reads these options during construction, before any result.+ useQuery(+ () => ({+ queryKey: ['preview-rest-fallback', Boolean(preview())],+ queryFn: async () => null,+ enabled: false,+ }),+ () => queryClient+ );+ return preview;+ };+ const display = setup('DOCUMENT');+ vi.advanceTimersByTime(30);+ expect(display.name()).toBe('Roadmap');+ expect(display.isLoading()).toBe(false);+ expect(starts).toBe(1);+ disposals.pop()?.();+ queryClient.clear();+ expect(disposeBatch).toHaveBeenCalledTimes(1);+ });++ it('keeps the preview subscription while loading and receiving live updates', () => {+ const [preview, setPreview] = createSignal<unknown>({ loading: true });+ fixture.preview = preview;+ const display = setup('DOCUMENT');+ expect(display.isLoading()).toBe(true);+ expect(fixture.previewMounts).toBe(1);++ setPreview({+ loading: false,+ access: 'access',+ name: 'Roadmap',+ fileType: 'md',+ });+ expect(display.name()).toBe('Roadmap');+ expect(display.blockOrFileType()).toBe('md');+ expect(display.isLoading()).toBe(false);+ expect(fixture.previewMounts).toBe(1);+ expect(fixture.previewDisposals).toBe(0);++ setPreview({+ loading: false,+ access: 'access',+ name: 'Updated roadmap',+ fileType: 'pdf',+ });+ expect(display.name()).toBe('Updated roadmap');+ expect(display.blockOrFileType()).toBe('pdf');+ expect(fixture.previewMounts).toBe(1);+ disposals.pop()?.();+ expect(fixture.previewDisposals).toBe(1);+ });++ it('keeps the channel subscription when its name changes', () => {+ const [name, setName] = createSignal('Design');+ fixture.channelName = name;+ const display = setup('CHANNEL');+ expect(display.name()).toBe('Design');+ setName('Product design');+ expect(display.name()).toBe('Product design');+ expect(fixture.channelMounts).toBe(1);+ });+});diff --git a/apps/web/src/features/property/hooks/usePropertyEntityDisplay.tsx b/apps/web/src/features/property/hooks/usePropertyEntityDisplay.tsxindex ec4427836d..d51cc208c1 100644--- a/apps/web/src/features/property/hooks/usePropertyEntityDisplay.tsx+++ b/apps/web/src/features/property/hooks/usePropertyEntityDisplay.tsx@@ -6,7 +6,7 @@ import { useChannelName } from '@core/context/channels';import { getDisplayName, tryMacroId } from '@core/user';import { isAccessiblePreviewItem, useItemPreview } from '@queries/preview';import type { EntityType } from '@service-properties/generated/schemas/entityType';-import { type Accessor, createMemo, type JSX } from 'solid-js';+import { type Accessor, createMemo, type JSX, untrack } from 'solid-js';import { match } from 'ts-pattern';import { entityTypeToItemType } from '../utils';@@ -62,25 +62,30 @@ export function usePropertyEntityDisplay(): PropertyEntityDisplayResult {const previewType = () => entityTypeToItemType(entityType());- const previewWrapper = () => {+ const previewSource = createMemo(() => {const eType = entityType();const pType = previewType();if (isPreviewable(eType)) {- return useItemPreview(() => ({- id: entityId(),- type: pType,- }))[0];+ return untrack(+ () =>+ useItemPreview(() => ({+ id: entityId(),+ type: pType,+ }))[0]+ );}- };- const preview = createMemo(() => previewWrapper()?.());+ });+ // Keep subscription ownership separate from its value: a live result must+ // not dispose and reacquire the preview that produced it.+ const preview = () => previewSource()?.();- const channelNameWrapper = () => {+ const channelNameSource = createMemo(() => {const eType = entityType();if (eType === 'CHANNEL') {return useChannelName(entityId());}- };- const channelName = createMemo(() => channelNameWrapper()?.());+ });+ const channelName = () => channelNameSource()?.();const userNameWrapper = () => {const eType = entityType();diff --git a/docs/AGENT_GUIDE/surfaces.md b/docs/AGENT_GUIDE/surfaces.mdindex 217db8d165..f0a329ac53 100644--- a/docs/AGENT_GUIDE/surfaces.md+++ b/docs/AGENT_GUIDE/surfaces.md@@ -666,6 +666,11 @@ Requires authentication and the `enable-activity-feed` flag. Direct navigation arestored splits wait for flags to load; when disabled, they redirect to Home(`/app/component/inbox`) without loading the activity feed.+When checking Activity, enable GraphQL Soup as well as the activity flag. Verify+that an initial visit resolves entity names in both the feed and Most active,+then reload and scroll through another page. Preview loading and live name+updates should keep the page responsive without repeatedly fetching previews.+GitHub-style actions heatmap (one a11y node per day — makes snapshots huge; prefer saving thesnapshot to a file), then a `Most active` section header (styled like the feed's day headers)over a wrapping row of pill chips (entity icon, name, action count; click opens the entity,