Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

fix(gfs-ui): stop presenting unreadable GFS children as previewable

M051e6faa2a39
diff --git a/desktop-app/src/appService.ts b/desktop-app/src/appService.ts
index 6c003efb8..2d0030825 100644
--- a/desktop-app/src/appService.ts
+++ b/desktop-app/src/appService.ts
@@ -1954,8 +1954,9 @@ export class AppService {
/**
* Delegate a grant to one or more subjects (each subjectKey → structured
* subject) in a single atomic bulk PUT. No-escalation is server-side.
- * `inherit` is renderer-driven (agent grants on directories default it ON so
- * contained files are covered); omitted means the client's historical `false`.
+ * `inherit` is renderer-driven; omitting it defaults the wire body to
+ * `true` so a folder grant always covers the folder's contents (the
+ * historical `false` default is what produced unreadable children).
*/
async grantGfs(
resourceId: string,
diff --git a/desktop-app/src/gfs/uriHandler.ts b/desktop-app/src/gfs/uriHandler.ts
index 20de03957..c471032e6 100644
--- a/desktop-app/src/gfs/uriHandler.ts
+++ b/desktop-app/src/gfs/uriHandler.ts
@@ -109,8 +109,19 @@ export interface GfsResourceView {
bytes: number
}
+/**
+ * Children-listing item: the resource view plus the server-computed `read`
+ * decision for the listing caller. Listing authorizes the directory only, so
+ * a child can be listed yet unreadable (e.g. a non-inheriting folder grant);
+ * `readable` is absent on older servers and must be treated as unknown, not
+ * as true.
+ */
+export interface GfsChildView extends GfsResourceView {
+ readable?: boolean
+}
+
export interface GfsChildrenPage {
- items: GfsResourceView[]
+ items: GfsChildView[]
nextCursor: string | null
}
@@ -151,6 +162,13 @@ export interface GfsGrantInput {
*/
subjects: GfsSubject[]
permissions: string[]
+ /**
+ * Whether the grant also covers the resource's descendants. Omitted
+ * defaults to `true`: a folder grant that silently skips the folder's
+ * contents (the historical default) leaves children unreadable while the
+ * folder itself still opens — the exact "403 on every file inside" trap.
+ * The flag is meaningless for files, which have no descendants.
+ */
inherit?: boolean
}
@@ -495,7 +513,7 @@ export class GfsClient {
resourceId: input.resourceId,
subjects: input.subjects,
permissions: input.permissions,
- inherit: input.inherit ?? false,
+ inherit: input.inherit ?? true,
},
}
)
diff --git a/desktop-app/src/httpClient.ts b/desktop-app/src/httpClient.ts
index 3013b5fae..f90eef145 100644
--- a/desktop-app/src/httpClient.ts
+++ b/desktop-app/src/httpClient.ts
@@ -88,6 +88,28 @@ async function sleep(ms: number): Promise<void> {
await new Promise(resolve => setTimeout(resolve, ms))
}
+/**
+ * Stringify an API error value for the ApiError message. Enveloped errors are
+ * objects like `{ code: 'forbidden', message: 'not authorized…' }` — plain
+ * `String()` on those yields "[object Object]", hiding the actual reason.
+ */
+function errorMessageFrom(error: unknown): string {
+ if (typeof error === 'string') return error
+ if (error && typeof error === 'object') {
+ const { code, message } = error as { code?: unknown; message?: unknown }
+ const parts = [code, message].filter(
+ (value): value is string => typeof value === 'string' && value.length > 0
+ )
+ if (parts.length > 0) return parts.join(': ')
+ try {
+ return JSON.stringify(error)
+ } catch {
+ return '[object Object]'
+ }
+ }
+ return String(error)
+}
+
export async function requestJson<T>(
method: 'GET' | 'POST' | 'PUT' | 'PATCH' | 'HEAD' | 'DELETE',
url: string,
@@ -122,7 +144,7 @@ export async function requestJson<T>(
let msg = raw || response.statusText
try {
const parsed = JSON.parse(raw) as { error?: unknown; message?: unknown }
- if (parsed.error) msg = String(parsed.error)
+ if (parsed.error) msg = errorMessageFrom(parsed.error)
if (parsed.message) msg = `${msg} - ${String(parsed.message)}`
} catch {
// Keep raw text as message.
diff --git a/desktop-app/test/gfsUriHandler.test.ts b/desktop-app/test/gfsUriHandler.test.ts
index 619119e89..aae6014ca 100644
--- a/desktop-app/test/gfsUriHandler.test.ts
+++ b/desktop-app/test/gfsUriHandler.test.ts
@@ -246,7 +246,9 @@ describe('GfsClient.grant', () => {
{ type: 'team', id: 't1' },
],
permissions: ['read', 'write'],
- inherit: false,
+ // Omitted inherit defaults to true: a folder grant that silently skips
+ // the folder's contents is the "403 on every file inside" trap.
+ inherit: true,
},
})
})
diff --git a/desktop-app/test/httpClient.test.ts b/desktop-app/test/httpClient.test.ts
index d1cd695dd..20de8f92f 100644
--- a/desktop-app/test/httpClient.test.ts
+++ b/desktop-app/test/httpClient.test.ts
@@ -32,6 +32,46 @@ function transientFetchError(message = 'fetch failed', code = 'ECONNRESET'): Err
return error
}
+describe('requestJson — error message formatting', () => {
+ beforeEach(() => {
+ vi.stubGlobal('fetch', vi.fn())
+ })
+
+ afterEach(() => {
+ vi.unstubAllGlobals()
+ })
+
+ it('unpacks an enveloped {code,message} error instead of "[object Object]"', async () => {
+ const fetchSpy = vi.mocked(global.fetch)
+ fetchSpy.mockResolvedValueOnce(
+ errorResponse(
+ 403,
+ JSON.stringify({
+ ok: false,
+ error: { code: 'forbidden', message: 'not authorized to read this resource' },
+ })
+ )
+ )
+
+ const error = await requestJson('GET', 'http://localhost/gfs/file').catch(e => e)
+
+ expect(error).toBeInstanceOf(ApiError)
+ expect(error.message).toBe('403 Error: forbidden: not authorized to read this resource')
+ expect(error.bodyText).toContain('not authorized to read this resource')
+ })
+
+ it('keeps a plain-string error and a top-level message field as before', async () => {
+ const fetchSpy = vi.mocked(global.fetch)
+ fetchSpy.mockResolvedValueOnce(
+ errorResponse(409, JSON.stringify({ error: 'version_conflict', message: 'stale write' }))
+ )
+
+ const error = await requestJson('GET', 'http://localhost/x').catch(e => e)
+
+ expect(error.message).toBe('409 Error: version_conflict - stale write')
+ })
+})
+
describe('requestJson — transient retry', () => {
beforeEach(() => {
vi.stubGlobal('fetch', vi.fn())
diff --git a/desktop-app/ui/src/components/GfsImagePreview/GfsImagePreview.test.tsx b/desktop-app/ui/src/components/GfsImagePreview/GfsImagePreview.test.tsx
new file mode 100644
index 000000000..3d9c19ecd
--- /dev/null
+++ b/desktop-app/ui/src/components/GfsImagePreview/GfsImagePreview.test.tsx
@@ -0,0 +1,88 @@
+// @vitest-environment jsdom
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { cleanup, render, screen, waitFor } from '@testing-library/react'
+import { GfsImagePreview } from './index'
+
+describe('GfsImagePreview layout', () => {
+ let sidebar: HTMLElement
+ let sidebarRight = 74
+ let resizeObserverCallback: (() => void) | null = null
+
+ beforeEach(() => {
+ Object.defineProperty(window, 'innerWidth', { configurable: true, value: 1280 })
+ Object.defineProperty(window, 'clerum', {
+ configurable: true,
+ value: {
+ gfs: {
+ download: vi.fn(async () => ({ bytes: new Uint8Array([1, 2, 3]).buffer })),
+ },
+ },
+ })
+ Object.defineProperty(URL, 'createObjectURL', {
+ configurable: true,
+ value: vi.fn(() => 'blob:gfs-image-preview'),
+ })
+ Object.defineProperty(URL, 'revokeObjectURL', {
+ configurable: true,
+ value: vi.fn(),
+ })
+
+ sidebar = document.createElement('aside')
+ sidebar.className = 'left-nav collapsed'
+ vi.spyOn(sidebar, 'getBoundingClientRect').mockImplementation(
+ () =>
+ ({
+ right: sidebarRight,
+ width: sidebarRight,
+ height: 800,
+ }) as DOMRect
+ )
+ document.body.appendChild(sidebar)
+
+ vi.stubGlobal(
+ 'ResizeObserver',
+ class {
+ constructor(callback: () => void) {
+ resizeObserverCallback = callback
+ }
+
+ observe() {}
+
+ disconnect() {}
+ }
+ )
+ })
+
+ afterEach(() => {
+ cleanup()
+ sidebar.remove()
+ resizeObserverCallback = null
+ vi.unstubAllGlobals()
+ vi.restoreAllMocks()
+ })
+
+ it('centers in the workspace and follows sidebar expansion changes', async () => {
+ render(
+ <GfsImagePreview
+ byteLength={3}
+ fileName="diagram.png"
+ gfsUri="gfs://main/image-1"
+ mimeType="image/png"
+ onClose={vi.fn()}
+ />
+ )
+
+ const modal = screen.getByRole('presentation')
+ expect((modal as HTMLElement).style.left).toBe('74px')
+ expect((modal as HTMLElement).style.right).toBe('0px')
+
+ sidebarRight = 328
+ sidebar.classList.remove('collapsed')
+ resizeObserverCallback?.()
+
+ await waitFor(() => {
+ expect((modal as HTMLElement).style.left).toBe('328px')
+ expect((modal as HTMLElement).style.right).toBe('0px')
+ })
+ })
+})
diff --git a/desktop-app/ui/src/components/GfsImagePreview/index.tsx b/desktop-app/ui/src/components/GfsImagePreview/index.tsx
index f19c11949..fa5230b15 100644
--- a/desktop-app/ui/src/components/GfsImagePreview/index.tsx
+++ b/desktop-app/ui/src/components/GfsImagePreview/index.tsx
@@ -1,10 +1,26 @@
-import { useEffect, useId, useRef, useState } from 'react'
+import { type CSSProperties, useEffect, useId, useLayoutEffect, useRef, useState } from 'react'
import { createPortal } from 'react-dom'
import { IconButton, StatusBanner } from '@components/Common'
import { IconClose, IconCopy } from '@components/SidebarNav/icons'
import { assertGfsImagePreviewSize } from '@lib/gfsImagePreview'
import type { GfsImagePreviewProps } from './types'
+const MOBILE_SIDEBAR_QUERY = '(max-width: 900px)'
+
+function readWorkspaceLeft(): number {
+ if (typeof window === 'undefined' || typeof document === 'undefined') return 0
+ if (window.matchMedia?.(MOBILE_SIDEBAR_QUERY).matches) return 0
+
+ const sidebar = document.querySelector<HTMLElement>('.left-nav')
+ if (!sidebar) return 0
+
+ const rect = sidebar.getBoundingClientRect()
+ const viewportWidth = window.innerWidth || document.documentElement.clientWidth
+ if (rect.width <= 0 || rect.height <= 0 || viewportWidth <= 0) return 0
+
+ return Math.max(0, Math.min(rect.right, viewportWidth))
+}
+
export function GfsImagePreview({
byteLength,
fileName,
@@ -19,10 +35,40 @@ export function GfsImagePreview({
const [sourceBlob, setSourceBlob] = useState<Blob | null>(null)
const [previewError, setPreviewError] = useState<string | null>(null)
const [copyState, setCopyState] = useState<'idle' | 'copied' | 'error'>('idle')
+ const [workspaceLeft, setWorkspaceLeft] = useState(0)
const copyResetTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null)
const mountedRef = useRef(true)
const onDownloadErrorRef = useRef(onDownloadError)
+ // The preview is portaled to document.body, so its grid would otherwise
+ // center against the whole window. Keep the dialog centered in the space to
+ // the right of the desktop sidebar as that sidebar is expanded or collapsed.
+ useLayoutEffect(() => {
+ const measure = (): void => {
+ const next = readWorkspaceLeft()
+ setWorkspaceLeft(current => (current === next ? current : next))
+ }
+
+ measure()
+ const sidebar = document.querySelector<HTMLElement>('.left-nav')
+ const resizeObserver =
+ sidebar && typeof ResizeObserver !== 'undefined' ? new ResizeObserver(measure) : null
+ resizeObserver?.observe(sidebar)
+
+ const mutationObserver =
+ sidebar && typeof MutationObserver !== 'undefined' ? new MutationObserver(measure) : null
+ mutationObserver?.observe(sidebar, { attributes: true, attributeFilter: ['class'] })
+
+ window.addEventListener('resize', measure)
+ window.addEventListener('scroll', measure, true)
+ return () => {
+ resizeObserver?.disconnect()
+ mutationObserver?.disconnect()
+ window.removeEventListener('resize', measure)
+ window.removeEventListener('scroll', measure, true)
+ }
+ }, [])
+
useEffect(() => {
onDownloadErrorRef.current = onDownloadError
}, [onDownloadError])
@@ -112,10 +158,14 @@ export function GfsImagePreview({
}
}
+ const backdropStyle: CSSProperties | undefined =
+ workspaceLeft > 0 ? { left: workspaceLeft, right: 0 } : undefined
+
return createPortal(
<div
className="da-gfs-image-preview-modal"
role="presentation"
+ style={backdropStyle}
onMouseDown={event => {
if (event.target === event.currentTarget) onClose()
}}
diff --git a/desktop-app/ui/src/components/GfsResourceMenu/index.tsx b/desktop-app/ui/src/components/GfsResourceMenu/index.tsx
index c6fb50056..83ce6af60 100644
--- a/desktop-app/ui/src/components/GfsResourceMenu/index.tsx
+++ b/desktop-app/ui/src/components/GfsResourceMenu/index.tsx
@@ -12,6 +12,7 @@ export function GfsResourceMenu({
onCreateFolder,
onDelete,
onOpen,
+ onOpenGfsLink,
onOpenChange,
onPreview,
onDownload,
@@ -111,6 +112,11 @@ export function GfsResourceMenu({
Open folder
</MenuItem>
) : null}
+ {onOpenGfsLink ? (
+ <MenuItem role="menuitem" onClick={() => runAction(onOpenGfsLink)}>
+ Open GFS link
+ </MenuItem>
+ ) : null}
{onPreview ? (
<MenuItem role="menuitem" onClick={() => runAction(onPreview)}>
Preview
@@ -136,9 +142,11 @@ export function GfsResourceMenu({
Download
</MenuItem>
) : null}
- <MenuItem role="menuitem" onClick={() => runAction(onCopyLink)}>
- Copy GFS link
- </MenuItem>
+ {onCopyLink ? (
+ <MenuItem role="menuitem" onClick={() => runAction(onCopyLink)}>
+ Copy GFS link
+ </MenuItem>
+ ) : null}
{onDelete ? (
<MenuItem color="danger" role="menuitem" onClick={() => runAction(onDelete)}>
Delete
diff --git a/desktop-app/ui/src/components/GfsResourceMenu/types.ts b/desktop-app/ui/src/components/GfsResourceMenu/types.ts
index b4ca9834d..5acded69f 100644
--- a/desktop-app/ui/src/components/GfsResourceMenu/types.ts
+++ b/desktop-app/ui/src/components/GfsResourceMenu/types.ts
@@ -1,10 +1,11 @@
export type GfsResourceMenuProps = {
resourceName: string
onManage?: () => void
- onCopyLink: () => void
+ onCopyLink?: () => void
onCreateFolder?: () => void
onDelete?: () => void
onOpen?: () => void
+ onOpenGfsLink?: () => void
/**
* Notified on open-state transitions so callers can lazily load per-row data
* (e.g. delete affordances) only while a menu is open.
diff --git a/desktop-app/ui/src/components/SidebarNav/icons.tsx b/desktop-app/ui/src/components/SidebarNav/icons.tsx
index 66a1cdfe8..054ee7399 100644
--- a/desktop-app/ui/src/components/SidebarNav/icons.tsx
+++ b/desktop-app/ui/src/components/SidebarNav/icons.tsx
@@ -296,6 +296,14 @@ export function IconClose(props: IconProps) {
)
}
+export function IconCheck(props: IconProps) {
+ return (
+ <svg viewBox="0 0 24 24" aria-hidden="true" {...BASE_STROKE_PROPS} {...props}>
+ <path d="m5 12 4 4L19 6" />
+ </svg>
+ )
+}
+
export function IconRefresh(props: IconProps) {
return (
<svg viewBox="0 0 24 24" aria-hidden="true" {...BASE_STROKE_PROPS} {...props}>
diff --git a/desktop-app/ui/src/hooks/domain/useGfsBrowserController.ts b/desktop-app/ui/src/hooks/domain/useGfsBrowserController.ts
index 9470c42b2..c95be3eac 100644
--- a/desktop-app/ui/src/hooks/domain/useGfsBrowserController.ts
+++ b/desktop-app/ui/src/hooks/domain/useGfsBrowserController.ts
@@ -34,6 +34,12 @@ export interface GfsBrowserChild {
path: string | null
version: number
bytes: number
+ /**
+ * Server-computed read decision for the listing caller. Absent on older
+ * servers (treat as unknown); `false` means the row is visible but cannot
+ * be opened or downloaded — a folder grant without inheritance.
+ */
+ readable?: boolean
}
interface GfsAccessibleResource extends GfsBrowserChild {
@@ -623,6 +629,13 @@ export function useGfsBrowserController(options: GfsBrowserControllerOptions = {
setCrumbs(prev => prev.slice(0, index + 1))
}, [])
+ /** Restore an exact browser location after a transient resource selection
+ * (for example, opening a row's Manage dialog). */
+ const restoreCrumbs = useCallback((nextCrumbs: GfsCrumb[]) => {
+ setCrumbs(nextCrumbs)
+ setOpenError(null)
+ }, [])
+
const reset = useCallback(() => {
setCrumbs([])
setOpenError(null)
@@ -630,9 +643,9 @@ export function useGfsBrowserController(options: GfsBrowserControllerOptions = {
}, [queryClient])
// Delegation actions throw on server rejection (e.g. 403 escalation_rejected);
- // the caller surfaces that — never swallow it. `inherit` is only sent when a
- // caller passes it explicitly (the agent section, directories only); the
- // user/team panel keeps today's inherit:false behavior by omitting it.
+ // the caller surfaces that — never swallow it. `inherit` omitted defaults to
+ // `true` on the wire (uriHandler), so user/team panel grants cover folder
+ // contents; callers that need a contents-excluding grant pass `false`.
const grant = useCallback(
(subjectKeys: string[], bits: string[], inherit?: boolean): Promise<void> => {
if (!current) return Promise.reject(new Error('No resource selected'))
@@ -704,6 +717,7 @@ export function useGfsBrowserController(options: GfsBrowserControllerOptions = {
openResource,
openChild,
goToCrumb,
+ restoreCrumbs,
reset,
refreshAffordances,
grant,
diff --git a/desktop-app/ui/src/pages/FilesPage.tsx b/desktop-app/ui/src/pages/FilesPage.tsx
index 6597dff4e..8a9072131 100644
--- a/desktop-app/ui/src/pages/FilesPage.tsx
+++ b/desktop-app/ui/src/pages/FilesPage.tsx
@@ -7,7 +7,7 @@ import {
useState,
} from 'react'
import { useQuery, useQueryClient } from '@tanstack/react-query'
-import { Button, EmptyState, IconButton, StatusBanner, TextInput } from '@components/Common'
+import { Badge, Button, EmptyState, IconButton, StatusBanner, TextInput } from '@components/Common'
import { ConfirmDialog } from '@components/ConfirmDialog'
import { GfsFileIcon } from '@components/GfsFileIcon'
import { GfsImagePreview } from '@components/GfsImagePreview'
@@ -16,15 +16,16 @@ import { GfsResourceMenu } from '@components/GfsResourceMenu'
import { GfsVideoPreview } from '@components/GfsVideoPreview'
import {
IconAttachFile,
+ IconCheck,
IconChevronRight,
IconClose,
IconConnectors,
IconContexts,
IconDownload,
- IconEye,
+ IconUpload,
} from '@components/SidebarNav/icons'
import { desktopQueryKeys } from '@hooks/domain/queryKeys'
-import { useGfsBrowserController } from '@hooks/domain/useGfsBrowserController'
+import { type GfsCrumb, useGfsBrowserController } from '@hooks/domain/useGfsBrowserController'
import { isEventFromNestedInteractive } from '@lib/clickableRowProps'
import { assertGfsFileUploadSize } from '@lib/gfsFileUpload'
import { describeGfsGrantError } from '@lib/gfsGrantErrors'
@@ -151,6 +152,71 @@ type GfsActionTarget = Pick<GfsDriveResource, 'resourceId' | 'name' | 'version'>
kind: 'file' | 'directory'
}
+type GfsInlineRenameProps = {
+ value: string
+ busy?: boolean
+ className?: string
+ onChange: (value: string) => void
+ onCancel: () => void
+ onSubmit: () => void
+}
+
+function GfsInlineRename({
+ value,
+ busy = false,
+ className,
+ onChange,
+ onCancel,
+ onSubmit,
+}: GfsInlineRenameProps) {
+ return (
+ <form
+ aria-label="Rename resource"
+ className={`da-gfs-inline-rename${className ? ` ${className}` : ''}`}
+ onClick={event => event.stopPropagation()}
+ onSubmit={event => {
+ event.preventDefault()
+ onSubmit()
+ }}
+ >
+ <TextInput
+ aria-label="New name"
+ autoFocus
+ className="da-gfs-inline-rename__input"
+ dense
+ value={value}
+ onChange={event => onChange(event.currentTarget.value)}
+ onFocus={event => event.currentTarget.select()}
+ />
+ <span className="da-gfs-inline-rename__actions">
+ <IconButton
+ color="success"
+ className="da-gfs-inline-rename__confirm"
+ disabled={!value.trim()}
+ label="Save name"
+ loading={busy}
+ size="xs"
+ type="submit"
+ variant="soft"
+ >
+ <IconCheck />
+ </IconButton>
+ <IconButton
+ className="da-gfs-inline-rename__cancel"
+ disabled={busy}
+ label="Cancel rename"
+ size="xs"
+ type="button"
+ variant="ghost"
+ onClick={onCancel}
+ >
+ <IconClose />
+ </IconButton>
+ </span>
+ </form>
+ )
+}
+
export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }: FilesPageProps) {
const [createFolderName, setCreateFolderName] = useState('')
const [createFolderOpen, setCreateFolderOpen] = useState(false)
@@ -166,6 +232,8 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
const [filePreview, setFilePreview] = useState<GfsPreviewResource | null>(null)
const [dragActive, setDragActive] = useState(false)
const [droppedUploadCount, setDroppedUploadCount] = useState(0)
+ const manageReturnCrumbsRef = useRef<GfsCrumb[] | null>(null)
+ const uploadInputRef = useRef<HTMLInputElement | null>(null)
const replaceInputRef = useRef<HTMLInputElement | null>(null)
const uploadNameReservationsRef = useRef(new Map<string, Set<string>>())
const queryClient = useQueryClient()
@@ -257,12 +325,19 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
() => (ctrl.sharesError ? describeGfsGrantError(ctrl.sharesError) : null),
[ctrl.sharesError]
)
+ const closeManage = useCallback(() => {
+ setManageOpen(false)
+ const returnCrumbs = manageReturnCrumbsRef.current
+ manageReturnCrumbsRef.current = null
+ if (returnCrumbs) ctrl.restoreCrumbs(returnCrumbs)
+ }, [ctrl.restoreCrumbs])
const accessRevoked = ctrl.accessState === 'revoked'
// R4 spec §1: on an authority failure every local surface that could show
// or act on stale GFS data must close — preview bytes, Manage, Move, rename,
// delete, open-link, and the inline create-folder form.
useEffect(() => {
if (!accessRevoked) return
+ manageReturnCrumbsRef.current = null
setFilePreview(null)
setManageOpen(false)
setMoveTarget(null)
@@ -363,14 +438,14 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
if (!manageOpen && !openLinkOpen && !moveTarget && !renameTarget) return
const handleKeyDown = (event: KeyboardEvent) => {
if (event.key !== 'Escape') return
- setManageOpen(false)
+ closeManage()
setOpenLinkOpen(false)
setMoveTarget(null)
setRenameTarget(null)
}
window.addEventListener('keydown', handleKeyDown)
return () => window.removeEventListener('keydown', handleKeyDown)
- }, [manageOpen, openLinkOpen, moveTarget, renameTarget])
+ }, [closeManage, manageOpen, openLinkOpen, moveTarget, renameTarget])
// One atomic bulk grant for every selected subject — the server grants all or
// none (a `subjects_invalid` rejects the whole request), so there is no
@@ -444,9 +519,14 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
}
const handleOpenGfsLink = async (uri: string) => {
+ const returnCrumbs = [...crumbs]
const opened = await ctrl.openUri(uri)
if (opened === false) return false
- if (typeof opened === 'object' && opened.kind === 'file') openFilePreview(opened)
+ if (typeof opened === 'object' && opened.kind === 'file') {
+ const previewOpened = openFilePreview(opened)
+ ctrl.restoreCrumbs(returnCrumbs)
+ if (!previewOpened) await handleDownload(opened.gfsUri, opened.name)
+ }
return true
}
@@ -596,7 +676,10 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
if (!requestedName) return
try {
const name = await normalizeGfsResourceName(requestedName)
- if (name === current.name) return
+ if (name === current.name) {
+ setRenameOpen(false)
+ return
+ }
await ctrl.renameResource(current.resourceId, name, current.version)
setRenameOpen(false)
pushToast?.(`Renamed to ${name}`, 'success')
@@ -611,7 +694,7 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
try {
await ctrl.deleteResource(current.resourceId, current.version)
setDeleteOpen(false)
- setManageOpen(false)
+ closeManage()
pushToast?.(`Deleted ${current.name}`, 'success')
} catch (deleteError) {
if (failClosedOnAuthorizationError(deleteError)) return
@@ -686,9 +769,9 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
if (current) setMoveTarget(current)
}
- /** Page-level rename works for any row or the current resource; the manage
- * dialog keeps its own inline title-edit flow. Errors toast (stale version
- * → retry), matching the manage-dialog rename behavior. */
+ /** Page-level rename works inline for any row or the current resource; the
+ * manage dialog keeps its own inline title-edit flow. Errors toast (stale
+ * version → retry), matching the manage-dialog rename behavior. */
const handleRenameTarget = async () => {
if (!renameTarget) return
const target = renameTarget
@@ -733,7 +816,12 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
const loadingMoreVisible = currentIsFolder ? ctrl.isFetchingMore : ctrl.isFetchingMoreAccessible
const openManage = (resource: GfsDriveResource) => {
- if (resource.resourceId !== current?.resourceId) ctrl.openResource(resource)
+ if (resource.resourceId !== current?.resourceId) {
+ manageReturnCrumbsRef.current = [...crumbs]
+ ctrl.openResource(resource)
+ } else {
+ manageReturnCrumbsRef.current = resource.kind === 'file' ? crumbs.slice(0, -1) : null
+ }
setCreateFolderOpen(false)
setRenameOpen(false)
setDeleteOpen(false)
@@ -741,6 +829,14 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
}
const openResource = (resource: GfsDriveResource) => {
+ // The children listing marks rows the session cannot read (e.g. a folder
+ // grant without inheritance). Surfacing that here keeps the click honest
+ // instead of failing later with a bare download 403. Rows without the
+ // flag (older servers) keep today's behavior.
+ if (resource.readable === false) {
+ pushToast?.(`You do not have read access to ${resource.name || resource.drive}`, 'error')
+ return
+ }
if (resource.kind === 'directory') {
if (currentIsFolder) ctrl.openChild(resource)
else ctrl.openResource(resource)
@@ -750,6 +846,11 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
void handleDownload(resource.gfsUri, resource.name)
}
+ const currentIsBeingRenamed = renameTarget?.resourceId === current?.resourceId
+ const currentIsInBreadcrumbs = Boolean(
+ current && crumbs.some(crumb => crumb.resourceId === current.resourceId)
+ )
+
return (
<section className="page da-gfs-page">
<div className="page-header">
@@ -775,6 +876,7 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
color="neutral"
disabled={!current}
onClick={() => {
+ manageReturnCrumbsRef.current = null
setManageOpen(false)
ctrl.reset()
}}
@@ -785,19 +887,46 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
{crumbs.map((crumb, index) => (
<span className="da-gfs-drive__crumb-group" key={crumb.resourceId}>
<IconChevronRight aria-hidden="true" />
- <Button
- className="da-gfs-drive__breadcrumb"
- color="neutral"
- disabled={index === crumbs.length - 1}
- onClick={() => ctrl.goToCrumb(index)}
- variant="text"
- >
- {crumb.name}
- </Button>
+ {renameTarget?.resourceId === crumb.resourceId ? (
+ <GfsInlineRename
+ className="da-gfs-drive__inline-rename"
+ onCancel={() => setRenameTarget(null)}
+ onChange={setRenameDraft}
+ onSubmit={() => void handleRenameTarget()}
+ value={renameDraft}
+ busy={ctrl.mutating}
+ />
+ ) : (
+ <Button
+ className="da-gfs-drive__breadcrumb"
+ color="neutral"
+ disabled={index === crumbs.length - 1}
+ onClick={() => ctrl.goToCrumb(index)}
+ variant="text"
+ >
+ {crumb.name}
+ </Button>
+ )}
</span>
))}
</nav>
- {current && !currentIsFile ? (
+ {!current ? (
+ <GfsResourceMenu
+ resourceName="Shared with me"
+ onOpenGfsLink={() => setOpenLinkOpen(true)}
+ />
+ ) : null}
+ {current && !currentIsFile && currentIsBeingRenamed && !currentIsInBreadcrumbs ? (
+ <GfsInlineRename
+ className="da-gfs-drive__inline-rename"
+ onCancel={() => setRenameTarget(null)}
+ onChange={setRenameDraft}
+ onSubmit={() => void handleRenameTarget()}
+ value={renameDraft}
+ busy={ctrl.mutating}
+ />
+ ) : null}
+ {current && !currentIsFile && !currentIsBeingRenamed ? (
<GfsResourceMenu
resourceName={current.name}
onManage={() => {
@@ -808,22 +937,51 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
}}
onCopyLink={() => void handleCopyLink(current.gfsUri)}
onDelete={canDeleteCurrent ? () => setDeleteTarget(current) : undefined}
+ onOpenGfsLink={() => setOpenLinkOpen(true)}
onRename={canWriteCurrent ? () => openRenameTarget(current) : undefined}
onMove={requestMoveCurrent}
/>
) : null}
</div>
- <div className="da-gfs-drive__header-actions">
- <Button
- color="neutral"
- onClick={() => setOpenLinkOpen(true)}
- size="sm"
- variant="outline"
- >
- <IconEye width={16} height={16} />
- Open GFS link
- </Button>
- </div>
+ {currentIsFolder && canWriteCurrent ? (
+ <div className="da-gfs-drive__header-actions">
+ <Button
+ disabled={ctrl.mutating}
+ onClick={() => {
+ setCreateFolderName('')
+ setCreateFolderOpen(true)
+ setRenameOpen(false)
+ setDeleteOpen(false)
+ setManageOpen(true)
+ }}
+ size="sm"
+ >
+ <IconContexts width={16} height={16} />
+ New folder
+ </Button>
+ <Button
+ color="neutral"
+ disabled={ctrl.mutating}
+ onClick={() => uploadInputRef.current?.click()}
+ size="sm"
+ variant="outline"
+ >
+ <IconUpload width={16} height={16} />
+ Upload file
+ </Button>
+ <input
+ aria-label="Upload file"
+ className="visually-hidden"
+ ref={uploadInputRef}
+ type="file"
+ onChange={event => {
+ const file = event.currentTarget.files?.[0]
+ event.currentTarget.value = ''
+ void handleUploadFile(file)
+ }}
+ />
+ </div>
+ ) : null}
</div>
{dragActive || droppedUploadCount > 0 ? (
@@ -873,24 +1031,38 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
</span>
<div className="da-gfs-current-file__copy">
<div className="da-gfs-current-file__title-row">
- <h3>{current.name}</h3>
- <GfsResourceMenu
- resourceName={current.name}
- onManage={() => {
- setCreateFolderOpen(false)
- setRenameOpen(false)
- setDeleteOpen(false)
- setManageOpen(true)
- }}
- onCopyLink={() => void handleCopyLink(current.gfsUri)}
- onDelete={canDeleteCurrent ? () => setDeleteTarget(current) : undefined}
- onRename={canWriteCurrent ? () => openRenameTarget(current) : undefined}
- onMove={requestMoveCurrent}
- onPreview={
- currentPreviewAvailable ? () => void openFilePreview(current) : undefined
- }
- onDownload={() => void handleDownload(current.gfsUri, current.name)}
- />
+ {currentIsBeingRenamed ? (
+ <GfsInlineRename
+ className="da-gfs-current-file__inline-rename"
+ onCancel={() => setRenameTarget(null)}
+ onChange={setRenameDraft}
+ onSubmit={() => void handleRenameTarget()}
+ value={renameDraft}
+ busy={ctrl.mutating}
+ />
+ ) : (
+ <>
+ <h3>{current.name}</h3>
+ <GfsResourceMenu
+ resourceName={current.name}
+ onManage={() => {
+ manageReturnCrumbsRef.current = crumbs.slice(0, -1)
+ setCreateFolderOpen(false)
+ setRenameOpen(false)
+ setDeleteOpen(false)
+ setManageOpen(true)
+ }}
+ onCopyLink={() => void handleCopyLink(current.gfsUri)}
+ onDelete={canDeleteCurrent ? () => setDeleteTarget(current) : undefined}
+ onRename={canWriteCurrent ? () => openRenameTarget(current) : undefined}
+ onMove={requestMoveCurrent}
+ onPreview={
+ currentPreviewAvailable ? () => void openFilePreview(current) : undefined
+ }
+ onDownload={() => void handleDownload(current.gfsUri, current.name)}
+ />
+ </>
+ )}
</div>
<p className="muted">
{currentPreviewAvailable
@@ -931,7 +1103,11 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
key={resource.resourceId}
role="button"
tabIndex={0}
- aria-label={`Open ${resource.name || resource.drive}`}
+ aria-label={
+ resource.readable === false
+ ? `${resource.name || resource.drive} (no read access)`
+ : `Open ${resource.name || resource.drive}`
+ }
onClick={event => {
if (isEventFromNestedInteractive(event)) return
openResource(resource)
@@ -952,14 +1128,27 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
</span>
<span className="da-gfs-list__identity da-grid__cell">
<span className="da-gfs-list__name">
- <Button
- align="start"
- block
- onClick={() => openResource(resource)}
- variant="text"
- >
- {resource.name || resource.drive}
- </Button>
+ {renameTarget?.resourceId === resource.resourceId ? (
+ <GfsInlineRename
+ onCancel={() => setRenameTarget(null)}
+ onChange={setRenameDraft}
+ onSubmit={() => void handleRenameTarget()}
+ value={renameDraft}
+ busy={ctrl.mutating}
+ />
+ ) : (
+ <Button
+ align="start"
+ block
+ onClick={() => openResource(resource)}
+ variant="text"
+ >
+ {resource.name || resource.drive}
+ </Button>
+ )}
+ {resource.readable === false ? (
+ <Badge tone="neutral">No access</Badge>
+ ) : null}
</span>
</span>
<span className="da-gfs-drive__size da-grid__cell da-grid__cell--right">
@@ -972,6 +1161,7 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
onClick={() => void handleDownload(resource.gfsUri, resource.name)}
size="sm"
variant="ghost"
+ disabled={resource.readable === false}
>
<IconDownload width={16} height={16} />
</IconButton>
@@ -1077,7 +1267,7 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
className="da-gfs-manage-modal"
role="presentation"
onMouseDown={event => {
- if (event.target === event.currentTarget) setManageOpen(false)
+ if (event.target === event.currentTarget) closeManage()
}}
>
<section
@@ -1183,7 +1373,7 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
<IconButton
autoFocus
label="Close manage dialog"
- onClick={() => setManageOpen(false)}
+ onClick={closeManage}
size="sm"
variant="ghost"
>
@@ -1209,14 +1399,18 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
<div className="da-gfs-manage-dialog__body">
{currentIsFolder && canWriteCurrent && createFolderOpen ? (
<form
- className="da-gfs-inline-form"
+ className="da-gfs-inline-form da-gfs-create-folder-form"
aria-label="Create folder"
onSubmit={event => {
event.preventDefault()
void handleCreateFolder()
}}
>
- <label className="da-gfs-inline-form__field">
+ <div className="da-gfs-create-folder-form__heading">
+ <h4>New folder</h4>
+ <p className="muted">Create a folder in {current.name}.</p>
+ </div>
+ <label className="da-gfs-inline-form__field da-gfs-create-folder-form__field">
<span>Folder name</span>
<TextInput
autoFocus
@@ -1224,20 +1418,22 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
onChange={event => setCreateFolderName(event.currentTarget.value)}
/>
</label>
- <Button loading={ctrl.mutating} size="sm" type="submit">
- Create folder
- </Button>
- <Button
- onClick={() => {
- setCreateFolderName('')
- setCreateFolderOpen(false)
- }}
- size="sm"
- type="button"
- variant="ghost"
- >
- Cancel
- </Button>
+ <div className="da-gfs-create-folder-form__actions">
+ <Button
+ onClick={() => {
+ setCreateFolderName('')
+ setCreateFolderOpen(false)
+ }}
+ size="sm"
+ type="button"
+ variant="ghost"
+ >
+ Cancel
+ </Button>
+ <Button loading={ctrl.mutating} size="sm" type="submit">
+ Create folder
+ </Button>
+ </div>
</form>
) : null}
{canDeleteCurrent && deleteOpen ? (
@@ -1382,54 +1578,6 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
target={moveTarget}
/>
) : null}
-
- {renameTarget ? (
- <div
- className="da-gfs-manage-modal"
- role="presentation"
- onMouseDown={event => {
- if (event.target === event.currentTarget) setRenameTarget(null)
- }}
- >
- <section
- className="da-gfs-manage-dialog da-gfs-manage-dialog--confirm"
- role="dialog"
- aria-modal="true"
- aria-label="Rename resource"
- >
- <div className="da-gfs-manage-dialog__body">
- <form
- className="da-gfs-inline-form"
- onSubmit={event => {
- event.preventDefault()
- void handleRenameTarget()
- }}
- >
- <label className="da-gfs-inline-form__field">
- <span>New name for {renameTarget.name}</span>
- <TextInput
- autoFocus
- aria-label="New name"
- value={renameDraft}
- onChange={event => setRenameDraft(event.currentTarget.value)}
- />
- </label>
- <Button loading={ctrl.mutating} size="sm" type="submit">
- Save
- </Button>
- <Button
- onClick={() => setRenameTarget(null)}
- size="sm"
- type="button"
- variant="ghost"
- >
- Cancel
- </Button>
- </form>
- </div>
- </section>
- </div>
- ) : null}
</section>
)
}
diff --git a/desktop-app/ui/src/pages/__tests__/FilesPage.test.tsx b/desktop-app/ui/src/pages/__tests__/FilesPage.test.tsx
index 2d3d0c12c..2b5c6016c 100644
--- a/desktop-app/ui/src/pages/__tests__/FilesPage.test.tsx
+++ b/desktop-app/ui/src/pages/__tests__/FilesPage.test.tsx
@@ -47,6 +47,7 @@ function baseController() {
openResource: vi.fn(),
openChild: vi.fn(),
goToCrumb: vi.fn(),
+ restoreCrumbs: vi.fn(),
grant: vi.fn(),
grants: [],
grantsError: null,
@@ -292,6 +293,82 @@ describe('FilesPage', () => {
)
})
+ it('marks unreadable rows and refuses to open them instead of failing with a download 403', async () => {
+ const openChild = vi.fn()
+ hookMock.useGfsBrowserController.mockReturnValue({
+ ...baseController(),
+ openChild,
+ current: {
+ resourceId: 'parent-1',
+ gfsUri: 'gfs://main/parent-1',
+ name: 'Workspace',
+ kind: 'directory',
+ version: 1,
+ },
+ items: [
+ {
+ resourceId: 'file-locked',
+ rid: 'file-locked',
+ gfsUri: 'gfs://main/file-locked',
+ drive: 'main',
+ parentResourceId: 'parent-1',
+ name: 'locked.txt',
+ kind: 'file',
+ path: '/locked.txt',
+ version: 1,
+ bytes: 8,
+ readable: false,
+ },
+ {
+ resourceId: 'dir-locked',
+ rid: 'dir-locked',
+ gfsUri: 'gfs://main/dir-locked',
+ drive: 'main',
+ parentResourceId: 'parent-1',
+ name: 'sealed',
+ kind: 'directory',
+ path: '/sealed',
+ version: 1,
+ bytes: 0,
+ readable: false,
+ },
+ {
+ resourceId: 'file-open',
+ rid: 'file-open',
+ gfsUri: 'gfs://main/file-open',
+ drive: 'main',
+ parentResourceId: 'parent-1',
+ name: 'open.md',
+ kind: 'file',
+ path: '/open.md',
+ version: 1,
+ bytes: 4,
+ readable: true,
+ },
+ ],
+ })
+
+ const pushToast = vi.fn()
+ renderFilesPage(pushToast)
+
+ // Only the unreadable rows carry the badge and the no-access label.
+ expect(screen.getAllByText('No access')).toHaveLength(2)
+ expect(screen.getByRole('button', { name: 'locked.txt (no read access)' })).not.toBeNull()
+ expect(screen.queryByRole('button', { name: 'open.md (no read access)' })).toBeNull()
+
+ await act(async () => {
+ fireEvent.click(screen.getByRole('button', { name: 'locked.txt' }))
+ })
+
+ expect(pushToast).toHaveBeenCalledWith('You do not have read access to locked.txt', 'error')
+ // The unreadable directory row also never navigates into the folder.
+ await act(async () => {
+ fireEvent.click(screen.getByRole('button', { name: 'sealed' }))
+ })
+ expect(pushToast).toHaveBeenCalledTimes(2)
+ expect(openChild).not.toHaveBeenCalled()
+ })
+
it('uses a size column and keeps folder rows focused on the icon and name', () => {
hookMock.useGfsBrowserController.mockReturnValue({
...baseController(),
@@ -400,7 +477,8 @@ describe('FilesPage', () => {
expect(deleteResource).toHaveBeenCalledWith('folder-1', 7)
})
- it('does not render a folder upload control inside the manage dialog', async () => {
+ it('shows top-right create and upload actions for the open writable folder', async () => {
+ const createFileFromPath = vi.fn(async () => undefined)
hookMock.useGfsBrowserController.mockReturnValue({
...baseController(),
current: {
@@ -416,15 +494,88 @@ describe('FilesPage', () => {
grantableBits: [],
canCreateShare: false,
},
+ createFileFromPath,
})
renderFilesPage()
- await openManageDialog('Team folder')
+ const toolbar = document.querySelector('.da-gfs-drive__header-actions')
+ const newFolderButton = screen.getByRole('button', { name: 'New folder' })
+ const uploadButton = screen.getByRole('button', { name: 'Upload file' })
+ expect(toolbar?.contains(newFolderButton)).toBe(true)
+ expect(toolbar?.contains(uploadButton)).toBe(true)
+ expect(screen.queryByRole('button', { name: 'Open GFS link' })).toBeNull()
+
+ fireEvent.click(screen.getByRole('button', { name: 'Options for Team folder' }))
+ fireEvent.click(screen.getByRole('menuitem', { name: 'Open GFS link' }))
+ expect(screen.getByRole('dialog', { name: 'Open GFS link' })).toBeTruthy()
+ fireEvent.click(screen.getByRole('button', { name: 'Close GFS link dialog' }))
+
+ fireEvent.click(newFolderButton)
+ const createFolderForm = screen.getByRole('form', { name: 'Create folder' })
+ expect(within(createFolderForm).getByRole('heading', { name: 'New folder' })).toBeTruthy()
+ expect(createFolderForm.querySelector('.da-gfs-create-folder-form__actions')).not.toBeNull()
+
+ const upload = new File(['desktop file'], 'notes.md', { type: 'text/markdown' })
+ await act(async () => {
+ fireEvent.change(screen.getByLabelText('Upload file'), { target: { files: [upload] } })
+ await Promise.resolve()
+ })
+
+ expect(createFileFromPath).toHaveBeenCalledWith('folder-1', 'notes.md', '/tmp/notes.md')
+ })
+
+ it('hides top-right create and upload actions without write access to the open folder', () => {
+ hookMock.useGfsBrowserController.mockReturnValue({
+ ...baseController(),
+ current: {
+ resourceId: 'folder-1',
+ gfsUri: 'gfs://main/folder-1',
+ name: 'Restricted folder',
+ kind: 'directory',
+ version: 7,
+ },
+ affordances: {
+ held: ['read'],
+ canDelegate: false,
+ grantableBits: [],
+ canCreateShare: false,
+ },
+ })
+
+ renderFilesPage()
+
+ expect(screen.queryByRole('button', { name: 'New folder' })).toBeNull()
expect(screen.queryByRole('button', { name: 'Upload file' })).toBeNull()
expect(screen.queryByLabelText('Upload file')).toBeNull()
})
+ it('does not render a folder upload control inside the manage dialog', async () => {
+ hookMock.useGfsBrowserController.mockReturnValue({
+ ...baseController(),
+ current: {
+ resourceId: 'folder-1',
+ gfsUri: 'gfs://main/folder-1',
+ name: 'Team folder',
+ kind: 'directory',
+ version: 7,
+ },
+ affordances: {
+ held: ['read', 'write'],
+ canDelegate: false,
+ grantableBits: [],
+ canCreateShare: false,
+ },
+ })
+
+ renderFilesPage()
+
+ await openManageDialog('Team folder')
+ const dialog = screen.getByRole('dialog', { name: 'Manage folder Team folder' })
+ expect(within(dialog).queryByRole('button', { name: 'Upload file' })).toBeNull()
+ expect(within(dialog).queryByLabelText('Upload file')).toBeNull()
+ })
+
it('uploads dropped files into the open writable folder', async () => {
const createFileFromPath = vi.fn(
async (_parentResourceId: string, _name: string, _filePath: string) => undefined
@@ -957,6 +1108,109 @@ describe('FilesPage', () => {
expect(pushToast).toHaveBeenCalledWith('precondition_failed: stale resource version', 'error')
})
+ it('returns to Shared with me after closing Manage for a file row', async () => {
+ const managedFile = {
+ resourceId: 'file-1',
+ rid: 'file-1',
+ gfsUri: 'gfs://main/file-1',
+ drive: 'main',
+ parentResourceId: null,
+ name: 'report.txt',
+ kind: 'file' as const,
+ path: '/report.txt',
+ version: 7,
+ bytes: 128,
+ sources: ['grant'],
+ permissions: ['read', 'write'],
+ coversDescendants: false,
+ }
+ const restoreCrumbs = vi.fn()
+
+ function useManageFileController() {
+ const [crumbs, setCrumbs] = useState<GfsCrumb[]>([])
+ const current = crumbs.at(-1) ?? null
+ return {
+ ...baseController(),
+ current,
+ crumbs,
+ accessibleResources: current ? [] : [managedFile],
+ affordances: current
+ ? {
+ held: ['read', 'write'],
+ canDelegate: false,
+ grantableBits: [],
+ canCreateShare: false,
+ }
+ : null,
+ openResource: (resource: typeof managedFile) =>
+ setCrumbs([
+ {
+ resourceId: resource.resourceId,
+ gfsUri: resource.gfsUri,
+ name: resource.name,
+ kind: resource.kind,
+ version: resource.version,
+ bytes: resource.bytes,
+ },
+ ]),
+ restoreCrumbs: (nextCrumbs: GfsCrumb[]) => {
+ restoreCrumbs(nextCrumbs)
+ setCrumbs(nextCrumbs)
+ },
+ }
+ }
+ hookMock.useGfsBrowserController.mockImplementation(useManageFileController)
+
+ renderFilesPage()
+ await openManageDialog('report.txt')
+ fireEvent.click(screen.getByRole('button', { name: 'Close manage dialog' }))
+
+ await waitFor(() => expect(restoreCrumbs).toHaveBeenCalledWith([]))
+ expect(screen.getByRole('button', { name: 'report.txt' })).toBeTruthy()
+ expect(screen.queryByText(/Preview this file again/)).toBeNull()
+ expect(screen.getByRole('button', { name: 'Options for Shared with me' })).toBeTruthy()
+ })
+
+ it('renames the current file inline from its title menu', async () => {
+ const pushToast = vi.fn()
+ const renameResource = vi.fn(async () => undefined)
+ hookMock.useGfsBrowserController.mockReturnValue({
+ ...baseController(),
+ current: {
+ resourceId: 'file-1',
+ gfsUri: 'gfs://main/file-1',
+ name: 'report.txt',
+ kind: 'file',
+ version: 7,
+ },
+ affordances: {
+ held: ['read', 'write'],
+ canDelegate: false,
+ grantableBits: [],
+ canCreateShare: false,
+ },
+ renameResource,
+ })
+
+ renderFilesPage(pushToast)
+
+ fireEvent.click(screen.getByRole('button', { name: 'Options for report.txt' }))
+ fireEvent.click(screen.getByRole('menuitem', { name: 'Rename' }))
+
+ const renameForm = screen.getByRole('form', { name: 'Rename resource' })
+ expect(screen.getAllByRole('form', { name: 'Rename resource' })).toHaveLength(1)
+ expect(screen.queryByRole('dialog', { name: 'Rename resource' })).toBeNull()
+ fireEvent.change(within(renameForm).getByLabelText('New name'), {
+ target: { value: 'report-renamed.txt' },
+ })
+ fireEvent.click(within(renameForm).getByRole('button', { name: 'Save name' }))
+
+ await waitFor(() =>
+ expect(renameResource).toHaveBeenCalledWith('file-1', 'report-renamed.txt', 7)
+ )
+ expect(pushToast).toHaveBeenCalledWith('Renamed to report-renamed.txt', 'success')
+ })
+
it('uses the visible team directory for user delegation subjects', async () => {
Object.defineProperty(window, 'clerum', {
configurable: true,
@@ -1962,17 +2216,18 @@ describe('FilesPage', () => {
await act(async () => {
fireEvent.click(screen.getByRole('menuitem', { name: 'Rename' }))
})
- const dialog = screen.getByRole('dialog', { name: 'Rename resource' })
+ const renameForm = screen.getByRole('form', { name: 'Rename resource' })
+ expect(screen.queryByRole('dialog', { name: 'Rename resource' })).toBeNull()
await act(async () => {
- fireEvent.change(within(dialog).getByLabelText('New name'), {
+ fireEvent.change(within(renameForm).getByLabelText('New name'), {
target: { value: 'renamed-notes.txt' },
})
- fireEvent.click(within(dialog).getByRole('button', { name: 'Save' }))
+ fireEvent.click(within(renameForm).getByRole('button', { name: 'Save name' }))
})
expect(renameResource).toHaveBeenCalledWith('child-1', 'renamed-notes.txt', 3)
expect(pushToast).toHaveBeenCalledWith('Renamed to renamed-notes.txt', 'success')
- expect(screen.queryByRole('dialog', { name: 'Rename resource' })).toBeNull()
+ expect(screen.queryByRole('form', { name: 'Rename resource' })).toBeNull()
})
it('offers row delete on shared resources that carry the delete permission', async () => {
@@ -2337,7 +2592,9 @@ describe('FilesPage', () => {
hookMock.useGfsBrowserController.mockReturnValue({ ...baseController(), openUri })
renderFilesPage()
- fireEvent.click(screen.getByRole('button', { name: 'Open GFS link' }))
+ expect(screen.queryByRole('button', { name: 'Open GFS link' })).toBeNull()
+ fireEvent.click(screen.getByRole('button', { name: 'Options for Shared with me' }))
+ fireEvent.click(screen.getByRole('menuitem', { name: 'Open GFS link' }))
const dialog = await screen.findByRole('dialog', { name: 'Open GFS link' })
fireEvent.change(within(dialog).getByLabelText('gfs URI'), {
target: { value: 'gfs://main/resource-1' },
@@ -2348,7 +2605,7 @@ describe('FilesPage', () => {
await waitFor(() => expect(screen.queryByRole('dialog', { name: 'Open GFS link' })).toBeNull())
})
- it('opens an SVG GFS link in preview and keeps its menu beside the file title', async () => {
+ it('opens an SVG GFS link in preview without leaving the browser on a file-only route', async () => {
const download = vi.fn(async () => ({ bytes: new Uint8Array([60, 115, 118, 103]).buffer }))
const createObjectURL = vi.fn(() => 'blob:gfs-svg-preview')
const revokeObjectURL = vi.fn()
@@ -2378,14 +2635,21 @@ describe('FilesPage', () => {
value: { gfs: { download } },
})
function useResolvedFileController() {
- const [current, setCurrent] = useState<GfsCrumb | null>(null)
- selectResolvedFile = () => setCurrent(resolvedFile)
- return { ...baseController(), current, openUri }
+ const [crumbs, setCrumbs] = useState<GfsCrumb[]>([])
+ selectResolvedFile = () => setCrumbs([resolvedFile])
+ return {
+ ...baseController(),
+ crumbs,
+ current: crumbs.at(-1) ?? null,
+ openUri,
+ restoreCrumbs: (nextCrumbs: GfsCrumb[]) => setCrumbs(nextCrumbs),
+ }
}
hookMock.useGfsBrowserController.mockImplementation(useResolvedFileController)
renderFilesPage()
- fireEvent.click(screen.getByRole('button', { name: 'Open GFS link' }))
+ fireEvent.click(screen.getByRole('button', { name: 'Options for Shared with me' }))
+ fireEvent.click(screen.getByRole('menuitem', { name: 'Open GFS link' }))
const linkDialog = await screen.findByRole('dialog', { name: 'Open GFS link' })
fireEvent.change(within(linkDialog).getByLabelText('gfs URI'), {
target: { value: 'gfs://main/svg-1' },
@@ -2401,21 +2665,8 @@ describe('FilesPage', () => {
expect(screen.queryByRole('dialog', { name: 'Open GFS link' })).toBeNull()
fireEvent.click(within(preview).getByRole('button', { name: 'Close image preview' }))
- const title = screen.getByRole('heading', { name: 'architecture.svg' })
- const titleRow = title.closest('.da-gfs-current-file__title-row')
- expect(titleRow).toBeTruthy()
- expect(
- within(titleRow as HTMLElement).getByRole('button', { name: 'Options for architecture.svg' })
- ).toBeTruthy()
- expect(
- within(screen.getByRole('navigation', { name: 'File location' })).queryByRole('button', {
- name: 'Options for architecture.svg',
- })
- ).toBeNull()
-
- fireEvent.click(screen.getByRole('button', { name: 'Options for architecture.svg' }))
- fireEvent.click(screen.getByRole('menuitem', { name: 'Preview' }))
- expect(await screen.findByRole('dialog', { name: 'architecture.svg' })).toBeTruthy()
+ expect(screen.queryByRole('heading', { name: 'architecture.svg' })).toBeNull()
+ expect(screen.getByRole('button', { name: 'Options for Shared with me' })).toBeTruthy()
})
it('navigates through breadcrumbs and resets to Shared with me', async () => {
diff --git a/desktop-app/ui/src/styles.css b/desktop-app/ui/src/styles.css
index 9991e9a84..de4a3b842 100644
--- a/desktop-app/ui/src/styles.css
+++ b/desktop-app/ui/src/styles.css
@@ -14070,6 +14070,60 @@ pre {
font-weight: 700;
}
+.da-gfs-inline-rename {
+ min-width: 0;
+ width: 100%;
+ display: inline-flex;
+ align-items: center;
+ gap: var(--space-1);
+ margin: 0;
+}
+
+.da-gfs-inline-rename__input.ui-control {
+ min-width: 0;
+ flex: 1 1 auto;
+}
+
+.da-gfs-inline-rename__actions {
+ display: inline-flex;
+ align-items: center;
+ gap: var(--space-0-5);
+ flex: 0 0 auto;
+}
+
+.da-gfs-inline-rename__actions .ui-icon-button {
+ flex: 0 0 auto;
+}
+
+.da-gfs-inline-rename__actions svg {
+ width: calc(var(--space-3) + var(--space-0-5));
+ height: calc(var(--space-3) + var(--space-0-5));
+}
+
+.da-gfs-inline-rename__confirm.ui-icon-button {
+ border-color: rgba(var(--success-rgb), 0.34);
+ color: var(--success);
+}
+
+.da-gfs-inline-rename__confirm.ui-icon-button:hover:enabled,
+.da-gfs-inline-rename__confirm.ui-icon-button:focus-visible {
+ border-color: rgba(var(--success-rgb), 0.58);
+ background: rgba(var(--success-rgb), 0.24);
+ color: var(--success);
+}
+
+.da-gfs-inline-rename__cancel.ui-icon-button {
+ color: var(--text-muted);
+}
+
+.da-gfs-drive__inline-rename {
+ width: min(20rem, 100%);
+}
+
+.da-gfs-current-file__inline-rename {
+ flex: 1 1 auto;
+}
+
.da-gfs-list__actions {
display: flex;
align-items: center;
@@ -14429,6 +14483,8 @@ pre {
.da-gfs-drive__header-actions {
display: flex;
align-items: center;
+ justify-content: flex-end;
+ flex-wrap: wrap;
gap: var(--space-1);
flex: 0 0 auto;
}
@@ -14781,7 +14837,7 @@ pre {
.da-gfs-image-preview-dialog,
.da-gfs-markdown-preview-dialog,
.da-gfs-video-preview-dialog {
- width: min(960px, 96vw);
+ width: min(960px, 100%);
height: min(760px, 92vh);
display: grid;
grid-template-rows: auto minmax(0, 1fr);
@@ -15225,16 +15281,48 @@ pre {
background: var(--surface-soft);
}
-/* Page-level rename confirmation (row/header menus): a narrow dialog over the
- manage-modal overlay, so a row rename never needs the manage dialog. */
-.da-gfs-manage-dialog--confirm {
- width: min(440px, 94vw);
- max-height: none;
- padding: var(--space-4) var(--space-5);
+.da-gfs-manage-dialog__body > .da-gfs-inline-form.da-gfs-create-folder-form {
+ display: grid;
+ grid-template-columns: minmax(0, 1fr);
+ align-items: stretch;
+ gap: var(--space-3);
+ border: 1px solid rgba(var(--accent-rgb), 0.24);
+ border-radius: var(--radius-md);
+ background: rgba(var(--accent-rgb), 0.06);
}
-.da-gfs-manage-dialog--confirm .da-gfs-manage-dialog__body {
- padding: 0;
+.da-gfs-create-folder-form__heading {
+ display: grid;
+ gap: var(--space-0-5);
+}
+
+.da-gfs-create-folder-form__heading h4,
+.da-gfs-create-folder-form__heading p {
+ margin: 0;
+}
+
+.da-gfs-create-folder-form__heading h4 {
+ color: var(--text);
+ font-size: var(--font-size-lg);
+ font-weight: var(--font-weight-semibold);
+ line-height: var(--line-height-tight);
+}
+
+.da-gfs-create-folder-form__heading p {
+ font-size: var(--font-size-sm);
+}
+
+.da-gfs-create-folder-form__field {
+ min-width: 0;
+}
+
+.da-gfs-create-folder-form__actions {
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ gap: var(--space-2);
+ padding-top: var(--space-3);
+ border-top: 1px solid rgba(var(--edge-rgb), 0.2);
}
/* Move-to-folder picker: full-width dialog with a scrollable folder list. */
@@ -15442,7 +15530,7 @@ pre {
}
.da-gfs-drive__header-actions {
- justify-content: space-between;
+ justify-content: flex-end;
}
.da-gfs-drive__grid {