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(soup): guard missing grouped query data during startup (#8440)

teo722fee9ed81d
diff --git a/apps/web/src/lib/queries/soup/graphql/create-grouped-soup-live-query.test.ts b/apps/web/src/lib/queries/soup/graphql/create-grouped-soup-live-query.test.ts
index fc9995b5bd..95853ac04b 100644
--- a/apps/web/src/lib/queries/soup/graphql/create-grouped-soup-live-query.test.ts
+++ b/apps/web/src/lib/queries/soup/graphql/create-grouped-soup-live-query.test.ts
@@ -125,7 +125,7 @@ function setup() {
mocks.client.mockReturnValue(client);
const state = createRoot((dispose) => {
cleanups.push(dispose);
- const [input, setInput] = createSignal<GroupedSoupInput>({
+ const [input, setInput] = createSignal<GroupedSoupInput | undefined>({
initial: {
sortMethod: 'UPDATED_AT',
groupBy: {
@@ -190,6 +190,13 @@ const ids = (data: GroupSoupQuery | undefined) =>
}));
describe('grouped Soup live ownership', () => {
+ it('clears grouping before an initial result without reading missing data', () => {
+ const state = setup();
+ state.setInput(undefined);
+ expect(state.query.data()).toBeUndefined();
+ expect(state.query.paging.hasNextPage('todo')).toBe(false);
+ });
+
it('moves initial and continuation rows through one maintained query and preserves server pagination', async () => {
const state = setup();
state.executions[0].publish(page([groupedDocument('a')]));
diff --git a/apps/web/src/lib/queries/soup/graphql/create-grouped-soup-live-query.ts b/apps/web/src/lib/queries/soup/graphql/create-grouped-soup-live-query.ts
index ca27594d05..ce0084347c 100644
--- a/apps/web/src/lib/queries/soup/graphql/create-grouped-soup-live-query.ts
+++ b/apps/web/src/lib/queries/soup/graphql/create-grouped-soup-live-query.ts
@@ -114,10 +114,12 @@ export function createGroupedSoupLiveQuery(
? { ...common, variables: { input: queryInput }, enabled: true }
: { ...common, enabled: false as const };
});
- const currentInitial = () =>
- query.data?.inputKey === JSON.stringify(input())
- ? query.data.data
+ const currentInitial = () => {
+ const initial = query.data;
+ return initial?.inputKey === JSON.stringify(input())
+ ? initial?.data
: undefined;
+ };
const continuationScope = () =>
JSON.stringify([scope(), currentInitial()?.user.id]);