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.

refactor(documents): drop the owner-as-edit access equivalence (#9175)

gbirman59fee9bf5153
diff --git a/apps/web/AGENTS.md b/apps/web/AGENTS.md
index 4e727e147e..b83300d9fd 100644
--- a/apps/web/AGENTS.md
+++ b/apps/web/AGENTS.md
@@ -469,8 +469,6 @@ resolved session ID; keep the existing `AgentSessionProvider` subscription to
- Preserve loaded block content on initial access confirmation when its loader
supplies no permissions; reload only on a later confirmed permission change.
Apply shared access in place only after a successful permissionless load.
- Request state can report an owner as edit, so compare a loaded level with
- the confirmed one through `matchesConfirmedAccess`.
- Grouped Soup's `graphql/create-grouped-soup-live-query.ts` owns initial and
continuation pages plus their local predicate projection. Group readers only
delegate paging; pass the parent's live `groupedPaging` accessor from every
diff --git a/apps/web/src/features/access-requests/core/types.ts b/apps/web/src/features/access-requests/core/types.ts
index 285312cfda..cf7f081fe7 100644
--- a/apps/web/src/features/access-requests/core/types.ts
+++ b/apps/web/src/features/access-requests/core/types.ts
@@ -61,18 +61,6 @@ export function shareEntity(
}
}
-/**
- * Whether confirmed request-state access still matches the level a document
- * loaded with. Request state can report an owner as edit, so a loaded owner
- * matches a confirmed edit.
- */
-export function matchesConfirmedAccess(
- loaded: AccessLevel | undefined,
- confirmed: AccessLevel
-): boolean {
- return loaded === confirmed || (loaded === 'owner' && confirmed === 'edit');
-}
-
export function requestLevels(state: RequestState | undefined): RequestLevel[] {
if (!state || state.canReview) return [];
const rank: Record<AccessLevel, number> = {
diff --git a/apps/web/src/features/drive-view/components/FileDetail.test.tsx b/apps/web/src/features/drive-view/components/FileDetail.test.tsx
index b6e430351a..a6b77e8a2f 100644
--- a/apps/web/src/features/drive-view/components/FileDetail.test.tsx
+++ b/apps/web/src/features/drive-view/components/FileDetail.test.tsx
@@ -139,32 +139,6 @@ describe('file access errors', () => {
expect(load).toHaveBeenCalledTimes(3);
});
- it('keeps an owner’s open document when request state confirms edit', async () => {
- const cleanupEditor = vi.fn();
- const load = vi
- .fn<() => Promise<Loaded>>()
- .mockResolvedValueOnce({ userAccessLevel: 'owner' })
- .mockResolvedValue({ userAccessLevel: 'view' });
- const container = mount(load, cleanupEditor);
- await vi.waitFor(() =>
- expect(container.textContent).toContain('Document content: owner')
- );
- const content = container.firstElementChild;
-
- notifyAccess?.('edit');
- notifyAccess?.('edit');
- notifyAccess?.('owner');
- expect(load).toHaveBeenCalledTimes(1);
- expect(cleanupEditor).not.toHaveBeenCalled();
- expect(container.firstElementChild).toBe(content);
-
- notifyAccess?.('view');
- await vi.waitFor(() =>
- expect(container.textContent).toContain('Document content: view')
- );
- expect(load).toHaveBeenCalledTimes(2);
- });
-
it('restarts a pending load when access is confirmed during it', async () => {
const pending = Promise.withResolvers<Loaded>();
const load = vi
diff --git a/apps/web/src/features/drive-view/components/FileDetail.tsx b/apps/web/src/features/drive-view/components/FileDetail.tsx
index a83df2dd74..45ef9d698a 100644
--- a/apps/web/src/features/drive-view/components/FileDetail.tsx
+++ b/apps/web/src/features/drive-view/components/FileDetail.tsx
@@ -2,10 +2,7 @@ import {
DocumentAccessDenied,
useSharedAccessUpdates,
} from '@app/features/access-requests/access-requests';
-import {
- matchesConfirmedAccess,
- shareEntity,
-} from '@app/features/access-requests/core/types';
+import { shareEntity } from '@app/features/access-requests/core/types';
import { useAnalytics } from '@app/lib/analytics/analytics-context';
import {
DocumentFileSidePanelSections,
@@ -141,7 +138,7 @@ export function FileDetailLoadGate<
return;
}
const loaded = document.state === 'ready' ? document.latest : undefined;
- if (!matchesConfirmedAccess(loaded?.userAccessLevel, level)) reload();
+ if (loaded?.userAccessLevel !== level) reload();
}
);
const accessDenied = () => {
diff --git a/apps/web/src/lib/core/internal/BlockLoader.test.tsx b/apps/web/src/lib/core/internal/BlockLoader.test.tsx
index 7c494cbdc1..be5430465e 100644
--- a/apps/web/src/lib/core/internal/BlockLoader.test.tsx
+++ b/apps/web/src/lib/core/internal/BlockLoader.test.tsx
@@ -273,43 +273,6 @@ it.each(['view', undefined] as const)(
}
);
-it('keeps an owner’s open document when request state confirms edit', async () => {
- const loaded = Promise.withResolvers<void>();
- const cleanupSource = vi.fn();
- const load = vi.fn(async () =>
- ok({ userAccessLevel: 'owner', syncSource: { cleanup: cleanupSource } })
- );
- render(() => {
- createEffect(
- on(blockDataSignal.get, (data) => {
- if (data) loaded.resolve();
- })
- );
- return (
- <BlockLoader
- id="01a140ad-06d5-7791-8b68-bc128654bbba"
- source={{ type: 'dss', id: '01a140ad-06d5-7791-8b68-bc128654bbba' }}
- definition={{
- name: 'md',
- description: 'Document',
- accepted: {},
- component: () => null,
- load,
- }}
- />
- );
- });
- await loaded.promise;
- const data = blockDataSignal.get();
-
- notifyAccess('edit');
- notifyAccess('edit');
- expect(cleanupSource).not.toHaveBeenCalled();
- expect(blockDataSignal.get()).toBe(data);
- expect(blockUserAccessSignal.get()).toBe('owner');
- expect(load).toHaveBeenCalledTimes(1);
-});
-
it('reconciles a stale permission-bearing load on a later unchanged confirmation', async () => {
const pending = Promise.withResolvers<void>();
const loaded = Promise.withResolvers<void>();
diff --git a/apps/web/src/lib/core/internal/BlockLoader.tsx b/apps/web/src/lib/core/internal/BlockLoader.tsx
index 29a57cc76c..b04a43decb 100644
--- a/apps/web/src/lib/core/internal/BlockLoader.tsx
+++ b/apps/web/src/lib/core/internal/BlockLoader.tsx
@@ -1,8 +1,5 @@
import { useSharedAccessUpdates } from '@app/features/access-requests/access-requests';
-import {
- matchesConfirmedAccess,
- shareEntity,
-} from '@app/features/access-requests/core/types';
+import { shareEntity } from '@app/features/access-requests/core/types';
import { useAnalytics } from '@app/lib/analytics/analytics-context';
import { useIsAuthenticated } from '@core/context/user';
import type { OwnedBlockHandle } from '@core/orchestrator';
@@ -88,7 +85,7 @@ export function BlockLoader<
// Lightweight loaders (e.g. email) supply no permissions. Their initial
// fallback is not a confirmed access change that requires a remount.
const accessChanged = hasLoadedPermissions
- ? !matchesConfirmedAccess(blockUserAccessSignal.get(), level)
+ ? blockUserAccessSignal.get() !== level
: previous !== undefined && previous !== level;
if (
(data != null && accessChanged) ||