pastilhasandClaude Opus 5
1de1d925a5
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>
34 lines
1.5 KiB
TypeScript
34 lines
1.5 KiB
TypeScript
import { Navigate, useParams } from 'react-router';
|
|
import type { LayoutNode } from 'officerdev';
|
|
import { WorkspaceView, DEFAULT_PHOTOS_SECTION, photosSectionPath, isPhotosSection } from 'officerdev';
|
|
import { useDashboardState } from 'state/useDashboardState';
|
|
import { defaultLayout } from './defaultLayout';
|
|
|
|
// /photos uses the Workspace/Panel system: the section nav (photos-nav) on the left, the section view
|
|
// (photos-view) on the right. Both talk to the officer-photos sidecar through the /api/photos auth proxy; the
|
|
// Immich URL and API key live in the sidecar's environment and the browser never sees either.
|
|
//
|
|
// The open section is :section in the URL; deeper selection (which asset, album, person, search) is in the
|
|
// query string. Nothing about "what is open" lives in a panel channel.
|
|
|
|
export const PhotosScreen = () => {
|
|
const { section } = useParams();
|
|
const workspace = useDashboardState<LayoutNode>('screens/photos', defaultLayout);
|
|
|
|
// Bare /photos, or a section that doesn't exist, canonicalises rather than rendering a default behind a URL
|
|
// that names something else — the nav highlight comes from the router, so a bogus URL highlights nothing.
|
|
if (!isPhotosSection(section)) {
|
|
return <Navigate to={photosSectionPath(DEFAULT_PHOTOS_SECTION)} replace />;
|
|
}
|
|
|
|
return (
|
|
<div className="h-full w-full pt-2">
|
|
<WorkspaceView
|
|
workspace={workspace}
|
|
locked
|
|
appTypes={{ allowed: ['photos-nav', 'photos-view'], fallback: 'photos-view' }}
|
|
/>
|
|
</div>
|
|
);
|
|
};
|