From 0bbb846beb6f8aed8cc2f465f757f7aaa78ed64b Mon Sep 17 00:00:00 2001 From: yiling Date: Sat, 4 Jul 2026 15:22:38 +0800 Subject: [PATCH] fix(webui): support version switching on public share (no login redirect) Switching a version in the public share breadcrumb navigated to the authenticated /projects/:id/files/:id route, which triggered the authenticated /api/projects/:id/team call (via resolveTeamIdFromPath) -> 401 -> redirect to login. - breadcrumb handleVersionClick now routes to /share/:shareId/files/:id with a version search param when public. - public share route gains a version param; PublicShareManager fetches the stack asset (for the version list) and the active version child asset (for display/comments/fields), mirroring the authenticated page. - compare exit sets version to the active side for parity. --- packages/webui/components/breadcrumb-nav.tsx | 11 ++++- .../webui/components/public-share-manager.tsx | 47 ++++++++++++++++--- .../routes/share/$shareId/files/$fileId.tsx | 5 +- 3 files changed, 54 insertions(+), 9 deletions(-) diff --git a/packages/webui/components/breadcrumb-nav.tsx b/packages/webui/components/breadcrumb-nav.tsx index c34a8076..d3e3581a 100644 --- a/packages/webui/components/breadcrumb-nav.tsx +++ b/packages/webui/components/breadcrumb-nav.tsx @@ -94,7 +94,16 @@ export function BreadcrumbNav({ const { canEdit } = usePermissions(projectId) const handleVersionClick = (versionId: string) => { - if (!projectId || !fileId) return + if (!fileId) return + if (isPublic && shareId) { + navigate({ + to: '/share/$shareId/files/$fileId', + params: { shareId, fileId }, + search: (prev: Record) => ({ ...prev, version: versionId }), + }) + return + } + if (!projectId) return navigate({ to: '/projects/$projectId/files/$fileId', params: { projectId, fileId }, diff --git a/packages/webui/components/public-share-manager.tsx b/packages/webui/components/public-share-manager.tsx index c1c2d542..cea7ab65 100644 --- a/packages/webui/components/public-share-manager.tsx +++ b/packages/webui/components/public-share-manager.tsx @@ -28,6 +28,7 @@ interface PublicShareManagerProps { initialFolderId?: string initialFileId?: string startTime?: number + versionId?: string compare?: boolean compareLeftId?: string compareRightId?: string @@ -52,6 +53,7 @@ export function PublicShareManager({ initialFolderId, initialFileId, startTime, + versionId, compare, compareLeftId, compareRightId, @@ -98,6 +100,9 @@ export function PublicShareManager({ const currentFolderId = initialFolderId || shareInfo?.rootFolderId const viewingFileId = initialFileId || null + // The stack asset is always fetched by the route file id; when a version is + // selected we additionally display that version child asset. + const activeFileId = versionId || viewingFileId const [ancestorFolders, setAncestorFolders] = useState([]) @@ -229,7 +234,7 @@ export function PublicShareManager({ enabled: !!shareInfo, }) - const { data: viewingFileData, isLoading: isViewingFileLoading } = useQuery({ + const { data: stackFileData, isLoading: isStackFileLoading } = useQuery({ queryKey: ['public-share-file', shareId, viewingFileId, password], queryFn: async () => { const res = await client.api.shares[':shareId'].files[':fileId'].$get( @@ -248,6 +253,30 @@ export function PublicShareManager({ enabled: !!viewingFileId && !!shareInfo, }) + const { data: versionFileData, isLoading: isVersionFileLoading } = useQuery({ + queryKey: ['public-share-file', shareId, versionId, password], + queryFn: async () => { + const res = await client.api.shares[':shareId'].files[':fileId'].$get( + { + param: { shareId, fileId: versionId! }, + }, + { + headers: { + 'x-share-password': password, + }, + }, + ) + if (res.status === 401) throw new Error('Unauthorized') + return (await res.json()) as unknown as AssetInfo + }, + enabled: !!versionId && !!shareInfo, + }) + + // The stack asset provides the version list; the active asset (version child + // or the stack itself) is what we actually display. + const viewingFileData = versionId ? versionFileData : stackFileData + const isViewingFileLoading = isStackFileLoading || (!!versionId && isVersionFileLoading) + useEffect(() => { if (foldersError?.message === 'Unauthorized') { setPassword('') @@ -356,11 +385,13 @@ export function PublicShareManager({ } const handleCompareExit = () => { + const activeId = compareActiveSide === 'left' ? compareLeftId : compareRightId updateCompareSearch({ compare: undefined, cmpLeft: undefined, cmpRight: undefined, cmpActive: undefined, + version: activeId, }) } @@ -381,9 +412,9 @@ export function PublicShareManager({ currentAsset: { name: viewingFileData?.name || currentFolderName, type: viewingFileId ? 'file' : 'folder', - version: viewingFileData?.versionStack - ? (viewingFileData.versionStack.versions.find((v) => v.id === viewingFileData.id) - ?.version ?? viewingFileData.versionStack.versions.length) + version: stackFileData?.versionStack + ? (stackFileData.versionStack.versions.find((v) => v.id === activeFileId)?.version ?? + stackFileData.versionStack.versions.length) : undefined, }, isRootFolder: currentFolderId === shareInfo.rootFolderId && !viewingFileId, @@ -404,11 +435,11 @@ export function PublicShareManager({ onFolderClick: handleBreadcrumbClick, isRightSidebarCollapsed, onRightSidebarToggle: () => setIsRightSidebarCollapsed((prev) => !prev), - versions: viewingFileData?.versionStack?.versions, + versions: stackFileData?.versionStack?.versions, compareMode: isCompareMode, - canCompareVersions: (viewingFileData?.versionStack?.versions?.length ?? 0) >= 2, + canCompareVersions: (stackFileData?.versionStack?.versions?.length ?? 0) >= 2, onCompareVersions: () => { - const pair = pickDefaultCompareVersions(viewingFileData?.versionStack?.versions) + const pair = pickDefaultCompareVersions(stackFileData?.versionStack?.versions) if (!pair || !viewingFileId) return navigate({ to: '/share/$shareId/files/$fileId', @@ -431,6 +462,8 @@ export function PublicShareManager({ currentFolderId, folders, viewingFileData, + stackFileData, + activeFileId, viewingFileId, ancestorFolders, setProjectState, diff --git a/packages/webui/routes/share/$shareId/files/$fileId.tsx b/packages/webui/routes/share/$shareId/files/$fileId.tsx index c68503f7..c21c81e6 100644 --- a/packages/webui/routes/share/$shareId/files/$fileId.tsx +++ b/packages/webui/routes/share/$shareId/files/$fileId.tsx @@ -3,13 +3,14 @@ import { createFileRoute } from '@tanstack/react-router' function PublicShareFilePage() { const { shareId, fileId } = Route.useParams() - const { start, compare, cmpLeft, cmpRight, cmpActive } = Route.useSearch() + const { start, version, compare, cmpLeft, cmpRight, cmpActive } = Route.useSearch() return ( ) => { return { start: search.start ? Number(search.start) : undefined, + version: (search.version as string) || undefined, compare: search.compare === true || search.compare === 'true' || undefined, cmpLeft: (search.cmpLeft as string) || undefined, cmpRight: (search.cmpRight as string) || undefined, cmpActive: search.cmpActive === 'right' ? 'right' : undefined, } as { start?: number + version?: string compare?: boolean cmpLeft?: string cmpRight?: string