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(soup): optimistic update doesn't filter out item when not matching current view (#4675)
dev-rb064797638386
diff --git a/js/app/packages/app/component/next-soup/soup-view/create-grouped-soup-queries.ts b/js/app/packages/app/component/next-soup/soup-view/create-grouped-soup-queries.tsindex 740bdc2ab5..bf8106aac0 100644--- a/js/app/packages/app/component/next-soup/soup-view/create-grouped-soup-queries.ts+++ b/js/app/packages/app/component/next-soup/soup-view/create-grouped-soup-queries.ts@@ -78,12 +78,16 @@ export function createGroupedSoupQueries(args: CreateGroupedSoupQueriesArgs) {return mapApiSoupItemToEntity(item);};- const mapPageToEntities = (page: GroupQueryPage): EntityData[] => {+ const mapPageToEntities = (+ page: GroupQueryPage,+ itemFilter: SoupApiItemFilter | undefined+ ): EntityData[] => {const entities: EntityData[] = [];for (const id of page.group.itemIds) {const item = page.items[id];if (!item) continue;+ if (itemFilter && !itemFilter(item)) continue;const entity = mapItemToEntity(item);if (entity) entities.push(entity);@@ -93,12 +97,13 @@ export function createGroupedSoupQueries(args: CreateGroupedSoupQueriesArgs) {};const combineGroupPages = (- pages: GroupQueryPage[]+ pages: GroupQueryPage[],+ itemFilter: SoupApiItemFilter | undefined): GroupQueryData | undefined => {if (pages.length === 0) return;return {- entities: pages.flatMap(mapPageToEntities),+ entities: pages.flatMap((page) => mapPageToEntities(page, itemFilter)),};};@@ -161,7 +166,8 @@ export function createGroupedSoupQueries(args: CreateGroupedSoupQueriesArgs) {getNextPageParam: (lastPage: GroupQueryPage): string | null => {return lastPage.group.nextCursor;},- select: combineGroupPages,+ select: (pages: GroupQueryPage[]) =>+ combineGroupPages(pages, options.meta?.itemFilter),initialData: {pages: [initialPage],pageParams: [null],diff --git a/js/app/packages/app/component/next-soup/soup-view/soup-view-context.tsx b/js/app/packages/app/component/next-soup/soup-view/soup-view-context.tsxindex ceec3ad558..07651635b3 100644--- a/js/app/packages/app/component/next-soup/soup-view/soup-view-context.tsx+++ b/js/app/packages/app/component/next-soup/soup-view/soup-view-context.tsx@@ -67,7 +67,8 @@ import type {import type { SoupParams } from '@queries/soup/items';import { useSoupAstItemsQuery } from '@queries/soup/items';import { soupKeys } from '@queries/soup/keys';-import type { SoupPage } from '@service-storage/generated/schemas';+import { mapApiSoupItemToEntity } from '@queries/soup/transform-utils';+import type { SoupApiItem, SoupPage } from '@service-storage/generated/schemas';import type { InfiniteData } from '@tanstack/solid-query';import {type Accessor,@@ -527,6 +528,19 @@ export const SoupViewContextProvider: FlowComponent<(queryFilters.state.include.tagFilters ?? []).map((t) => t.value));+ const soupItemMatchesActiveFilters = (+ item: SoupApiItem,+ view: ListView | undefined+ ): boolean => {+ if (!soupItemMatchesListView(item, view)) return false;+ if (!soupItemMatchesTagFilter(item, activeTagOptionIds())) return false;++ return soup.predicates.test(+ mapApiSoupItemToEntity(item) as SoupEntity,+ getFilterContext()+ );+ };+const itemsQuery = useSoupAstItemsQuery(() => {const groupBy = serverGroupByField();@@ -543,9 +557,7 @@ export const SoupViewContextProvider: FlowComponent<enabled: enabled() && !search.isSearching(),showSupportedForeignEntities: showSupportedForeignEntitiesFF().enabled,meta: {- itemFilter: (item) =>- soupItemMatchesListView(item, view) &&- soupItemMatchesTagFilter(item, activeTagOptionIds()),+ itemFilter: (item) => soupItemMatchesActiveFilters(item, view),},};}@@ -672,9 +684,7 @@ export const SoupViewContextProvider: FlowComponent<return {enabled: enabled() && !search.isSearching(),meta: {- itemFilter: (item) =>- soupItemMatchesListView(item, view) &&- soupItemMatchesTagFilter(item, activeTagOptionIds()),+ itemFilter: (item) => soupItemMatchesActiveFilters(item, view),},};},diff --git a/js/app/packages/queries/soup/normalized-cache/grouped-operations.ts b/js/app/packages/queries/soup/normalized-cache/grouped-operations.tsindex 96ff745049..61a9d3d764 100644--- a/js/app/packages/queries/soup/normalized-cache/grouped-operations.ts+++ b/js/app/packages/queries/soup/normalized-cache/grouped-operations.ts@@ -173,18 +173,17 @@ export function syncGroupQueries(entityId: string, entity: SoupApiItem) {const meta = getSoupQueryMeta(query.meta);if (!meta.groupBy || meta.groupKey == null) continue;- const nextGroupKeys = computeGroupKeysForItem(entity, meta.groupBy);+ const filter = meta.itemFilter;+ const nextGroupKeys =+ filter && !filter(entity)+ ? []+ : computeGroupKeysForItem(entity, meta.groupBy);if (nextGroupKeys === undefined) {queryClient.invalidateQueries({ queryKey: query.queryKey });continue;}- const filter = meta.itemFilter;- let shouldHave = nextGroupKeys.includes(meta.groupKey);-- if (filter && !filter(entity)) {- shouldHave = false;- }+ const shouldHave = nextGroupKeys.includes(meta.groupKey);let changed = false;