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(mentions): ask search again whenever the @ menu shows it (#8753)
gbirman30bb677b544d
diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/MentionsMenu/hooks/useCalendarEventMention.ts b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/MentionsMenu/hooks/useCalendarEventMention.tsindex b541e225e3..134bd3aaab 100644--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/MentionsMenu/hooks/useCalendarEventMention.ts+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/MentionsMenu/hooks/useCalendarEventMention.ts@@ -110,10 +110,14 @@ export function useCalendarEventMention(},}));- const own = useSearchSoupQuery(searchArgs(), () => ({ enabled: enabled() }));- const shared = useSearchSoupQuery(searchArgs('shared_with_you'), () => ({- enabled: enabled(),- }));+ // Nothing tells a viewer they lost access to an event, so each search asks+ // again when shown, keeping the earlier answer on screen until it lands.+ const searchOptions = () => ({ enabled: enabled(), staleTime: 0 });+ const own = useSearchSoupQuery(searchArgs(), searchOptions);+ const shared = useSearchSoupQuery(+ searchArgs('shared_with_you'),+ searchOptions+ );const events = createLazyMemo((): CalendarEventMentionItem[] => {if (!enabled() || !queryReadyGate(own)) return [];diff --git a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/MentionsMenu/hooks/useEmailSearchMention.ts b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/MentionsMenu/hooks/useEmailSearchMention.tsindex 748b8a86b7..6bddf92901 100644--- a/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/MentionsMenu/hooks/useEmailSearchMention.ts+++ b/apps/web/src/lib/core/component/LexicalMarkdown/component/menu/MentionsMenu/hooks/useEmailSearchMention.ts@@ -59,8 +59,10 @@ export function useEmailSearchMention(};});+ // Nothing tells a viewer they lost access, so each search asks again when shown.const emailSearchQuery = useSearchSoupQuery(args, () => ({enabled: !usesQuickAccess() && listEnabled(),+ staleTime: 0,}));const remoteEmailList = createLazyMemo((): EntityItem[] => {diff --git a/apps/web/src/lib/queries/access-requests/requests.test.ts b/apps/web/src/lib/queries/access-requests/requests.test.tsindex d91ee99255..41c9bf4e4b 100644--- a/apps/web/src/lib/queries/access-requests/requests.test.ts+++ b/apps/web/src/lib/queries/access-requests/requests.test.ts@@ -3,6 +3,7 @@ import { afterEach, beforeEach, expect, it, vi } from 'vitest';import { registerActivityRevalidator } from '../activity/push-registry';import { registerActiveGraphqlPreviewQuery } from '../preview/active-queries';import { registerActiveGraphqlSoupQuery } from '../soup/graphql/active-queries';+import { soupKeys } from '../soup/keys';import { databasesKeys } from '../storage/keys';import { refreshSharedAccess } from './requests';@@ -100,3 +101,10 @@ it('refreshes folder descendants and the database discovery list after sharing cqueryKey: databasesKeys.detail('database').queryKey,});});++it('drops cached search answers, which only a new search filters by current access', () => {+ refreshSharedAccess({ entityType: 'document', entityId: 'document' });+ expect(mocks.invalidate).toHaveBeenCalledWith({+ queryKey: soupKeys.search._def,+ });+});diff --git a/apps/web/src/lib/queries/access-requests/requests.ts b/apps/web/src/lib/queries/access-requests/requests.tsindex 40e17fd51d..b8385969c0 100644--- a/apps/web/src/lib/queries/access-requests/requests.ts+++ b/apps/web/src/lib/queries/access-requests/requests.ts@@ -11,6 +11,7 @@ import { callKeys } from '../call/keys';import { queryClient } from '../client';import { refreshActiveGraphqlPreviewQueries } from '../preview/active-queries';import { refreshActiveGraphqlSoupQueries } from '../soup/graphql/active-queries';+import { soupKeys } from '../soup/keys';import { invalidateAllSoup } from '../soup/normalized-cache';import { databasesKeys, entityKeys } from '../storage/keys';import { accessRequestKeys } from './keys';@@ -50,6 +51,7 @@ export function refreshSharedAccess(entity: ShareEntity) {fireAndForget(invalidateAccessRequests(entity), 'access-requests');// Permissions change list membership even when the item was never cached.invalidateAllSoup();+ queryClient.invalidateQueries({ queryKey: soupKeys.search._def });fireAndForget(refreshActiveGraphqlSoupQueries(), 'access-requests');const includesDescendants = entity.entityType === 'project';fireAndForget(diff --git a/apps/web/src/lib/queries/soup/search.test.tsx b/apps/web/src/lib/queries/soup/search.test.tsxnew file mode 100644index 0000000000..007d629f03--- /dev/null+++ b/apps/web/src/lib/queries/soup/search.test.tsx@@ -0,0 +1,91 @@+import { queryClient } from '@queries/client';+import { cleanup, render, waitFor } from '@solidjs/testing-library';+import { QueryClientProvider } from '@tanstack/solid-query';+import { okAsync } from 'neverthrow';+import { createRenderEffect, createSignal } from 'solid-js';+import { afterEach, expect, it, vi } from 'vitest';+import { type SearchSoupQueryArgs, useSearchSoupQuery } from './search';++const server = vi.hoisted(() => ({ search: vi.fn() }));+vi.mock('@queries/client', async () => {+ const { QueryClient } = await import('@tanstack/solid-query');+ return {+ queryClient: new QueryClient({+ defaultOptions: { queries: { staleTime: 5 * 60_000, retry: false } },+ }),+ };+});+vi.mock('@core/constant/featureFlags', () => ({+ ENABLE_SEARCH_SERVICE: true,+}));+vi.mock('@core/context/channels', () => ({+ useChannelsContext: () => ({ channels: () => [] }),+}));+vi.mock('@service-search/client', () => ({+ searchClient: { search: server.search },+}));+vi.mock('@queries/soup/transform-utils', () => ({+ createSearchResponseItemMapper:+ () =>+ ({ id }: { id: string }) => [{ type: 'calendar_event', id, search: {} }],+ mapChannelSearchResultItem: vi.fn(),+}));++afterEach(() => {+ cleanup();+ queryClient.clear();+ server.search.mockReset();+});++const args = (): SearchSoupQueryArgs => ({+ params: { cursor: null, page_size: 10 },+ body: { match_type: 'partial', search_on: 'name', query: 'quokka' },+});++function answer(...ids: string[]) {+ return okAsync({ results: ids.map((id) => ({ id })), next_cursor: null });+}++function searchTwice(staleTime?: number) {+ const [shown, setShown] = createSignal(true);+ const seen: string[][] = [];+ function Menu() {+ const query = useSearchSoupQuery(args, () => ({ staleTime }));+ createRenderEffect(() =>+ seen.push(query.isSuccess ? query.data.map(({ id }) => id) : [])+ );+ return null;+ }+ render(() => (+ <QueryClientProvider client={queryClient}>+ {shown() ? <Menu /> : null}+ </QueryClientProvider>+ ));+ return { seen, hide: () => setShown(false), show: () => setShown(true) };+}++it('asks again when a search with no stale time is shown again, keeping the earlier answer until it lands', async () => {+ server.search+ .mockReturnValueOnce(answer('shared-event'))+ .mockReturnValueOnce(answer());+ const menu = searchTwice(0);+ await waitFor(() => expect(menu.seen.at(-1)).toEqual(['shared-event']));++ menu.hide();+ menu.show();+ expect(menu.seen.at(-1)).toEqual(['shared-event']);+ await waitFor(() => expect(menu.seen.at(-1)).toEqual([]));+ expect(server.search).toHaveBeenCalledTimes(2);+});++it('replays a fresh answer when shown again under the default stale time', async () => {+ server.search.mockReturnValue(answer('shared-event'));+ const menu = searchTwice();+ await waitFor(() => expect(menu.seen.at(-1)).toEqual(['shared-event']));++ menu.hide();+ menu.show();+ await new Promise((resolve) => setTimeout(resolve, 20));+ expect(menu.seen.at(-1)).toEqual(['shared-event']);+ expect(server.search).toHaveBeenCalledTimes(1);+});diff --git a/apps/web/src/lib/queries/soup/search.ts b/apps/web/src/lib/queries/soup/search.tsindex 14c59f3721..e303ad887b 100644--- a/apps/web/src/lib/queries/soup/search.ts+++ b/apps/web/src/lib/queries/soup/search.ts@@ -29,6 +29,7 @@ export type SearchSoupQueryArgs = {interface SearchQueryOptions {enabled?: boolean;+ staleTime?: number;}/** Search service won't accept text less than 3 characters */@@ -40,7 +41,8 @@ export const validateSearchServiceText = (text: string) => {function searchSoupQueryOptions(args: SearchSoupQueryArgs,channels: ReadonlyArray<{ id: string; name?: string | null }>,- enabled: boolean+ enabled: boolean,+ staleTime: number | undefined) {const mapSearchResponseItem = createSearchResponseItemMapper(channels);return infiniteQueryOptions({@@ -78,6 +80,8 @@ function searchSoupQueryOptions(});},enabled: enabled,+ // An undefined staleTime would replace the client default, not inherit it.+ ...(staleTime === undefined ? {} : { staleTime }),placeholderData: keepPreviousData,meta: { normalize: false },});@@ -114,7 +118,8 @@ export const useSearchSoupQuery = (searchSoupQueryOptions({ params: args().params, body: request() },channelNames(),- enabled()+ enabled(),+ options?.().staleTime));};