officerdev/platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make the appType allow-list a prop instead of fourteen copies

Browse Source 
Every locked screen shipped the same recursive normaliser: an ALLOWED_APP_TYPES set, a
normalizeLayout, a useMemo to apply it before the wrong panel could render, and a useEffect to
persist the fix. Fourteen copies, character-for-character identical except the two names — so a
fifteenth screen was a copy-paste, and a bug in the shape was a bug in fourteen places.

It is now `<WorkspaceView appTypes={{ allowed, fallback }} />`. WorkspaceView normalises before it
renders and persists the diff itself, which is the same two effects the screens were writing by hand.

One deliberate behaviour change: the framework normaliser drops `config` when it replaces an app.
The fourteen copies did `{ ...node, appType: fallback }`, keeping the old app's config on the panel
the new app now owns. That is the opposite of what `setApp` does, and a config belongs to whoever
wrote it.

Headscale keeps a local useMemo. Its check is not "is this appType allowed" but "is the server
picker present at all" — a layout saved before that panel existed is discarded for the default
wholesale. That is about a panel being missing, which the allow-list cannot see.

QrTransfer gains a persist-back it never had: it normalised on read and threw the result away every
time.

Tests: normalizeLayout is pinned on reference-identity for a no-op, null always allowed, config
dropped on replacement, rebuilding only changed branches, and idempotence — because a normaliser
that does not normalise to itself makes the persist-back an infinite write loop.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
pastilhas
2026-08-07 10:06:59 +00:00
co-authored by Claude Opus 5
parent 2c84bb34be
commit 1de1d925a5
18 changed files with 215 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/officer-web/Screens/Dashboard/QrTransfer/QrTransferScreen.tsx
+8 -22
View File
@@ -1,4 +1,3 @@
import { useMemo } from 'react';
import type { LayoutNode } from 'officerdev';
import { WorkspaceView } from 'officerdev';
import { useDashboardState } from 'state/useDashboardState';
@@ -14,27 +13,14 @@ import { defaultLayout } from './defaultLayout';
// Both panels are pure client-side: nothing about a transfer reaches the server, which is the point.
// The receiver needs a secure origin for camera access — over the tailnet with HTTPS that is satisfied.
const ALLOWED_APP_TYPES = new Set<string | null>(['qr-send', 'qr-receive', null]);
function normalizeLayout(node: LayoutNode): LayoutNode {
if (node.type === 'panel') {
return ALLOWED_APP_TYPES.has(node.appType) ? node : { ...node, appType: 'qr-send' };
}
const children = node.children.map((c) => {
const fixed = normalizeLayout(c.node);
return fixed === c.node ? c : { ...c, node: fixed };
});
return children.some((c, i) => c !== node.children[i]) ? { ...node, children } : node;
}
export const QrTransferScreen = () => {
const rawWorkspace = useDashboardState<LayoutNode>('screens/qr-transfer', defaultLayout);
const workspace = useDashboardState<LayoutNode>('screens/qr-transfer', defaultLayout);
const workspace = useMemo(() => {
const fixed = normalizeLayout(rawWorkspace.value);
if (fixed === rawWorkspace.value) return rawWorkspace;
return { ...rawWorkspace, value: fixed };
}, [rawWorkspace]);
return <WorkspaceView workspace={workspace} locked />;
return (
<WorkspaceView
workspace={workspace}
locked
appTypes={{ allowed: ['qr-send', 'qr-receive'], fallback: 'qr-send' }}
/>
);
};