Skip to content

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

TypeScript

feat: a bunch of changes

M44258480ebbe
diff --git a/control-ui/app/globals.css b/control-ui/app/globals.css
index dc2ad036f..c4e340662 100644
--- a/control-ui/app/globals.css
+++ b/control-ui/app/globals.css
@@ -12511,6 +12511,19 @@ button.cu-gfs-tree__button:focus-visible,
flex-wrap: nowrap;
}
+.cu-gfs-list__row .cu-gfs-list__download.cu-btn {
+ opacity: 0;
+ pointer-events: none;
+ transition: opacity var(--cu-motion-fast);
+}
+
+.cu-gfs-list__row:hover .cu-gfs-list__download.cu-btn,
+.cu-gfs-list__row:focus-within .cu-gfs-list__download.cu-btn,
+.cu-gfs-list__row .cu-gfs-list__download.cu-btn:focus-visible {
+ opacity: 1;
+ pointer-events: auto;
+}
+
.cu-gfs-list__download.cu-btn {
width: 2rem;
min-width: 2rem;
@@ -12608,6 +12621,11 @@ button.cu-gfs-tree__button:focus-visible,
background: var(--cu-border-subtle);
}
+.cu-gfs-list .cu-gfs-resource-menu .cu-kebab__menu {
+ top: auto;
+ bottom: calc(100% + var(--cu-space-1));
+}
+
.cu-gfs-image-preview-modal,
.cu-gfs-markdown-preview-modal,
.cu-gfs-video-preview-modal {
@@ -12993,15 +13011,46 @@ button.cu-gfs-tree__button:focus-visible,
min-width: 0;
}
-.cu-gfs-manage-dialog__title-edit {
- display: grid;
- grid-template-columns: minmax(0, 1fr) auto auto;
+.cu-gfs-inline-rename {
+ min-width: 0;
+ width: 100%;
+ display: inline-flex;
align-items: center;
gap: var(--cu-space-1);
+ margin: 0;
}
-.cu-gfs-manage-dialog__title-edit .cu-input {
+.cu-gfs-inline-rename__input.cu-input {
min-width: 0;
+ flex: 1 1 auto;
+}
+
+.cu-gfs-inline-rename__actions {
+ display: inline-flex;
+ align-items: center;
+ gap: var(--cu-space-05);
+ flex: 0 0 auto;
+}
+
+.cu-gfs-inline-rename__actions .cu-btn {
+ flex: 0 0 auto;
+}
+
+.cu-gfs-inline-rename__confirm.cu-btn {
+ border-color: rgba(var(--cu-success-rgb), 0.34);
+ background: rgba(var(--cu-success-rgb), 0.08);
+ color: var(--cu-success);
+}
+
+.cu-gfs-inline-rename__confirm.cu-btn:hover:not(:disabled),
+.cu-gfs-inline-rename__confirm.cu-btn:focus-visible {
+ border-color: rgba(var(--cu-success-rgb), 0.58);
+ background: rgba(var(--cu-success-rgb), 0.16);
+ color: var(--cu-success);
+}
+
+.cu-gfs-inline-rename__cancel.cu-btn {
+ color: var(--cu-text-muted);
}
.cu-gfs-manage-dialog__top-actions {
@@ -13032,6 +13081,291 @@ button.cu-gfs-tree__button:focus-visible,
padding: 0 var(--cu-space-5) var(--cu-space-5);
}
+/* Compact Drive-style destination picker shared conceptually with Desktop.
+ It keeps the existing expandable hierarchy without turning each folder into
+ a tall card. */
+.cu-gfs-move-dialog {
+ width: min(42.5rem, 94vw);
+ max-height: min(38.75rem, 90vh);
+ display: grid;
+ grid-template-rows: auto auto auto minmax(11.25rem, 1fr) auto;
+ overflow: hidden;
+ border: 1px solid rgba(var(--cu-edge-rgb), 0.38);
+ border-radius: calc(var(--cu-radius) + var(--cu-space-1));
+ background: var(--cu-bg-elevated);
+ box-shadow: var(--cu-shadow);
+}
+
+.cu-gfs-move-dialog__header {
+ min-width: 0;
+ display: grid;
+ grid-template-columns: 1.75rem minmax(0, 1fr) auto;
+ align-items: center;
+ gap: var(--cu-space-2);
+ padding: var(--cu-space-4) var(--cu-space-5) var(--cu-space-3);
+}
+
+.cu-gfs-move-dialog__header h3 {
+ min-width: 0;
+ overflow: hidden;
+ margin: 0;
+ color: var(--cu-text);
+ font-size: 1.25rem;
+ font-weight: 600;
+ line-height: 1.25;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.cu-gfs-move-dialog__header-icon {
+ width: 1.75rem;
+ height: 1.75rem;
+ display: grid;
+ place-items: center;
+ color: var(--cu-text-muted);
+}
+
+.cu-gfs-move-dialog__header-icon svg {
+ width: 1.125rem;
+ height: 1.125rem;
+}
+
+.cu-gfs-move-dialog__close.cu-btn {
+ width: 2rem;
+ min-width: 2rem;
+ height: 2rem;
+ min-height: 2rem;
+ border-radius: 999px;
+}
+
+.cu-gfs-move-dialog__current-location {
+ min-width: 0;
+ display: flex;
+ align-items: center;
+ gap: var(--cu-space-2);
+ padding: 0 var(--cu-space-5) var(--cu-space-3);
+ color: var(--cu-text-soft);
+ font-size: 0.8125rem;
+}
+
+.cu-gfs-move-dialog__location-pill {
+ min-width: 0;
+ display: inline-flex;
+ align-items: center;
+ gap: var(--cu-space-1);
+ padding: var(--cu-space-1) var(--cu-space-2);
+ border: 1px solid var(--cu-border);
+ border-radius: var(--cu-radius-sm);
+ background: var(--cu-surface);
+ color: var(--cu-text);
+}
+
+.cu-gfs-move-dialog__location-pill svg {
+ width: 1rem;
+ height: 1rem;
+ flex: 0 0 1rem;
+ color: var(--cu-text-muted);
+}
+
+.cu-gfs-move-dialog__location-pill strong {
+ min-width: 0;
+ overflow: hidden;
+ font-weight: 500;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.cu-gfs-move-dialog__error {
+ margin: 0 var(--cu-space-5) var(--cu-space-2);
+}
+
+.cu-gfs-move-dialog__tree-heading {
+ min-height: 2.375rem;
+ display: flex;
+ align-items: center;
+ padding: 0 var(--cu-space-5);
+ border-top: 1px solid var(--cu-border-subtle);
+ border-bottom: 1px solid var(--cu-border-subtle);
+ color: var(--cu-text);
+ font-size: 0.8125rem;
+ font-weight: 600;
+}
+
+.cu-gfs-move-dialog__tree {
+ min-height: 11.25rem;
+ max-height: min(22.5rem, 48vh);
+ overflow-y: auto;
+ padding: var(--cu-space-1) var(--cu-space-3);
+ scrollbar-width: thin;
+}
+
+.cu-gfs-move-dialog__tree-item,
+.cu-gfs-move-dialog__tree-row {
+ min-width: 0;
+}
+
+.cu-gfs-move-dialog__tree-row {
+ display: grid;
+ grid-template-columns: 1.75rem minmax(0, 1fr);
+ align-items: center;
+ gap: var(--cu-space-1);
+}
+
+.cu-gfs-move-dialog__tree-toggle,
+.cu-gfs-move-dialog__tree-toggle-placeholder {
+ width: 1.75rem;
+ height: 2.125rem;
+}
+
+.cu-gfs-move-dialog__tree-toggle {
+ min-width: 1.75rem;
+ min-height: 2.125rem;
+ display: grid;
+ place-items: center;
+ padding: 0;
+ border: 0;
+ border-radius: var(--cu-radius-sm);
+ background: transparent;
+ color: var(--cu-text-muted);
+ cursor: pointer;
+}
+
+.cu-gfs-move-dialog__tree-toggle:hover,
+.cu-gfs-move-dialog__tree-toggle:focus-visible {
+ background: var(--cu-surface-hover);
+ color: var(--cu-text);
+ outline: none;
+}
+
+.cu-gfs-move-dialog__tree-toggle svg {
+ width: 0.875rem;
+ height: 0.875rem;
+ transition: transform 120ms ease;
+}
+
+.cu-gfs-move-dialog__tree-toggle.is-expanded svg {
+ transform: rotate(90deg);
+}
+
+.cu-gfs-move-dialog__tree-select {
+ min-width: 0;
+ min-height: 2.125rem;
+ display: flex;
+ align-items: center;
+ gap: var(--cu-space-2);
+ padding: calc(var(--cu-space-1) / 2) var(--cu-space-2);
+ border: 1px solid transparent;
+ border-radius: var(--cu-radius-sm);
+ background: transparent;
+ color: var(--cu-text);
+ font: inherit;
+ text-align: left;
+ cursor: pointer;
+}
+
+.cu-gfs-move-dialog__tree-select:hover,
+.cu-gfs-move-dialog__tree-select:focus-visible {
+ border-color: rgba(var(--cu-accent-rgb), 0.3);
+ background: rgba(var(--cu-accent-rgb), 0.08);
+ outline: none;
+}
+
+.cu-gfs-move-dialog__tree-select[aria-selected='true'] {
+ border-color: rgba(var(--cu-accent-rgb), 0.46);
+ background: rgba(var(--cu-accent-rgb), 0.13);
+}
+
+.cu-gfs-move-dialog__tree-folder-icon {
+ width: 1.25rem;
+ height: 1.25rem;
+ flex: 0 0 1.25rem;
+ display: grid;
+ place-items: center;
+ color: var(--cu-warning);
+}
+
+.cu-gfs-move-dialog__tree-folder-icon svg {
+ width: 1.125rem;
+ height: 1.125rem;
+}
+
+.cu-gfs-move-dialog__tree-folder-name {
+ min-width: 0;
+ flex: 1 1 auto;
+ overflow: hidden;
+ font-size: 0.8125rem;
+ font-weight: 500;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.cu-gfs-move-dialog__tree-selected-icon {
+ width: 1rem;
+ height: 1rem;
+ flex: 0 0 1rem;
+ display: grid;
+ place-items: center;
+ color: var(--cu-accent);
+}
+
+.cu-gfs-move-dialog__tree-selected-icon svg {
+ width: 0.875rem;
+ height: 0.875rem;
+}
+
+.cu-gfs-move-dialog__tree-group {
+ margin-left: 1.75rem;
+ padding-left: var(--cu-space-1);
+ border-left: 1px solid var(--cu-border-subtle);
+}
+
+.cu-gfs-move-dialog__notice {
+ margin: var(--cu-space-2);
+ color: var(--cu-text-soft);
+ font-size: 0.8125rem;
+}
+
+.cu-gfs-move-dialog__load-more.cu-btn {
+ min-height: 1.875rem;
+ margin: var(--cu-space-1) 0;
+}
+
+.cu-gfs-move-dialog__footer {
+ min-width: 0;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: var(--cu-space-3);
+ padding: var(--cu-space-3) var(--cu-space-5);
+ border-top: 1px solid var(--cu-border-subtle);
+}
+
+.cu-gfs-move-dialog__selection {
+ min-width: 0;
+ flex: 1 1 auto;
+ overflow: hidden;
+ color: var(--cu-text-soft);
+ font-size: 0.8125rem;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.cu-gfs-move-dialog__selection strong {
+ color: var(--cu-text);
+ font-weight: 600;
+}
+
+.cu-gfs-move-dialog__actions {
+ flex: 0 0 auto;
+ display: flex;
+ align-items: center;
+ gap: var(--cu-space-2);
+}
+
+.cu-gfs-move-dialog__actions .cu-btn {
+ border-radius: 999px;
+}
+
.cu-gfs-manage-section {
min-width: 0;
display: grid;
@@ -13551,6 +13885,24 @@ button.cu-gfs-tree__button:focus-visible,
.cu-gfs-manage-dialog__top-actions {
gap: 0;
}
+
+ .cu-gfs-move-dialog__header,
+ .cu-gfs-move-dialog__current-location,
+ .cu-gfs-move-dialog__tree-heading,
+ .cu-gfs-move-dialog__footer {
+ padding-right: var(--cu-space-3);
+ padding-left: var(--cu-space-3);
+ }
+
+ .cu-gfs-move-dialog__footer {
+ align-items: flex-end;
+ flex-direction: column;
+ }
+
+ .cu-gfs-move-dialog__actions {
+ width: 100%;
+ justify-content: flex-end;
+ }
}
@media (max-width: 560px) {
@@ -13570,7 +13922,6 @@ button.cu-gfs-tree__button:focus-visible,
padding: var(--cu-space-2);
}
- .cu-gfs-manage-dialog__title-edit,
.cu-gfs-grant__composer {
grid-template-columns: minmax(0, 1fr);
}
diff --git a/control-ui/components/GfsBrowser.tsx b/control-ui/components/GfsBrowser.tsx
index a8d2659ef..43f25f664 100644
--- a/control-ui/components/GfsBrowser.tsx
+++ b/control-ui/components/GfsBrowser.tsx
@@ -4,6 +4,7 @@ import React, { useCallback, useEffect, useRef, useState } from 'react'
import { FileUploadModal } from '@components/FileUploadModal'
import { GfsImagePreview } from '@components/GfsImagePreview'
import { GfsMarkdownPreview } from '@components/GfsMarkdownPreview'
+import { GfsMoveDialog } from '@components/GfsMoveDialog'
import { GfsVideoPreview } from '@components/GfsVideoPreview'
import {
IconDocumentText,
@@ -14,7 +15,7 @@ import {
} from '@components/Sidebar/icons'
import { useToast } from '@components/Toast'
import { IconChevronRight, IconDownload, IconPaperclip, IconUpload, IconX } from '@components/icons'
-import { Button, TextInput } from '@components/ui'
+import { Button } from '@components/ui'
import { apiGet, apiSend, gfsDownload, isSilentApiError } from '@lib/api'
import { isGfsDocumentFile } from '@lib/gfsDocumentFile'
import {
@@ -32,6 +33,7 @@ import { nextAvailableGfsResourceName, normalizeGfsResourceName } from '@lib/gfs
import { isGfsVideoFile } from '@lib/gfsVideoFile'
import { gfsVideoPreviewMimeType } from '@lib/gfsVideoPreview'
import { GfsGrantPanel } from './GfsGrantPanel'
+import { GfsInlineRename } from './GfsInlineRename'
import { GfsResourceMenu } from './GfsResourceMenu'
import { NewFolderModal } from './NewFolderModal'
import { TablePanelHeader } from './TablePanelHeader'
@@ -227,8 +229,10 @@ export function GfsBrowser(): React.JSX.Element {
const [error, setError] = useState('')
// Operator selects a resource to delegate access on (grant panel).
const [selected, setSelected] = useState<GfsChild | null>(null)
+ const [renameTarget, setRenameTarget] = useState<GfsChild | null>(null)
const [renameOpen, setRenameOpen] = useState(false)
const [renameName, setRenameName] = useState('')
+ const [renaming, setRenaming] = useState(false)
const [deleteOpen, setDeleteOpen] = useState(false)
// New-folder dialog (replaces the native window.prompt flow).
const [newFolderOpen, setNewFolderOpen] = useState(false)
@@ -245,6 +249,7 @@ export function GfsBrowser(): React.JSX.Element {
const [draggingResourceId, setDraggingResourceId] = useState<string | null>(null)
const [dragOverFolderId, setDragOverFolderId] = useState<string | null>(null)
const [movingResourceId, setMovingResourceId] = useState<string | null>(null)
+ const [moveTarget, setMoveTarget] = useState<GfsChild | null>(null)
const draggingResourceRef = useRef<GfsChild | null>(null)
const movingResourceRef = useRef<string | null>(null)
const [imagePreview, setImagePreview] = useState<{
@@ -472,16 +477,20 @@ export function GfsBrowser(): React.JSX.Element {
}, [current, load])
useEffect(() => {
- if (!selected || imagePreview || markdownPreview || videoPreview) return
+ if ((!selected && !renameTarget) || imagePreview || markdownPreview || videoPreview) return
function handleKeyDown(event: KeyboardEvent) {
- if (event.key === 'Escape') setSelected(null)
+ if (event.key !== 'Escape') return
+ setSelected(null)
+ setRenameOpen(false)
+ setRenameTarget(null)
}
window.addEventListener('keydown', handleKeyDown)
return () => window.removeEventListener('keydown', handleKeyDown)
- }, [imagePreview, markdownPreview, videoPreview, selected])
+ }, [imagePreview, markdownPreview, renameTarget, selected, videoPreview])
function openDirectory(child: GfsChild): void {
if (child.kind !== 'directory') return
+ setRenameTarget(null)
setCrumbs(prev => [...prev, { id: child.resourceId, rid: child.rid, name: child.name }])
const cached = childCacheRef.current.get(child.resourceId)
if (cached) {
@@ -529,6 +538,7 @@ export function GfsBrowser(): React.JSX.Element {
function goToCrumb(index: number): void {
if (index === crumbs.length - 1) return
+ setRenameTarget(null)
setLoading(true)
setCrumbs(crumbs.slice(0, index + 1))
}
@@ -547,10 +557,7 @@ export function GfsBrowser(): React.JSX.Element {
await load(current)
}
- function handleResourceDragStart(
- event: React.DragEvent<HTMLLIElement>,
- child: GfsChild
- ): void {
+ function handleResourceDragStart(event: React.DragEvent<HTMLLIElement>, child: GfsChild): void {
if (child.kind === 'directory' || movingResourceRef.current) {
event.preventDefault()
return
@@ -568,28 +575,17 @@ export function GfsBrowser(): React.JSX.Element {
setDragOverFolderId(null)
}
- function handleFolderDragOver(
- event: React.DragEvent<HTMLLIElement>,
- folder: GfsChild
- ): void {
+ function handleFolderDragOver(event: React.DragEvent<HTMLLIElement>, folder: GfsChild): void {
if (!hasDraggedGfsResource(event)) return
const source = draggingResourceRef.current
- if (
- !source ||
- source.resourceId === folder.resourceId ||
- folder.kind !== 'directory'
- )
- return
+ if (!source || source.resourceId === folder.resourceId || folder.kind !== 'directory') return
event.preventDefault()
event.stopPropagation()
event.dataTransfer.dropEffect = 'move'
setDragOverFolderId(folder.resourceId)
}
- function handleFolderDragEnter(
- event: React.DragEvent<HTMLLIElement>,
- folder: GfsChild
- ): void {
+ function handleFolderDragEnter(event: React.DragEvent<HTMLLIElement>, folder: GfsChild): void {
handleFolderDragOver(event, folder)
}
@@ -604,10 +600,10 @@ export function GfsBrowser(): React.JSX.Element {
async function moveResource(
source: GfsChild,
- destination: GfsChild
+ destination: Pick<GfsChild, 'resourceId' | 'name' | 'kind'>,
+ bubbleError = false
): Promise<void> {
if (
- source.kind === 'directory' ||
destination.kind !== 'directory' ||
source.resourceId === destination.resourceId ||
movingResourceRef.current
@@ -637,6 +633,7 @@ export function GfsBrowser(): React.JSX.Element {
})
await refreshCurrent()
} catch (err) {
+ if (bubbleError) throw err
showToast(err instanceof Error ? err.message : 'Could not move resource.', {
tone: 'error',
})
@@ -954,18 +951,38 @@ export function GfsBrowser(): React.JSX.Element {
}
}
- function openManage(child: GfsChild, mode?: 'rename' | 'delete'): void {
+ function openManage(child: GfsChild, mode?: 'delete'): void {
+ setRenameTarget(null)
setSelected(child)
setRenameName(child.name)
- setRenameOpen(mode === 'rename')
+ setRenameOpen(false)
setDeleteOpen(mode === 'delete')
}
+ function openMove(child: GfsChild): void {
+ setSelected(null)
+ setDeleteOpen(false)
+ setMoveTarget(child)
+ }
+
+ function openRowRename(child: GfsChild): void {
+ setSelected(null)
+ setRenameOpen(false)
+ setDeleteOpen(false)
+ setRenameTarget(child)
+ setRenameName(child.name)
+ }
+
async function renameResource(child: GfsChild, requestedName: string): Promise<void> {
- if (!requestedName.trim()) return
+ if (!requestedName.trim() || renaming) return
+ setRenaming(true)
try {
const name = await normalizeGfsResourceName(requestedName.trim())
- if (name === child.name) return
+ if (name === child.name) {
+ setRenameOpen(false)
+ setRenameTarget(null)
+ return
+ }
await apiSend(
'PATCH',
`/api/v1/gfs/resources/${encodeURIComponent(child.resourceId)}`,
@@ -973,12 +990,16 @@ export function GfsBrowser(): React.JSX.Element {
{ drive: DRIVE }
)
showToast('Resource renamed.', { tone: 'success' })
+ setRenameOpen(false)
+ setRenameTarget(null)
setSelected(null)
await refreshCurrent()
} catch (err) {
showToast(err instanceof Error ? err.message : 'Could not rename resource.', {
tone: 'error',
})
+ } finally {
+ setRenaming(false)
}
}
@@ -1207,10 +1228,10 @@ export function GfsBrowser(): React.JSX.Element {
<ul className="cu-gfs-list" aria-label="Current folder resources">
{items.map(child => {
const rowOpenable = child.kind === 'directory' || isGfsPreviewFile(child.name)
+ const isRenaming = renameTarget?.resourceId === child.resourceId
const isDragging = draggingResourceId === child.resourceId
const isDropTarget = dragOverFolderId === child.resourceId
- const canDragResource =
- child.kind !== 'directory' && movingResourceId === null
+ const canDragResource = child.kind !== 'directory' && movingResourceId === null
const openRow = () => {
if (child.kind === 'directory') openDirectory(child)
else openFilePreview(child)
@@ -1221,14 +1242,10 @@ export function GfsBrowser(): React.JSX.Element {
key={child.resourceId}
draggable={canDragResource}
title={
- canDragResource
- ? `Drag ${child.name} into a folder to move it`
- : undefined
+ canDragResource ? `Drag ${child.name} into a folder to move it` : undefined
}
onDragStart={
- canDragResource
- ? event => handleResourceDragStart(event, child)
- : undefined
+ canDragResource ? event => handleResourceDragStart(event, child) : undefined
}
onDragEnd={canDragResource ? handleResourceDragEnd : undefined}
onDragEnter={
@@ -1241,9 +1258,7 @@ export function GfsBrowser(): React.JSX.Element {
? event => handleFolderDragOver(event, child)
: undefined
}
- onDragLeave={
- child.kind === 'directory' ? handleFolderDragLeave : undefined
- }
+ onDragLeave={child.kind === 'directory' ? handleFolderDragLeave : undefined}
onDrop={
child.kind === 'directory'
? event => void handleFolderDrop(event, child)
@@ -1288,7 +1303,15 @@ export function GfsBrowser(): React.JSX.Element {
</span>
<span className="cu-gfs-list__identity">
<span className="cu-gfs-list__name">
- {child.kind === 'directory' ? (
+ {isRenaming ? (
+ <GfsInlineRename
+ onCancel={() => setRenameTarget(null)}
+ onChange={setRenameName}
+ onSubmit={() => void renameResource(child, renameName)}
+ value={renameName}
+ busy={renaming}
+ />
+ ) : child.kind === 'directory' ? (
<button
className="cu-gfs-list__name-button"
type="button"
@@ -1347,7 +1370,8 @@ export function GfsBrowser(): React.JSX.Element {
: undefined
}
onCopyLink={() => void copyGfsUri(child.gfsUri)}
- onRename={() => openManage(child, 'rename')}
+ onRename={() => openRowRename(child)}
+ onMove={() => openMove(child)}
onDelete={() => openManage(child, 'delete')}
/>
</span>
@@ -1410,27 +1434,13 @@ export function GfsBrowser(): React.JSX.Element {
</span>
<span className="cu-gfs-manage-dialog__heading">
{renameOpen ? (
- <form
- className="cu-gfs-manage-dialog__title-edit"
- aria-label="Rename resource"
- onSubmit={event => {
- event.preventDefault()
- void renameResource(selected, renameName)
- }}
- >
- <TextInput
- aria-label="New name"
- autoFocus
- value={renameName}
- onChange={event => setRenameName(event.currentTarget.value)}
- />
- <Button variant="primary" size="sm" type="submit" disabled={!renameName.trim()}>
- Save
- </Button>
- <Button size="sm" variant="ghost" onClick={() => setRenameOpen(false)}>
- Cancel
- </Button>
- </form>
+ <GfsInlineRename
+ onCancel={() => setRenameOpen(false)}
+ onChange={setRenameName}
+ onSubmit={() => void renameResource(selected, renameName)}
+ value={renameName}
+ busy={renaming}
+ />
) : (
<span className="cu-gfs-manage-dialog__title-row">
<h3>{selected.name}</h3>
@@ -1451,9 +1461,11 @@ export function GfsBrowser(): React.JSX.Element {
onCopyLink={() => void copyGfsUri(selected.gfsUri)}
onRename={() => {
setRenameName(selected.name)
+ setRenameTarget(null)
setRenameOpen(true)
setDeleteOpen(false)
}}
+ onMove={() => openMove(selected)}
onReplace={
selected.kind !== 'directory'
? file => void replaceFile(selected, file)
@@ -1547,6 +1559,23 @@ export function GfsBrowser(): React.JSX.Element {
/>
) : null}
+ {moveTarget ? (
+ <GfsMoveDialog
+ busy={movingResourceId === moveTarget.resourceId}
+ initialCrumbs={crumbs}
+ onClose={() => setMoveTarget(null)}
+ onMove={async (destinationId, destinationName) => {
+ await moveResource(
+ moveTarget,
+ { resourceId: destinationId, name: destinationName, kind: 'directory' },
+ true
+ )
+ setMoveTarget(null)
+ }}
+ target={moveTarget}
+ />
+ ) : null}
+
{uploadOpen ? (
<FileUploadModal
busy={uploading}
diff --git a/control-ui/components/GfsInlineRename/index.tsx b/control-ui/components/GfsInlineRename/index.tsx
new file mode 100644
index 000000000..a4d9f214e
--- /dev/null
+++ b/control-ui/components/GfsInlineRename/index.tsx
@@ -0,0 +1,67 @@
+'use client'
+
+import { IconCheck, IconX } from '@components/icons'
+import { Button, TextInput } from '@components/ui'
+import { cn } from '@lib/cn'
+import type { GfsInlineRenameProps } from './types'
+
+export function GfsInlineRename({
+ busy = false,
+ className,
+ onCancel,
+ onChange,
+ onSubmit,
+ value,
+}: GfsInlineRenameProps) {
+ return (
+ <form
+ aria-label="Rename resource"
+ className={cn('cu-gfs-inline-rename', className)}
+ onClick={event => event.stopPropagation()}
+ onSubmit={event => {
+ event.preventDefault()
+ onSubmit()
+ }}
+ >
+ <TextInput
+ aria-label="New name"
+ autoFocus
+ className="cu-gfs-inline-rename__input"
+ compact
+ value={value}
+ onChange={event => onChange(event.currentTarget.value)}
+ onFocus={event => event.currentTarget.select()}
+ />
+ <span className="cu-gfs-inline-rename__actions">
+ <Button
+ aria-label="Save name"
+ className="cu-gfs-inline-rename__confirm"
+ disabled={!value.trim()}
+ icon
+ loading={busy}
+ size="sm"
+ title="Save name"
+ type="submit"
+ variant="ghost"
+ >
+ <IconCheck />
+ </Button>
+ <Button
+ aria-label="Cancel rename"
+ className="cu-gfs-inline-rename__cancel"
+ disabled={busy}
+ icon
+ size="sm"
+ title="Cancel rename"
+ type="button"
+ variant="ghost"
+ onClick={onCancel}
+ >
+ <IconX />
+ </Button>
+ </span>
+ </form>
+ )
+}
+
+export type { GfsInlineRenameProps } from './types'
diff --git a/control-ui/components/GfsInlineRename/types.ts b/control-ui/components/GfsInlineRename/types.ts
new file mode 100644
index 000000000..9a13b5276
--- /dev/null
+++ b/control-ui/components/GfsInlineRename/types.ts
@@ -0,0 +1,8 @@
+export interface GfsInlineRenameProps {
+ busy?: boolean
+ className?: string
+ onCancel: () => void
+ onChange: (value: string) => void
+ onSubmit: () => void
+ value: string
+}
diff --git a/control-ui/components/GfsMoveDialog/index.tsx b/control-ui/components/GfsMoveDialog/index.tsx
new file mode 100644
index 000000000..a43770b1b
--- /dev/null
+++ b/control-ui/components/GfsMoveDialog/index.tsx
@@ -0,0 +1,387 @@
+'use client'
+
+import { useEffect, useMemo, useState } from 'react'
+import { IconFolder } from '@components/Sidebar/icons'
+import { IconCheck, IconChevronRight, IconX } from '@components/icons'
+import { Button } from '@components/ui'
+import { apiGet } from '@lib/api'
+
+const DRIVE = 'main'
+
+type MoveFolder = {
+ resourceId: string
+ name: string
+ kind: string
+}
+
+type MoveCrumb = {
+ id: string | null
+ name: string
+}
+
+type TreePage = {
+ items: MoveFolder[]
+ nextCursor: string | null
+}
+
+type SelectedDestination = Pick<MoveFolder, 'resourceId' | 'name'>
+
+export type GfsMoveDialogProps = {
+ target: MoveFolder
+ initialCrumbs: MoveCrumb[]
+ busy?: boolean
+ onClose: () => void
+ onMove: (destinationId: string, destinationName: string) => Promise<void>
+}
+
+function foldersOnly(items: MoveFolder[], excludedIds: ReadonlySet<string>): MoveFolder[] {
+ return items
+ .filter(item => item.kind === 'directory' && !excludedIds.has(item.resourceId))
+ .sort((left, right) => left.name.localeCompare(right.name))
+}
+
+function messageOf(error: unknown): string {
+ return error instanceof Error ? error.message : String(error)
+}
+
+type TreeFolderProps = {
+ ancestors: ReadonlySet<string>
+ expandedIds: ReadonlySet<string>
+ folder: MoveFolder
+ level: number
+ selected: SelectedDestination | null
+ targetId: string
+ onSelect: (folder: MoveFolder) => void
+ onToggle: (folderId: string) => void
+}
+
+function TreeFolder({
+ ancestors,
+ expandedIds,
+ folder,
+ level,
+ selected,
+ targetId,
+ onSelect,
+ onToggle,
+}: TreeFolderProps) {
+ const expanded = expandedIds.has(folder.resourceId)
+ const [children, setChildren] = useState<MoveFolder[]>([])
+ const [nextCursor, setNextCursor] = useState<string | null>(null)
+ const [loaded, setLoaded] = useState(false)
+ const [attempted, setAttempted] = useState(false)
+ const [loading, setLoading] = useState(false)
+ const [error, setError] = useState('')
+ const nextAncestors = useMemo(
+ () => new Set([...ancestors, folder.resourceId]),
+ [ancestors, folder.resourceId]
+ )
+ const visibleChildren = useMemo(
+ () => foldersOnly(children, new Set([targetId, ...ancestors])),
+ [ancestors, children, targetId]
+ )
+
+ async function loadChildren(cursor?: string): Promise<void> {
+ setAttempted(true)
+ setLoading(true)
+ setError('')
+ try {
+ const query: Record<string, string> = { drive: DRIVE }
+ if (cursor) query.cursor = cursor
+ const page = (await apiGet(
+ `/api/v1/gfs/resources/${encodeURIComponent(folder.resourceId)}/children`,
+ query
+ )) as TreePage
+ setChildren(previous => (cursor ? [...previous, ...page.items] : page.items))
+ setNextCursor(page.nextCursor)
+ setLoaded(true)
+ } catch (loadError) {
+ setError(messageOf(loadError))
+ } finally {
+ setLoading(false)
+ }
+ }
+
+ useEffect(() => {
+ if (expanded && !loaded && !attempted) void loadChildren()
+ }, [attempted, expanded, loaded])
+
+ const canExpand = !loaded || loading || Boolean(nextCursor) || visibleChildren.length > 0
+
+ return (
+ <div
+ aria-expanded={canExpand ? expanded : undefined}
+ aria-level={level}
+ aria-selected={selected?.resourceId === folder.resourceId}
+ className="cu-gfs-move-dialog__tree-item"
+ role="treeitem"
+ >
+ <div className="cu-gfs-move-dialog__tree-row">
+ {canExpand ? (
+ <button
+ aria-expanded={expanded}
+ aria-label={`${expanded ? 'Collapse' : 'Expand'} ${folder.name}`}
+ className={`cu-gfs-move-dialog__tree-toggle${expanded ? ' is-expanded' : ''}`}
+ onClick={() => onToggle(folder.resourceId)}
+ type="button"
+ >
+ <IconChevronRight />
+ </button>
+ ) : (
+ <span className="cu-gfs-move-dialog__tree-toggle-placeholder" aria-hidden="true" />
+ )}
+ <button
+ aria-selected={selected?.resourceId === folder.resourceId}
+ className="cu-gfs-move-dialog__tree-select"
+ onClick={() => onSelect(folder)}
+ type="button"
+ >
+ <span className="cu-gfs-move-dialog__tree-folder-icon" aria-hidden="true">
+ <IconFolder />
+ </span>
+ <span className="cu-gfs-move-dialog__tree-folder-name">{folder.name}</span>
+ <span className="cu-gfs-move-dialog__tree-selected-icon" aria-hidden="true">
+ {selected?.resourceId === folder.resourceId ? <IconCheck /> : null}
+ </span>
+ </button>
+ </div>
+ {expanded ? (
+ <div className="cu-gfs-move-dialog__tree-group" role="group">
+ {loading && !loaded ? (
+ <p className="cu-gfs-move-dialog__notice" role="status">
+ Loading subfolders…
+ </p>
+ ) : null}
+ {error ? (
+ <div className="cu-banner cu-banner--error" role="alert">
+ {error}
+ </div>
+ ) : null}
+ {visibleChildren.map(child => (
+ <TreeFolder
+ ancestors={nextAncestors}
+ expandedIds={expandedIds}
+ folder={child}
+ key={child.resourceId}
+ level={level + 1}
+ onSelect={onSelect}
+ onToggle={onToggle}
+ selected={selected}
+ targetId={targetId}
+ />
+ ))}
+ {nextCursor ? (
+ <Button
+ className="cu-gfs-move-dialog__load-more"
+ loading={loading}
+ onClick={() => void loadChildren(nextCursor)}
+ size="sm"
+ >
+ Load more
+ </Button>
+ ) : null}
+ {loaded && !loading && !error && !visibleChildren.length && !nextCursor ? (
+ <p className="cu-gfs-move-dialog__notice">No subfolders.</p>
+ ) : null}
+ </div>
+ ) : null}
+ </div>
+ )
+}
+
+export function GfsMoveDialog({
+ target,
+ initialCrumbs,
+ busy = false,
+ onClose,
+ onMove,
+}: GfsMoveDialogProps) {
+ const initialDestination = [...initialCrumbs]
+ .reverse()
+ .find(crumb => crumb.id && crumb.id !== target.resourceId)
+ const [selected, setSelected] = useState<SelectedDestination | null>(() =>
+ initialDestination?.id
+ ? {
+ resourceId: initialDestination.id,
+ name: initialDestination.name === '/' ? DRIVE : initialDestination.name,
+ }
+ : null
+ )
+ const [expandedIds, setExpandedIds] = useState<Set<string>>(
+ () => new Set(initialCrumbs.flatMap(crumb => (crumb.id ? [crumb.id] : [])))
+ )
+ const [rootFolders, setRootFolders] = useState<MoveFolder[]>([])
+ const [nextCursor, setNextCursor] = useState<string | null>(null)
+ const [loading, setLoading] = useState(false)
+ const [loaded, setLoaded] = useState(false)
+ const [error, setError] = useState('')
+
+ async function loadRoots(cursor?: string): Promise<void> {
+ setLoading(true)
+ setError('')
+ try {
+ const query: Record<string, string> = { drive: DRIVE }
+ if (cursor) query.cursor = cursor
+ const page = (await apiGet('/api/v1/gfs/tree', query)) as TreePage
+ setRootFolders(previous => (cursor ? [...previous, ...page.items] : page.items))
+ setNextCursor(page.nextCursor)
+ setLoaded(true)
+ } catch (loadError) {
+ setError(messageOf(loadError))
+ } finally {
+ setLoading(false)
+ }
+ }
+
+ useEffect(() => {
+ void loadRoots()
+ }, [])
+
+ useEffect(() => {
+ function handleKeyDown(event: KeyboardEvent): void {
+ if (event.key === 'Escape' && !busy) onClose()
+ }
+ window.addEventListener('keydown', handleKeyDown)
+ return () => window.removeEventListener('keydown', handleKeyDown)
+ }, [busy, onClose])
+
+ const visibleRoots = useMemo(
+ () => foldersOnly(rootFolders, new Set([target.resourceId])),
+ [rootFolders, target.resourceId]
+ )
+
+ function toggleFolder(folderId: string): void {
+ setError('')
+ setExpandedIds(previous => {
+ const next = new Set(previous)
+ if (next.has(folderId)) next.delete(folderId)
+ else next.add(folderId)
+ return next
+ })
+ }
+
+ function selectFolder(folder: MoveFolder): void {
+ setError('')
+ setSelected({ resourceId: folder.resourceId, name: folder.name })
+ setExpandedIds(previous => new Set(previous).add(folder.resourceId))
+ }
+
+ async function commit(): Promise<void> {
+ if (!selected || busy) return
+ setError('')
+ try {
+ await onMove(selected.resourceId, selected.name)
+ } catch (moveError) {
+ setError(messageOf(moveError))
+ }
+ }
+
+ return (
+ <div
+ className="cu-modal-backdrop cu-gfs-move-modal"
+ role="presentation"
+ onMouseDown={event => {
+ if (event.target === event.currentTarget && !busy) onClose()
+ }}
+ >
+ <section
+ aria-label={`Move ${target.kind === 'directory' ? 'folder' : 'file'} ${target.name}`}
+ aria-modal="true"
+ className="cu-gfs-move-dialog"
+ role="dialog"
+ >
+ <header className="cu-gfs-move-dialog__header">
+ <span className="cu-gfs-move-dialog__header-icon" aria-hidden="true">
+ <IconFolder />
+ </span>
+ <h3>Move “{target.name}”</h3>
+ <Button
+ aria-label="Close move dialog"
+ className="cu-gfs-move-dialog__close"
+ disabled={busy}
+ icon
+ onClick={onClose}
+ variant="ghost"
+ >
+ <IconX />
+ </Button>
+ </header>
+
+ <div className="cu-gfs-move-dialog__current-location">
+ <span>Current location:</span>
+ <span className="cu-gfs-move-dialog__location-pill">
+ <IconFolder />
+ <strong>{selected?.name ?? 'Choose a folder'}</strong>
+ </span>
+ </div>
+
+ {error ? (
+ <div className="cu-banner cu-banner--error cu-gfs-move-dialog__error" role="alert">
+ {error}
+ </div>
+ ) : null}
+
+ <div className="cu-gfs-move-dialog__tree-heading">Global File System</div>
+ <div className="cu-gfs-move-dialog__tree" role="tree" aria-label="GFS destination folders">
+ {loading && !loaded ? (
+ <p className="cu-gfs-move-dialog__notice" role="status">
+ Loading folders…
+ </p>
+ ) : !visibleRoots.length && !nextCursor ? (
+ <p className="cu-gfs-move-dialog__notice">No folders here.</p>
+ ) : (
+ visibleRoots.map(folder => (
+ <TreeFolder
+ ancestors={new Set()}
+ expandedIds={expandedIds}
+ folder={folder}
+ key={folder.resourceId}
+ level={1}
+ onSelect={selectFolder}
+ onToggle={toggleFolder}
+ selected={selected}
+ targetId={target.resourceId}
+ />
+ ))
+ )}
+ {nextCursor ? (
+ <Button
+ className="cu-gfs-move-dialog__load-more"
+ loading={loading}
+ onClick={() => void loadRoots(nextCursor)}
+ size="sm"
+ >
+ Load more
+ </Button>
+ ) : null}
+ </div>
+
+ <footer className="cu-gfs-move-dialog__footer">
+ <span className="cu-gfs-move-dialog__selection" aria-live="polite">
+ {selected ? (
+ <>
+ Move to <strong>{selected.name}</strong>
+ </>
+ ) : (
+ 'Select a destination folder'
+ )}
+ </span>
+ <span className="cu-gfs-move-dialog__actions">
+ <Button disabled={busy} onClick={onClose} variant="ghost">
+ Cancel
+ </Button>
+ <Button
+ aria-label={selected ? `Move here (${selected.name})` : 'Move'}
+ disabled={!selected}
+ loading={busy}
+ onClick={() => void commit()}
+ variant="primary"
+ >
+ Move
+ </Button>
+ </span>
+ </footer>
+ </section>
+ </div>
+ )
+}
diff --git a/control-ui/components/GfsResourceMenu/index.tsx b/control-ui/components/GfsResourceMenu/index.tsx
index 1b0c89ea9..64892aa82 100644
--- a/control-ui/components/GfsResourceMenu/index.tsx
+++ b/control-ui/components/GfsResourceMenu/index.tsx
@@ -3,7 +3,7 @@
import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react'
import type { KeyboardEvent as ReactKeyboardEvent, ReactNode } from 'react'
import { createPortal } from 'react-dom'
-import { IconSharedFiles } from '@components/Sidebar/icons'
+import { IconFolder, IconSharedFiles } from '@components/Sidebar/icons'
import {
IconCopy,
IconDotsVertical,
@@ -44,6 +44,7 @@ export function GfsResourceMenu({
onDelete,
onDownload,
onManage,
+ onMove,
onPreview,
onRename,
onReplace,
@@ -166,6 +167,7 @@ export function GfsResourceMenu({
[
menuAction('copy-link', 'Copy GFS link', <IconCopy />, onCopyLink),
menuAction('rename', 'Rename', <IconPencil />, onRename),
+ menuAction('move', 'Move to…', <IconFolder />, onMove),
].filter(isMenuAction),
[menuAction('delete', 'Delete', <IconTrash />, onDelete, { danger: true })].filter(
isMenuAction
diff --git a/control-ui/components/GfsResourceMenu/types.ts b/control-ui/components/GfsResourceMenu/types.ts
index b8928d646..2a4b5b96f 100644
--- a/control-ui/components/GfsResourceMenu/types.ts
+++ b/control-ui/components/GfsResourceMenu/types.ts
@@ -4,6 +4,7 @@ export interface GfsResourceMenuProps {
onDelete: () => void
onDownload?: () => void
onManage?: () => void
+ onMove?: () => void
onPreview?: () => void
onRename: () => void
onReplace?: (file: File) => void
diff --git a/control-ui/components/__tests__/GfsBrowser.test.tsx b/control-ui/components/__tests__/GfsBrowser.test.tsx
index a8059b67d..3389ad17f 100644
--- a/control-ui/components/__tests__/GfsBrowser.test.tsx
+++ b/control-ui/components/__tests__/GfsBrowser.test.tsx
@@ -616,6 +616,46 @@ describe('GfsBrowser', () => {
await waitFor(() => expect(screen.queryByText('report.md')).toBeNull())
})
+ it('opens the compact move picker from the resource menu and moves to its selection', async () => {
+ const folder = child('archive', 'directory', 1)
+ const file = child('report.md', 'file', 2)
+ mockApiGet.mockImplementation(async (path: string) => {
+ if (
+ path === '/api/v1/gfs/tree' ||
+ path === '/api/v1/gfs/resources/11111111-1111-1111-1111-111111111111/children'
+ ) {
+ return {
+ rootResourceId: '11111111-1111-1111-1111-111111111111',
+ items: [folder, file],
+ nextCursor: null,
+ }
+ }
+ return { items: [], nextCursor: null }
+ })
+ mockApiSend.mockResolvedValueOnce({ ok: true })
+ renderBrowser()
+
+ await waitFor(() => expect(screen.queryByRole('status', { name: 'Loading files' })).toBeNull())
+ await openResourceMenu('report.md')
+ fireEvent.click(screen.getByRole('menuitem', { name: 'Move to…' }))
+
+ const dialog = await screen.findByRole('dialog', { name: 'Move file report.md' })
+ const destination = await within(dialog).findByRole('button', { name: 'archive' })
+ expect(destination.classList.contains('cu-gfs-move-dialog__tree-select')).toBe(true)
+ fireEvent.click(destination)
+ fireEvent.click(within(dialog).getByRole('button', { name: 'Move here (archive)' }))
+
+ await waitFor(() =>
+ expect(mockApiSend).toHaveBeenCalledWith(
+ 'PATCH',
+ '/api/v1/gfs/resources/id-2',
+ { drive: 'main', newParentId: 'id-1', ifMatch: 0 },
+ { drive: 'main' }
+ )
+ )
+ await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull())
+ })
+
it('keeps a persisted drag-and-drop session when resumable capabilities are unavailable', async () => {
const rootId = '11111111-1111-1111-1111-111111111111'
const rootRid = '11111111111111111111111111111111'
@@ -848,11 +888,14 @@ describe('GfsBrowser', () => {
expect(reportRow).toBeTruthy()
await openResourceMenu('report.txt')
fireEvent.click(screen.getByRole('menuitem', { name: 'Rename' }))
- const renameForm = await screen.findByRole('form', { name: 'Rename resource' })
+ const renameForm = await within(reportRow!).findByRole('form', { name: 'Rename resource' })
+ expect(screen.queryByRole('dialog', { name: 'Manage file report.txt' })).toBeNull()
fireEvent.change(within(renameForm).getByLabelText('New name'), {
target: { value: rawRename },
})
- fireEvent.click(within(renameForm).getByRole('button', { name: 'Save' }))
+ expect(within(renameForm).getByRole('button', { name: 'Save name' })).toBeTruthy()
+ expect(within(renameForm).getByRole('button', { name: 'Cancel rename' })).toBeTruthy()
+ fireEvent.click(within(renameForm).getByRole('button', { name: 'Save name' }))
await waitFor(() =>
expect(mockApiSend).toHaveBeenCalledWith(
@@ -864,6 +907,28 @@ describe('GfsBrowser', () => {
)
})
+ it('keeps manage-dialog rename inline with the shared confirmation controls', async () => {
+ mockApiGet.mockResolvedValueOnce({
+ items: [child('report.txt', 'file', 2)],
+ nextCursor: null,
+ })
+ renderBrowser()
+
+ await openManage('report.txt')
+ const manageDialog = await screen.findByRole('dialog', { name: 'Manage file report.txt' })
+ const manageMenuTrigger = within(manageDialog).getByRole('button', {
+ name: 'Actions for report.txt',
+ })
+ fireEvent.click(manageMenuTrigger)
+ fireEvent.click(within(screen.getByRole('menu')).getByRole('menuitem', { name: 'Rename' }))
+
+ const renameForm = within(manageDialog).getByRole('form', { name: 'Rename resource' })
+ expect(within(renameForm).getByRole('button', { name: 'Save name' })).toBeTruthy()
+ expect(within(renameForm).getByRole('button', { name: 'Cancel rename' })).toBeTruthy()
+ fireEvent.click(within(renameForm).getByRole('button', { name: 'Cancel rename' }))
+ expect(within(manageDialog).queryByRole('form', { name: 'Rename resource' })).toBeNull()
+ })
+
it('downloads a file through the operator content proxy using rid + name', async () => {
mockApiGet.mockResolvedValueOnce({
items: [child('report.md', 'file', 2)],
diff --git a/control-ui/components/__tests__/GfsMoveDialog.test.tsx b/control-ui/components/__tests__/GfsMoveDialog.test.tsx
new file mode 100644
index 000000000..4213cedff
--- /dev/null
+++ b/control-ui/components/__tests__/GfsMoveDialog.test.tsx
@@ -0,0 +1,61 @@
+// @vitest-environment jsdom
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { cleanup, fireEvent, render, screen, waitFor, within } from '@testing-library/react'
+import { apiGet } from '@lib/api'
+import { GfsMoveDialog } from '../GfsMoveDialog'
+
+vi.mock('@lib/api', () => ({ apiGet: vi.fn() }))
+
+const mockApiGet = vi.mocked(apiGet)
+
+afterEach(() => {
+ cleanup()
+ vi.clearAllMocks()
+})
+
+describe('GfsMoveDialog', () => {
+ it('renders a compact folder picker and moves to the selected location', async () => {
+ mockApiGet.mockImplementation(async path => {
+ if (path === '/api/v1/gfs/tree') {
+ return {
+ items: [
+ {
+ resourceId: 'archive-1',
+ name: 'Archive',
+ kind: 'directory',
+ },
+ ],
+ nextCursor: null,
+ }
+ }
+ return { items: [], nextCursor: null }
+ })
+ const onMove = vi.fn(async () => undefined)
+
+ render(
+ <GfsMoveDialog
+ initialCrumbs={[{ id: 'product-1', name: 'Product' }]}
+ onClose={vi.fn()}
+ onMove={onMove}
+ target={{ resourceId: 'file-1', name: 'notes.txt', kind: 'file' }}
+ />
+ )
+
+ const dialog = screen.getByRole('dialog', { name: 'Move file notes.txt' })
+ expect(within(dialog).getByText('Move “notes.txt”')).toBeTruthy()
+ expect(within(dialog).queryByText('Suggested')).toBeNull()
+ expect(within(dialog).queryByText('Starred')).toBeNull()
+ expect(within(dialog).queryByText('All locations')).toBeNull()
+
+ const archive = await within(dialog).findByRole('button', { name: 'Archive' })
+ expect(archive.classList.contains('cu-gfs-move-dialog__tree-select')).toBe(true)
+ fireEvent.click(archive)
+
+ await waitFor(() => {
+ expect(within(dialog).getAllByText('Archive', { selector: 'strong' })).toHaveLength(2)
+ })
+ fireEvent.click(within(dialog).getByRole('button', { name: 'Move here (Archive)' }))
+
+ await waitFor(() => expect(onMove).toHaveBeenCalledWith('archive-1', 'Archive'))
+ })
+})
diff --git a/control-ui/next-env.d.ts b/control-ui/next-env.d.ts
index c4b7818fb..9edff1c7c 100644
--- a/control-ui/next-env.d.ts
+++ b/control-ui/next-env.d.ts
@@ -1,6 +1,6 @@
/// <reference types="next" />
/// <reference types="next/image-types/global" />
-import "./.next/dev/types/routes.d.ts";
+import "./.next/types/routes.d.ts";
// NOTE: This file should not be edited
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
diff --git a/control-ui/package-lock.json b/control-ui/package-lock.json
index da2202e58..5e68a1e21 100644
--- a/control-ui/package-lock.json
+++ b/control-ui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-ui",
- "version": "0.1.499",
+ "version": "0.1.500",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-ui",
- "version": "0.1.499",
+ "version": "0.1.500",
"dependencies": {
"@clerum/display-field": "file:../packages/display-field",
"@clerum/llm-providers": "file:../packages/llm-providers",
diff --git a/control-ui/package.json b/control-ui/package.json
index 39f181a43..da72fd0cf 100644
--- a/control-ui/package.json
+++ b/control-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-ui",
- "version": "0.1.499",
+ "version": "0.1.500",
"private": true,
"scripts": {
"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",
diff --git a/desktop-app/ui/src/components/GfsImagePreview/index.tsx b/desktop-app/ui/src/components/GfsImagePreview/index.tsx
index c6802006b..c7e92e858 100644
--- a/desktop-app/ui/src/components/GfsImagePreview/index.tsx
+++ b/desktop-app/ui/src/components/GfsImagePreview/index.tsx
@@ -1,26 +1,11 @@
-import { type CSSProperties, useEffect, useId, useLayoutEffect, useRef, useState } from 'react'
+import { useEffect, useId, useRef, useState } from 'react'
import { createPortal } from 'react-dom'
import { Button, StatusBanner } from '@components/Common'
import { IconClose, IconCopy } from '@components/SidebarNav/icons'
+import { useWorkspaceModalStyle } from '@hooks/useWorkspaceModalStyle'
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,
@@ -35,40 +20,11 @@ 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 backdropStyle = useWorkspaceModalStyle()
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])
@@ -158,9 +114,6 @@ export function GfsImagePreview({
}
}
- const backdropStyle: CSSProperties | undefined =
- workspaceLeft > 0 ? { left: workspaceLeft, right: 0 } : undefined
-
return createPortal(
<div
className="da-gfs-image-preview-modal"
diff --git a/desktop-app/ui/src/components/GfsMarkdownPreview/index.tsx b/desktop-app/ui/src/components/GfsMarkdownPreview/index.tsx
index dbade65fc..9c4ad8c75 100644
--- a/desktop-app/ui/src/components/GfsMarkdownPreview/index.tsx
+++ b/desktop-app/ui/src/components/GfsMarkdownPreview/index.tsx
@@ -3,6 +3,7 @@ import type { ReactNode } from 'react'
import { createPortal } from 'react-dom'
import { Button, StatusBanner } from '@components/Common'
import { IconClose, IconCopy } from '@components/SidebarNav/icons'
+import { useWorkspaceModalStyle } from '@hooks/useWorkspaceModalStyle'
import { assertGfsMarkdownPreviewSize } from '@lib/gfsMarkdownPreview'
import { parseVanillaMarkdown } from '@lib/vanillaMarkdown'
import type { MarkdownBlock, MarkdownInlineNode } from '@lib/vanillaMarkdown.types'
@@ -72,6 +73,7 @@ export function GfsMarkdownPreview({
const [source, setSource] = useState<string | null>(null)
const [previewError, setPreviewError] = useState<string | null>(null)
const [copyState, setCopyState] = useState<'idle' | 'copied' | 'error'>('idle')
+ const backdropStyle = useWorkspaceModalStyle()
const copyResetTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null)
const mountedRef = useRef(true)
const onDownloadErrorRef = useRef(onDownloadError)
@@ -153,6 +155,7 @@ export function GfsMarkdownPreview({
<div
className="da-gfs-markdown-preview-modal"
role="presentation"
+ style={backdropStyle}
onMouseDown={event => {
if (event.target === event.currentTarget) onClose()
}}
diff --git a/desktop-app/ui/src/components/GfsPreviewWorkspaceLayout.test.tsx b/desktop-app/ui/src/components/GfsPreviewWorkspaceLayout.test.tsx
new file mode 100644
index 000000000..a22768024
--- /dev/null
+++ b/desktop-app/ui/src/components/GfsPreviewWorkspaceLayout.test.tsx
@@ -0,0 +1,107 @@
+// @vitest-environment jsdom
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { cleanup, render, screen, waitFor } from '@testing-library/react'
+import { GfsMarkdownPreview } from '@components/GfsMarkdownPreview'
+import { GfsVideoPreview } from '@components/GfsVideoPreview'
+
+describe('GFS workspace-aware preview 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 TextEncoder().encode('# Preview\nBody').buffer,
+ })),
+ },
+ },
+ })
+ Object.defineProperty(URL, 'createObjectURL', {
+ configurable: true,
+ value: vi.fn(() => 'blob:gfs-video-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()
+ sidebarRight = 74
+ resizeObserverCallback = null
+ vi.unstubAllGlobals()
+ vi.restoreAllMocks()
+ })
+
+ it.each([
+ ['plain text', 'notes.txt'],
+ ['Markdown', 'readme.md'],
+ ['video', 'demo.mp4'],
+ ])('keeps the %s preview clear of an expanding sidebar', async (kind, fileName) => {
+ if (kind === 'video') {
+ render(
+ <GfsVideoPreview
+ byteLength={14}
+ fileName={fileName}
+ gfsUri="gfs://main/file-1"
+ mimeType="video/mp4"
+ onClose={vi.fn()}
+ />
+ )
+ } else {
+ render(
+ <GfsMarkdownPreview
+ byteLength={14}
+ fileName={fileName}
+ gfsUri="gfs://main/file-1"
+ onClose={vi.fn()}
+ />
+ )
+ }
+
+ const modal = screen.getByRole('presentation') as HTMLElement
+ expect(modal.style.left).toBe('74px')
+ expect(modal.style.right).toBe('0px')
+
+ sidebarRight = 328
+ sidebar.classList.remove('collapsed')
+ resizeObserverCallback?.()
+
+ await waitFor(() => {
+ expect(modal.style.left).toBe('328px')
+ expect(modal.style.right).toBe('0px')
+ })
+ })
+})
diff --git a/desktop-app/ui/src/components/GfsVideoPreview/index.tsx b/desktop-app/ui/src/components/GfsVideoPreview/index.tsx
index b4cfee6a5..51cd9fe86 100644
--- a/desktop-app/ui/src/components/GfsVideoPreview/index.tsx
+++ b/desktop-app/ui/src/components/GfsVideoPreview/index.tsx
@@ -2,6 +2,7 @@ import { useEffect, useId, useRef, useState } from 'react'
import { createPortal } from 'react-dom'
import { Button, StatusBanner } from '@components/Common'
import { IconClose } from '@components/SidebarNav/icons'
+import { useWorkspaceModalStyle } from '@hooks/useWorkspaceModalStyle'
import { assertGfsVideoPreviewSize } from '@lib/gfsVideoPreview'
import type { GfsVideoPreviewProps } from './types'
@@ -17,6 +18,7 @@ export function GfsVideoPreview({
const closeButtonRef = useRef<HTMLButtonElement | null>(null)
const [previewUrl, setPreviewUrl] = useState<string | null>(null)
const [previewError, setPreviewError] = useState<string | null>(null)
+ const backdropStyle = useWorkspaceModalStyle()
const onDownloadErrorRef = useRef(onDownloadError)
useEffect(() => {
@@ -62,6 +64,7 @@ export function GfsVideoPreview({
<div
className="da-gfs-video-preview-modal"
role="presentation"
+ style={backdropStyle}
onMouseDown={event => {
if (event.target === event.currentTarget) onClose()
}}
diff --git a/desktop-app/ui/src/gfs/__tests__/moveDialog.test.tsx b/desktop-app/ui/src/gfs/__tests__/moveDialog.test.tsx
index 7a85aa02f..271b1536c 100644
--- a/desktop-app/ui/src/gfs/__tests__/moveDialog.test.tsx
+++ b/desktop-app/ui/src/gfs/__tests__/moveDialog.test.tsx
@@ -86,7 +86,12 @@ describe('GfsMoveDialog pagination', () => {
renderDialog({ listAccessible }, { onMove })
const dialog = await screen.findByRole('dialog', { name: 'Move file notes.txt' })
- expect(await within(dialog).findByRole('button', { name: 'Archive' })).toBeTruthy()
+ expect(within(dialog).getByText('Move “notes.txt”')).toBeTruthy()
+ expect(within(dialog).queryByText('Suggested')).toBeNull()
+ expect(within(dialog).queryByText('Starred')).toBeNull()
+ expect(within(dialog).queryByText('All locations')).toBeNull()
+ const archive = await within(dialog).findByRole('button', { name: 'Archive' })
+ expect(archive.classList.contains('da-gfs-move-dialog__tree-select')).toBe(true)
// Page two is not silently fetched, but reachable through Load more.
expect(within(dialog).queryByRole('button', { name: 'Deep Storage' })).toBeNull()
expect(within(dialog).getByRole('button', { name: 'Load more' })).toBeTruthy()
diff --git a/desktop-app/ui/src/gfs/moveDialog.tsx b/desktop-app/ui/src/gfs/moveDialog.tsx
index 3a760f190..a94e99d7d 100644
--- a/desktop-app/ui/src/gfs/moveDialog.tsx
+++ b/desktop-app/ui/src/gfs/moveDialog.tsx
@@ -196,9 +196,12 @@ export function GfsMoveDialog({
const accessibleQuery = useInfiniteQuery({
queryKey: desktopQueryKeys.gfsAccessible(scope, GFS_DRIVE_MAIN),
- queryFn: ({ pageParam }) =>
- window.clerum?.gfs?.listAccessible(GFS_DRIVE_MAIN, pageParam) ??
- Promise.resolve({ items: [], nextCursor: null }),
+ queryFn: ({ pageParam }) => {
+ const listAccessible = window.clerum?.gfs?.listAccessible
+ return typeof listAccessible === 'function'
+ ? listAccessible(GFS_DRIVE_MAIN, pageParam)
+ : Promise.resolve({ items: [], nextCursor: null })
+ },
initialPageParam: undefined as string | undefined,
getNextPageParam: lastPage => lastPage.nextCursor ?? undefined,
})
@@ -211,12 +214,25 @@ export function GfsMoveDialog({
parentResourceId: item.parentResourceId ?? null,
}))
.filter(item => item.kind === 'directory')
+ const currentPathRoot = initialCrumbs[0]
+ if (
+ currentPathRoot?.kind === 'directory' &&
+ !accessibleFolders.some(folder => folder.resourceId === currentPathRoot.resourceId)
+ ) {
+ accessibleFolders.unshift({
+ ...currentPathRoot,
+ rid: currentPathRoot.resourceId,
+ drive: GFS_DRIVE_MAIN,
+ parentResourceId: null,
+ path: null,
+ })
+ }
const accessibleFolderIds = new Set(accessibleFolders.map(folder => folder.resourceId))
const roots = accessibleFolders.filter(
folder => !folder.parentResourceId || !accessibleFolderIds.has(folder.parentResourceId)
)
return folderItems(roots, new Set([target.resourceId]))
- }, [accessibleQuery.data, target.resourceId])
+ }, [accessibleQuery.data, initialCrumbs, target.resourceId])
const listError = errorMessage(accessibleQuery.error)
const loadingRoots = accessibleQuery.isFetching && rootFolders.length === 0
@@ -280,8 +296,7 @@ export function GfsMoveDialog({
<IconContexts />
</span>
<span className="da-gfs-manage-dialog__heading">
- <h3>Move {target.name}</h3>
- <span className="muted">Choose a destination folder.</span>
+ <h3>Move “{target.name}”</h3>
</span>
<span className="da-gfs-manage-dialog__top-actions">
<IconButton label="Close move dialog" onClick={onClose} size="sm" variant="ghost">
@@ -292,12 +307,17 @@ export function GfsMoveDialog({
<div className="da-gfs-manage-dialog__body">
{error ? <StatusBanner tone="error" text={error} /> : null}
{listError ? <StatusBanner tone="error" text={listError} /> : null}
+ <div className="da-gfs-move-dialog__current-location">
+ <span>Current location:</span>
+ <span className="da-gfs-move-dialog__location-pill">
+ <IconContexts />
+ <strong>{selectedDestination?.name ?? 'Choose a folder'}</strong>
+ </span>
+ </div>
<div className="da-gfs-move-dialog__tree-heading">
<span className="da-gfs-move-dialog__tree-heading-copy">
- <span className="da-gfs-move-dialog__tree-eyebrow">Destination</span>
<strong>Shared with me</strong>
</span>
- <span className="muted">Expand folders to browse the full tree.</span>
</div>
<div
className="da-gfs-move-dialog__tree"
@@ -357,12 +377,15 @@ export function GfsMoveDialog({
Cancel
</Button>
<Button
+ aria-label={
+ selectedDestination ? `Move here (${selectedDestination.name})` : 'Move'
+ }
disabled={!selectedDestination || pathPassesThroughTarget}
loading={busy}
onClick={() => void commit()}
type="button"
>
- Move here{selectedDestination ? ` (${selectedDestination.name})` : ''}
+ Move
</Button>
</span>
</div>
diff --git a/desktop-app/ui/src/hooks/useWorkspaceModalStyle.ts b/desktop-app/ui/src/hooks/useWorkspaceModalStyle.ts
new file mode 100644
index 000000000..8b90aacf1
--- /dev/null
+++ b/desktop-app/ui/src/hooks/useWorkspaceModalStyle.ts
@@ -0,0 +1,56 @@
+import { type CSSProperties, useLayoutEffect, useState } from 'react'
+
+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))
+}
+
+/**
+ * Preview dialogs are portaled to document.body, outside the workspace layout.
+ * Keep their fixed backdrop inset to the live right edge of the desktop sidebar
+ * so the dialog remains centered in the visible workspace as navigation changes.
+ */
+export function useWorkspaceModalStyle(): CSSProperties | undefined {
+ const [workspaceLeft, setWorkspaceLeft] = useState(0)
+
+ 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
+ if (sidebar) resizeObserver?.observe(sidebar)
+
+ const mutationObserver =
+ sidebar && typeof MutationObserver !== 'undefined' ? new MutationObserver(measure) : null
+ if (sidebar) {
+ 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)
+ }
+ }, [])
+
+ return workspaceLeft > 0 ? { left: workspaceLeft, right: 0 } : undefined
+}
diff --git a/desktop-app/ui/src/pages/FilesPage.tsx b/desktop-app/ui/src/pages/FilesPage.tsx
index 8a9072131..19c965d12 100644
--- a/desktop-app/ui/src/pages/FilesPage.tsx
+++ b/desktop-app/ui/src/pages/FilesPage.tsx
@@ -58,6 +58,14 @@ function hasDraggedFiles(event: ReactDragEvent<HTMLElement>): boolean {
return Array.from(event.dataTransfer.types || []).includes('Files')
}
+const GFS_RESOURCE_DRAG_TYPE = 'application/x-evenfire-gfs-resource'
+
+function hasDraggedGfsResource(event: ReactDragEvent<HTMLElement>): boolean {
+ return Array.from(event.dataTransfer.types || []).includes(GFS_RESOURCE_DRAG_TYPE)
+}
+
+type FolderDropAccessResult = { allowed: boolean; error?: unknown }
+
function isGfsPreviewFile(fileName: string): boolean {
return (
gfsImagePreviewMimeType(fileName) !== null ||
@@ -232,6 +240,15 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
const [filePreview, setFilePreview] = useState<GfsPreviewResource | null>(null)
const [dragActive, setDragActive] = useState(false)
const [droppedUploadCount, setDroppedUploadCount] = useState(0)
+ const [draggingResourceId, setDraggingResourceId] = useState<string | null>(null)
+ const [dragOverFolderId, setDragOverFolderId] = useState<string | null>(null)
+ const [movingResourceId, setMovingResourceId] = useState<string | null>(null)
+ const draggingResourceRef = useRef<GfsDriveResource | null>(null)
+ const movingResourceRef = useRef<string | null>(null)
+ const hoveredFolderRef = useRef<string | null>(null)
+ const folderDropAccessRef = useRef(new Map<string, FolderDropAccessResult>())
+ const folderDropChecksRef = useRef(new Map<string, Promise<FolderDropAccessResult>>())
+ const dragSessionRef = useRef(0)
const manageReturnCrumbsRef = useRef<GfsCrumb[] | null>(null)
const uploadInputRef = useRef<HTMLInputElement | null>(null)
const replaceInputRef = useRef<HTMLInputElement | null>(null)
@@ -361,6 +378,9 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
)
const canWriteCurrent = !accessRevoked && hasBit(affordances, 'write')
const canDeleteCurrent = !accessRevoked && hasBit(affordances, 'delete')
+ // The Manage modal lists ACL rows, and view-ACL = manage-ACL server-side —
+ // a caller without the bit gets the API's 403, so the entry must not show.
+ const canManageCurrent = !accessRevoked && hasBit(affordances, 'manage_acl')
const currentIsFolder = current?.kind === 'directory'
const currentIsFile = current?.kind === 'file'
const currentPreviewAvailable = currentIsFile && isGfsPreviewFile(current?.name ?? '')
@@ -603,6 +623,142 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
}
}
+ const clearResourceDrag = () => {
+ dragSessionRef.current += 1
+ draggingResourceRef.current = null
+ hoveredFolderRef.current = null
+ folderDropAccessRef.current.clear()
+ folderDropChecksRef.current.clear()
+ setDraggingResourceId(null)
+ setDragOverFolderId(null)
+ }
+
+ const resolveFolderDropAccess = (folder: GfsDriveResource): Promise<FolderDropAccessResult> => {
+ const cached = folderDropAccessRef.current.get(folder.resourceId)
+ if (cached) return Promise.resolve(cached)
+ const pending = folderDropChecksRef.current.get(folder.resourceId)
+ if (pending) return pending
+
+ const dragSession = dragSessionRef.current
+ const check = Promise.resolve()
+ .then(() => window.clerum.gfs.affordances(folder.resourceId, 'main'))
+ .then(result => ({ allowed: result.held.includes('write') }))
+ .catch((permissionError: unknown) => {
+ const failedClosed = failClosedOnAuthorizationError(permissionError)
+ return { allowed: false, error: failedClosed ? undefined : permissionError }
+ })
+ .then(result => {
+ if (dragSession === dragSessionRef.current) {
+ folderDropAccessRef.current.set(folder.resourceId, result)
+ if (result.allowed && hoveredFolderRef.current === folder.resourceId) {
+ setDragOverFolderId(folder.resourceId)
+ }
+ }
+ return result
+ })
+ .finally(() => {
+ if (dragSession === dragSessionRef.current) {
+ folderDropChecksRef.current.delete(folder.resourceId)
+ }
+ })
+
+ folderDropChecksRef.current.set(folder.resourceId, check)
+ return check
+ }
+
+ const handleResourceDragStart = (
+ event: ReactDragEvent<HTMLElement>,
+ resource: GfsDriveResource
+ ) => {
+ if (resource.kind === 'directory' || movingResourceRef.current) {
+ event.preventDefault()
+ return
+ }
+ dragSessionRef.current += 1
+ folderDropAccessRef.current.clear()
+ folderDropChecksRef.current.clear()
+ event.dataTransfer.effectAllowed = 'move'
+ event.dataTransfer.setData(GFS_RESOURCE_DRAG_TYPE, resource.resourceId)
+ event.dataTransfer.setData('text/plain', resource.name)
+ draggingResourceRef.current = resource
+ setDraggingResourceId(resource.resourceId)
+ }
+
+ const handleResourceDragEnd = () => {
+ clearResourceDrag()
+ }
+
+ const handleFolderDragOver = (event: ReactDragEvent<HTMLElement>, folder: GfsDriveResource) => {
+ if (!hasDraggedGfsResource(event)) return
+ const source = draggingResourceRef.current
+ if (!source || folder.kind !== 'directory' || source.resourceId === folder.resourceId) return
+
+ event.preventDefault()
+ event.stopPropagation()
+ hoveredFolderRef.current = folder.resourceId
+ const access = folderDropAccessRef.current.get(folder.resourceId)
+ if (access?.allowed) {
+ event.dataTransfer.dropEffect = 'move'
+ setDragOverFolderId(folder.resourceId)
+ return
+ }
+
+ event.dataTransfer.dropEffect = 'none'
+ setDragOverFolderId(null)
+ if (!access) void resolveFolderDropAccess(folder)
+ }
+
+ const handleFolderDragLeave = (event: ReactDragEvent<HTMLElement>) => {
+ if (!hasDraggedGfsResource(event)) return
+ event.preventDefault()
+ event.stopPropagation()
+ if (!event.currentTarget.contains(event.relatedTarget as Node | null)) {
+ hoveredFolderRef.current = null
+ setDragOverFolderId(null)
+ }
+ }
+
+ const handleFolderDrop = async (
+ event: ReactDragEvent<HTMLElement>,
+ destination: GfsDriveResource
+ ) => {
+ if (!hasDraggedGfsResource(event)) return
+ event.preventDefault()
+ event.stopPropagation()
+ hoveredFolderRef.current = null
+ setDragOverFolderId(null)
+ const source = draggingResourceRef.current
+ if (!source || destination.kind !== 'directory' || movingResourceRef.current) return
+
+ try {
+ const access = await resolveFolderDropAccess(destination)
+ if (!access.allowed) {
+ const message = access.error
+ ? access.error instanceof Error
+ ? access.error.message
+ : String(access.error)
+ : `You can’t move files to ${destination.name} because you don’t have write permission for this folder.`
+ pushToast?.(message, 'error')
+ return
+ }
+
+ movingResourceRef.current = source.resourceId
+ setMovingResourceId(source.resourceId)
+ try {
+ await ctrl.moveResource(source.resourceId, destination.resourceId, source.version)
+ pushToast?.(`Moved ${source.name} to ${destination.name}`, 'success')
+ } catch (moveError) {
+ if (failClosedOnAuthorizationError(moveError)) return
+ pushToast?.(moveError instanceof Error ? moveError.message : String(moveError), 'error')
+ } finally {
+ movingResourceRef.current = null
+ setMovingResourceId(null)
+ }
+ } finally {
+ clearResourceDrag()
+ }
+ }
+
const handleGfsDragEnter = (event: ReactDragEvent<HTMLElement>) => {
if (!hasDraggedFiles(event)) return
event.preventDefault()
@@ -745,6 +901,19 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
return Boolean(resource.permissions?.includes('write'))
}
+ /** Manage gate: the ACL modal needs `manage_acl` (view-ACL = manage-ACL
+ * server-side). Same lazy row resolution as delete/rename — a read-only
+ * row must not offer a Manage entry that would only 403 on open. */
+ const rowCanManage = (resource: GfsDriveResource): boolean => {
+ if (currentIsFolder) {
+ return (
+ ctrl.rowAffordancesResourceId === resource.resourceId &&
+ Boolean(ctrl.rowAffordances?.held.includes('manage_acl'))
+ )
+ }
+ return Boolean(resource.permissions?.includes('manage_acl'))
+ }
+
/** Move commits bubble their failure back to the dialog (in-place banner);
* success toasts and closes it. An authority rejection instead fails the
* session closed and closes the dialog — the revoked state takes over.
@@ -929,12 +1098,16 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
{current && !currentIsFile && !currentIsBeingRenamed ? (
<GfsResourceMenu
resourceName={current.name}
- onManage={() => {
- setCreateFolderOpen(false)
- setRenameOpen(false)
- setDeleteOpen(false)
- setManageOpen(true)
- }}
+ onManage={
+ canManageCurrent
+ ? () => {
+ setCreateFolderOpen(false)
+ setRenameOpen(false)
+ setDeleteOpen(false)
+ setManageOpen(true)
+ }
+ : undefined
+ }
onCopyLink={() => void handleCopyLink(current.gfsUri)}
onDelete={canDeleteCurrent ? () => setDeleteTarget(current) : undefined}
onOpenGfsLink={() => setOpenLinkOpen(true)}
@@ -1045,13 +1218,17 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
<h3>{current.name}</h3>
<GfsResourceMenu
resourceName={current.name}
- onManage={() => {
- manageReturnCrumbsRef.current = crumbs.slice(0, -1)
- setCreateFolderOpen(false)
- setRenameOpen(false)
- setDeleteOpen(false)
- setManageOpen(true)
- }}
+ onManage={
+ canManageCurrent
+ ? () => {
+ manageReturnCrumbsRef.current = crumbs.slice(0, -1)
+ setCreateFolderOpen(false)
+ setRenameOpen(false)
+ setDeleteOpen(false)
+ setManageOpen(true)
+ }
+ : undefined
+ }
onCopyLink={() => void handleCopyLink(current.gfsUri)}
onDelete={canDeleteCurrent ? () => setDeleteTarget(current) : undefined}
onRename={canWriteCurrent ? () => openRenameTarget(current) : undefined}
@@ -1097,106 +1274,149 @@ export function FilesPage({ pushToast, pendingGfsUri, onPendingGfsUriHandled }:
<span className="da-grid__col-header da-grid__col-header--right">Actions</span>
</div>
<div className="da-grid__body">
- {visibleResources.map(resource => (
- <div
- className="da-grid__row da-grid__row--clickable da-grid__row--compact"
- key={resource.resourceId}
- role="button"
- tabIndex={0}
- 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)
- }}
- onKeyDown={event => {
- if (event.key !== 'Enter' && event.key !== ' ') return
- if (isEventFromNestedInteractive(event)) return
- event.preventDefault()
- openResource(resource)
- }}
- >
- <span className="da-gfs-list__icon da-grid__cell" aria-hidden="true">
- {resource.kind === 'directory' ? (
- <IconContexts />
- ) : (
- <GfsFileIcon name={resource.name} />
- )}
- </span>
- <span className="da-gfs-list__identity da-grid__cell">
- <span className="da-gfs-list__name">
- {renameTarget?.resourceId === resource.resourceId ? (
- <GfsInlineRename
- onCancel={() => setRenameTarget(null)}
- onChange={setRenameDraft}
- onSubmit={() => void handleRenameTarget()}
- value={renameDraft}
- busy={ctrl.mutating}
- />
+ {visibleResources.map(resource => {
+ const isDragging =
+ draggingResourceId === resource.resourceId ||
+ movingResourceId === resource.resourceId
+ const isDropTarget = dragOverFolderId === resource.resourceId
+ const canDragResource =
+ resource.kind === 'file' &&
+ resource.readable !== false &&
+ movingResourceId === null &&
+ !ctrl.mutating
+ return (
+ <div
+ className="da-grid__row da-grid__row--clickable da-grid__row--compact"
+ key={resource.resourceId}
+ draggable={canDragResource}
+ title={
+ canDragResource
+ ? `Drag ${resource.name} into a folder to move it`
+ : undefined
+ }
+ data-dragging={isDragging ? 'true' : undefined}
+ data-drop-target={isDropTarget ? 'true' : undefined}
+ role="button"
+ tabIndex={0}
+ 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)
+ }}
+ onKeyDown={event => {
+ if (event.key !== 'Enter' && event.key !== ' ') return
+ if (isEventFromNestedInteractive(event)) return
+ event.preventDefault()
+ openResource(resource)
+ }}
+ onDragStart={
+ canDragResource
+ ? event => handleResourceDragStart(event, resource)
+ : undefined
+ }
+ onDragEnd={canDragResource ? handleResourceDragEnd : undefined}
+ onDragEnter={
+ resource.kind === 'directory'
+ ? event => handleFolderDragOver(event, resource)
+ : undefined
+ }
+ onDragOver={
+ resource.kind === 'directory'
+ ? event => handleFolderDragOver(event, resource)
+ : undefined
+ }
+ onDragLeave={
+ resource.kind === 'directory' ? handleFolderDragLeave : undefined
+ }
+ onDrop={
+ resource.kind === 'directory'
+ ? event => void handleFolderDrop(event, resource)
+ : undefined
+ }
+ >
+ <span className="da-gfs-list__icon da-grid__cell" aria-hidden="true">
+ {resource.kind === 'directory' ? (
+ <IconContexts />
) : (
- <Button
- align="start"
- block
- onClick={() => openResource(resource)}
- variant="text"
- >
- {resource.name || resource.drive}
- </Button>
+ <GfsFileIcon name={resource.name} />
)}
- {resource.readable === false ? (
- <Badge tone="neutral">No access</Badge>
+ </span>
+ <span className="da-gfs-list__identity da-grid__cell">
+ <span className="da-gfs-list__name">
+ {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">
+ {formatSharedFileSize(resource.bytes)}
+ </span>
+ <span className="da-gfs-list__actions da-grid__cell da-grid__cell--right">
+ {resource.kind === 'file' ? (
+ <IconButton
+ label={`Download ${resource.name}`}
+ onClick={() => void handleDownload(resource.gfsUri, resource.name)}
+ size="sm"
+ variant="ghost"
+ disabled={resource.readable === false}
+ >
+ <IconDownload width={16} height={16} />
+ </IconButton>
) : null}
+ <GfsResourceMenu
+ resourceName={resource.name}
+ onManage={rowCanManage(resource) ? () => openManage(resource) : undefined}
+ onCopyLink={() => void handleCopyLink(resource.gfsUri)}
+ onDelete={
+ rowCanDelete(resource) ? () => setDeleteTarget(resource) : undefined
+ }
+ onOpen={
+ resource.kind === 'directory' ? () => openResource(resource) : undefined
+ }
+ onOpenChange={open =>
+ ctrl.setRowAffordancesResourceId(open ? resource.resourceId : null)
+ }
+ onRename={
+ rowCanRename(resource) ? () => openRenameTarget(resource) : undefined
+ }
+ onMove={() => setMoveTarget(resource)}
+ onPreview={
+ isGfsPreviewFile(resource.name)
+ ? () => void openFilePreview(resource)
+ : undefined
+ }
+ onDownload={
+ resource.kind === 'file'
+ ? () => void handleDownload(resource.gfsUri, resource.name)
+ : undefined
+ }
+ />
</span>
- </span>
- <span className="da-gfs-drive__size da-grid__cell da-grid__cell--right">
- {formatSharedFileSize(resource.bytes)}
- </span>
- <span className="da-gfs-list__actions da-grid__cell da-grid__cell--right">
- {resource.kind === 'file' ? (
- <IconButton
- label={`Download ${resource.name}`}
- onClick={() => void handleDownload(resource.gfsUri, resource.name)}
- size="sm"
- variant="ghost"
- disabled={resource.readable === false}
- >
- <IconDownload width={16} height={16} />
- </IconButton>
- ) : null}
- <GfsResourceMenu
- resourceName={resource.name}
- onManage={() => openManage(resource)}
- onCopyLink={() => void handleCopyLink(resource.gfsUri)}
- onDelete={
- rowCanDelete(resource) ? () => setDeleteTarget(resource) : undefined
- }
- onOpen={
- resource.kind === 'directory' ? () => openResource(resource) : undefined
- }
- onOpenChange={open =>
- ctrl.setRowAffordancesResourceId(open ? resource.resourceId : null)
- }
- onRename={
- rowCanRename(resource) ? () => openRenameTarget(resource) : undefined
- }
- onMove={() => setMoveTarget(resource)}
- onPreview={
- isGfsPreviewFile(resource.name)
- ? () => void openFilePreview(resource)
- : undefined
- }
- onDownload={
- resource.kind === 'file'
- ? () => void handleDownload(resource.gfsUri, resource.name)
- : undefined
- }
- />
- </span>
- </div>
- ))}
+ </div>
+ )
+ })}
</div>
</div>
)}
diff --git a/desktop-app/ui/src/pages/__tests__/FilesPage.test.tsx b/desktop-app/ui/src/pages/__tests__/FilesPage.test.tsx
index c98cd2f7b..0ad758bb9 100644
--- a/desktop-app/ui/src/pages/__tests__/FilesPage.test.tsx
+++ b/desktop-app/ui/src/pages/__tests__/FilesPage.test.tsx
@@ -438,7 +438,7 @@ describe('FilesPage', () => {
version: 7,
},
affordances: {
- held: ['read', 'write', 'delete'],
+ held: ['read', 'write', 'delete', 'manage_acl'],
canDelegate: false,
grantableBits: [],
canCreateShare: false,
@@ -561,7 +561,7 @@ describe('FilesPage', () => {
version: 7,
},
affordances: {
- held: ['read', 'write'],
+ held: ['read', 'write', 'manage_acl'],
canDelegate: false,
grantableBits: [],
canCreateShare: false,
@@ -1031,7 +1031,7 @@ describe('FilesPage', () => {
version: 7,
},
affordances: {
- held: ['read', 'delete'],
+ held: ['read', 'delete', 'manage_acl'],
canDelegate: false,
grantableBits: [],
canCreateShare: false,
@@ -1072,7 +1072,7 @@ describe('FilesPage', () => {
version: 7,
},
affordances: {
- held: ['read', 'write'],
+ held: ['read', 'write', 'manage_acl'],
canDelegate: false,
grantableBits: [],
canCreateShare: false,
@@ -1108,6 +1108,79 @@ describe('FilesPage', () => {
expect(pushToast).toHaveBeenCalledWith('precondition_failed: stale resource version', 'error')
})
+ it('hides the Manage menu entry on rows the caller cannot manage (read-only access)', async () => {
+ const child = {
+ resourceId: 'child-1',
+ rid: 'child-1',
+ gfsUri: 'gfs://main/child-1',
+ drive: 'main',
+ parentResourceId: 'folder-1',
+ name: 'notes.txt',
+ kind: 'file' as const,
+ path: '/Product/notes.txt',
+ version: 3,
+ bytes: 2048,
+ }
+ const controller = {
+ ...baseController(),
+ current: {
+ resourceId: 'folder-1',
+ gfsUri: 'gfs://main/folder-1',
+ name: 'Product',
+ kind: 'directory',
+ version: 1,
+ },
+ items: [child],
+ }
+
+ // Read-only row: the ⋯ menu must not offer Manage — the ACL modal would
+ // only 403 on open (view-ACL = manage-ACL server-side).
+ hookMock.useGfsBrowserController.mockReturnValue({
+ ...controller,
+ rowAffordancesResourceId: 'child-1',
+ rowAffordances: {
+ held: ['read'],
+ canDelegate: false,
+ grantableBits: [],
+ canCreateShare: false,
+ },
+ })
+ const view = renderFilesPage()
+
+ await act(async () => {
+ fireEvent.click(screen.getByRole('button', { name: 'Options for notes.txt' }))
+ })
+ expect(screen.queryByRole('menuitem', { name: 'Share' })).toBeNull()
+
+ // Same row with manage_acl held: the entry appears and opens the modal.
+ hookMock.useGfsBrowserController.mockReturnValue({
+ ...controller,
+ rowAffordancesResourceId: 'child-1',
+ rowAffordances: {
+ held: ['read', 'manage_acl'],
+ canDelegate: false,
+ grantableBits: [],
+ canCreateShare: false,
+ },
+ })
+ await act(async () => {
+ view.rerender(
+ <QueryClientProvider
+ client={new QueryClient({ defaultOptions: { queries: { retry: false } } })}
+ >
+ <FilesPage />
+ </QueryClientProvider>
+ )
+ })
+ await act(async () => {
+ fireEvent.click(screen.getByRole('menuitem', { name: 'Share' }))
+ })
+ // The manage modal opens (titled for the current selection — the mocked
+ // controller does not navigate, so it stays on the parent folder).
+ expect(screen.getByRole('dialog')).toBeTruthy()
+ expect(screen.getByRole('heading', { name: 'Who has access' })).toBeTruthy()
+ })
+
it('returns to Shared with me after closing Manage for a file row', async () => {
const managedFile = {
resourceId: 'file-1',
@@ -1121,7 +1194,7 @@ describe('FilesPage', () => {
version: 7,
bytes: 128,
sources: ['grant'],
- permissions: ['read', 'write'],
+ permissions: ['read', 'write', 'manage_acl'],
coversDescendants: false,
}
const restoreCrumbs = vi.fn()
@@ -1136,7 +1209,7 @@ describe('FilesPage', () => {
accessibleResources: current ? [] : [managedFile],
affordances: current
? {
- held: ['read', 'write'],
+ held: ['read', 'write', 'manage_acl'],
canDelegate: false,
grantableBits: [],
canCreateShare: false,
@@ -1832,7 +1905,7 @@ describe('FilesPage', () => {
kind: 'directory',
},
affordances: {
- held: ['read'],
+ held: ['read', 'manage_acl'],
canDelegate: false,
grantableBits: [],
canCreateShare: false,
@@ -1856,7 +1929,7 @@ describe('FilesPage', () => {
kind: 'directory',
},
affordances: {
- held: ['read'],
+ held: ['read', 'manage_acl'],
canDelegate: false,
grantableBits: [],
canCreateShare: false,
@@ -2151,6 +2224,165 @@ describe('FilesPage', () => {
expect(pushToast).toHaveBeenCalledWith('Moved notes.txt to Product', 'success')
})
+ it('moves a dragged file onto a folder only after confirming destination write access', async () => {
+ const pushToast = vi.fn()
+ const moveResource = vi.fn(async () => ({}))
+ const affordances = vi.fn(async () => ({
+ held: ['read', 'write'],
+ canDelegate: false,
+ grantableBits: [],
+ canCreateShare: false,
+ }))
+ Object.defineProperty(window, 'clerum', {
+ configurable: true,
+ value: { gfs: { affordances } },
+ })
+ hookMock.useGfsBrowserController.mockReturnValue({
+ ...baseController(),
+ current: {
+ resourceId: 'folder-1',
+ gfsUri: 'gfs://main/folder-1',
+ name: 'Product',
+ kind: 'directory',
+ version: 1,
+ },
+ items: [
+ {
+ resourceId: 'file-1',
+ rid: 'file-1',
+ gfsUri: 'gfs://main/file-1',
+ drive: 'main',
+ parentResourceId: 'folder-1',
+ name: 'notes.txt',
+ kind: 'file',
+ path: '/Product/notes.txt',
+ version: 3,
+ bytes: 12,
+ },
+ {
+ resourceId: 'archive-1',
+ rid: 'archive-1',
+ gfsUri: 'gfs://main/archive-1',
+ drive: 'main',
+ parentResourceId: 'folder-1',
+ name: 'Archive',
+ kind: 'directory',
+ path: '/Product/Archive',
+ version: 2,
+ bytes: 0,
+ },
+ ],
+ moveResource,
+ })
+ renderFilesPage(pushToast)
+
+ const sourceRow = screen.getByRole('button', { name: 'Open notes.txt' })
+ const destinationRow = screen.getByRole('button', { name: 'Open Archive' })
+ const dataTransfer = {
+ types: ['application/x-evenfire-gfs-resource'],
+ files: [],
+ effectAllowed: 'none',
+ dropEffect: 'none',
+ setData: vi.fn(),
+ }
+
+ fireEvent.dragStart(sourceRow, { dataTransfer })
+ fireEvent.dragEnter(destinationRow, { dataTransfer })
+
+ await waitFor(() => {
+ expect(affordances).toHaveBeenCalledWith('archive-1', 'main')
+ expect(destinationRow.getAttribute('data-drop-target')).toBe('true')
+ })
+ fireEvent.dragOver(destinationRow, { dataTransfer })
+ expect(dataTransfer.dropEffect).toBe('move')
+
+ fireEvent.drop(destinationRow, { dataTransfer })
+
+ await waitFor(() => {
+ expect(moveResource).toHaveBeenCalledWith('file-1', 'archive-1', 3)
+ expect(pushToast).toHaveBeenCalledWith('Moved notes.txt to Archive', 'success')
+ })
+ })
+
+ it('rejects a file drop when the destination folder lacks write access', async () => {
+ const pushToast = vi.fn()
+ const moveResource = vi.fn(async () => ({}))
+ const affordances = vi.fn(async () => ({
+ held: ['read'],
+ canDelegate: false,
+ grantableBits: [],
+ canCreateShare: false,
+ }))
+ Object.defineProperty(window, 'clerum', {
+ configurable: true,
+ value: { gfs: { affordances } },
+ })
+ hookMock.useGfsBrowserController.mockReturnValue({
+ ...baseController(),
+ current: {
+ resourceId: 'folder-1',
+ gfsUri: 'gfs://main/folder-1',
+ name: 'Product',
+ kind: 'directory',
+ version: 1,
+ },
+ items: [
+ {
+ resourceId: 'file-1',
+ rid: 'file-1',
+ gfsUri: 'gfs://main/file-1',
+ drive: 'main',
+ parentResourceId: 'folder-1',
+ name: 'notes.txt',
+ kind: 'file',
+ path: '/Product/notes.txt',
+ version: 3,
+ bytes: 12,
+ },
+ {
+ resourceId: 'private-1',
+ rid: 'private-1',
+ gfsUri: 'gfs://main/private-1',
+ drive: 'main',
+ parentResourceId: 'folder-1',
+ name: 'Private',
+ kind: 'directory',
+ path: '/Product/Private',
+ version: 2,
+ bytes: 0,
+ },
+ ],
+ moveResource,
+ })
+ renderFilesPage(pushToast)
+
+ const sourceRow = screen.getByRole('button', { name: 'Open notes.txt' })
+ const destinationRow = screen.getByRole('button', { name: 'Open Private' })
+ const dataTransfer = {
+ types: ['application/x-evenfire-gfs-resource'],
+ files: [],
+ effectAllowed: 'none',
+ dropEffect: 'none',
+ setData: vi.fn(),
+ }
+
+ fireEvent.dragStart(sourceRow, { dataTransfer })
+ fireEvent.dragEnter(destinationRow, { dataTransfer })
+ await waitFor(() => expect(affordances).toHaveBeenCalledWith('private-1', 'main'))
+
+ expect(destinationRow.getAttribute('data-drop-target')).toBeNull()
+ expect(dataTransfer.dropEffect).toBe('none')
+ fireEvent.drop(destinationRow, { dataTransfer })
+
+ await waitFor(() => {
+ expect(moveResource).not.toHaveBeenCalled()
+ expect(pushToast).toHaveBeenCalledWith(
+ 'You can’t move files to Private because you don’t have write permission for this folder.',
+ 'error'
+ )
+ })
+ })
+
it('renames a folder child from its row menu once write affordances resolve', async () => {
const pushToast = vi.fn()
const renameResource = vi.fn(async () => ({}))
@@ -2747,6 +2979,13 @@ describe('FilesPage', () => {
},
],
items: [nestedFolder],
+ rowAffordancesResourceId: 'nested-1',
+ rowAffordances: {
+ held: ['read', 'write', 'manage_acl'],
+ canDelegate: false,
+ grantableBits: [],
+ canCreateShare: false,
+ },
openChild,
})
renderFilesPage()
@@ -2778,7 +3017,7 @@ describe('FilesPage', () => {
version: 1,
},
affordances: {
- held: ['read', 'write'],
+ held: ['read', 'write', 'manage_acl'],
canDelegate: false,
grantableBits: [],
canCreateShare: false,
diff --git a/desktop-app/ui/src/styles.css b/desktop-app/ui/src/styles.css
index e089d19fd..be9ca76bb 100644
--- a/desktop-app/ui/src/styles.css
+++ b/desktop-app/ui/src/styles.css
@@ -14132,6 +14132,19 @@ pre {
justify-self: end;
}
+.da-gfs-drive__grid .da-gfs-list__actions > .ui-icon-button {
+ opacity: 0;
+ pointer-events: none;
+ transition: opacity var(--motion-fast);
+}
+
+.da-gfs-drive__grid .da-grid__row:hover .da-gfs-list__actions > .ui-icon-button,
+.da-gfs-drive__grid .da-grid__row:focus-within .da-gfs-list__actions > .ui-icon-button,
+.da-gfs-drive__grid .da-gfs-list__actions > .ui-icon-button:focus-visible {
+ opacity: 1;
+ pointer-events: auto;
+}
+
.da-gfs-list__rid {
max-width: 8rem;
overflow: hidden;
@@ -15421,16 +15434,80 @@ pre {
border-top: 1px solid rgba(var(--edge-rgb), 0.2);
}
-/* Move-to-folder picker: an inline tree that keeps the GFS hierarchy visible. */
+/* Compact Drive-style move picker. The hierarchy stays inline, but rows read
+ as a folder list rather than large cards. */
.da-gfs-move-dialog {
- width: min(780px, 96vw);
+ width: min(680px, 94vw);
+ max-height: min(620px, 90vh);
+ overflow: hidden;
+}
+
+.da-gfs-move-dialog .da-gfs-manage-dialog__header {
+ gap: var(--space-2);
+ padding: var(--space-4) var(--space-5) var(--space-3);
+ border-bottom: 0;
+}
+
+.da-gfs-move-dialog .da-gfs-manage-dialog__icon {
+ width: 28px;
+ height: 28px;
+}
+
+.da-gfs-move-dialog .da-gfs-manage-dialog__heading h3 {
+ font-size: var(--font-size-xl);
+}
+
+.da-gfs-move-dialog .da-gfs-manage-dialog__body {
+ grid-template-rows: auto auto minmax(180px, 1fr) auto auto;
+ gap: 0;
+ overflow: hidden;
+ padding: 0;
+}
+
+.da-gfs-move-dialog__current-location {
+ min-width: 0;
+ display: flex;
+ align-items: center;
+ gap: var(--space-2);
+ padding: 0 var(--space-5) var(--space-3);
+ color: var(--text-muted);
+ font-size: var(--font-size-sm);
+}
+
+.da-gfs-move-dialog__location-pill {
+ min-width: 0;
+ display: inline-flex;
+ align-items: center;
+ gap: var(--space-1);
+ padding: var(--space-1) var(--space-2);
+ border: 1px solid var(--control-border);
+ border-radius: var(--radius-md);
+ background: var(--control-bg-strong);
+ color: var(--text);
+}
+
+.da-gfs-move-dialog__location-pill svg {
+ width: 16px;
+ height: 16px;
+ flex: 0 0 16px;
+ color: var(--text-muted);
+}
+
+.da-gfs-move-dialog__location-pill strong {
+ min-width: 0;
+ overflow: hidden;
+ font-weight: var(--font-weight-medium);
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
.da-gfs-move-dialog__tree-heading {
display: flex;
- align-items: end;
- justify-content: space-between;
- gap: var(--space-3);
+ align-items: center;
+ min-height: 38px;
+ padding: 0 var(--space-5);
+ border-top: 1px solid rgba(var(--edge-rgb), 0.2);
+ border-bottom: 1px solid rgba(var(--edge-rgb), 0.2);
}
.da-gfs-move-dialog__tree-heading-copy {
@@ -15441,33 +15518,17 @@ pre {
.da-gfs-move-dialog__tree-heading-copy strong {
color: var(--text);
- font-size: var(--font-size-xl);
+ font-size: var(--font-size-sm);
font-weight: var(--font-weight-semibold);
line-height: var(--line-height-tight);
}
-.da-gfs-move-dialog__tree-eyebrow {
- color: var(--accent-strong);
- font-size: var(--font-size-2xs);
- font-weight: var(--font-weight-bold);
- letter-spacing: var(--letter-spacing-caps);
- text-transform: uppercase;
-}
-
-.da-gfs-move-dialog__tree-heading > .muted {
- flex: 0 1 auto;
- font-size: var(--font-size-sm);
- text-align: right;
-}
-
.da-gfs-move-dialog__tree {
- min-height: 220px;
- max-height: min(460px, 52vh);
+ min-height: 180px;
+ max-height: min(360px, 48vh);
overflow-y: auto;
- border: 1px solid var(--border-soft);
- border-radius: var(--radius-md);
- padding: var(--space-2);
- background: var(--surface-soft);
+ padding: var(--space-1) var(--space-3);
+ background: var(--bg-elev);
scrollbar-width: thin;
}
@@ -15475,12 +15536,12 @@ pre {
.da-gfs-move-dialog__tree-group {
display: grid;
align-content: start;
- gap: var(--space-1);
+ gap: 0;
}
.da-gfs-move-dialog__tree-group {
- margin-left: calc(32px + var(--space-1));
- padding: var(--space-1) 0 var(--space-1) var(--space-2);
+ margin-left: 28px;
+ padding-left: var(--space-1);
border-left: 1px solid rgba(var(--edge-rgb), 0.24);
}
@@ -15491,16 +15552,16 @@ pre {
.da-gfs-move-dialog__tree-row {
min-width: 0;
display: grid;
- grid-template-columns: 32px minmax(0, 1fr);
+ grid-template-columns: 28px minmax(0, 1fr);
align-items: center;
gap: var(--space-1);
}
.da-gfs-move-dialog__tree-toggle.ui-icon-button {
- width: 32px;
- min-width: 32px;
- height: 32px;
- min-height: 32px;
+ width: 28px;
+ min-width: 28px;
+ height: 34px;
+ min-height: 34px;
padding: 0;
border-color: transparent;
background: transparent;
@@ -15525,20 +15586,20 @@ pre {
}
.da-gfs-move-dialog__tree-toggle-placeholder {
- width: 32px;
- height: 32px;
+ width: 28px;
+ height: 34px;
}
.da-gfs-move-dialog__tree-select.ui-button {
min-width: 0;
- min-height: 46px;
+ min-height: 34px;
display: flex;
align-items: center;
gap: var(--space-2);
- padding: var(--space-1) var(--space-2);
- border: 1px solid rgba(var(--edge-rgb), 0.22);
- border-radius: var(--radius-md);
- background: rgba(var(--edge-rgb), 0.07);
+ padding: var(--space-0-5) var(--space-2);
+ border: 1px solid transparent;
+ border-radius: var(--radius-sm);
+ background: transparent;
color: var(--text);
text-align: left;
transition:
@@ -15551,38 +15612,38 @@ pre {
.da-gfs-move-dialog__tree-select.ui-button:focus-visible {
border-color: rgba(var(--accent-rgb), 0.38);
background: rgba(var(--accent-rgb), 0.1);
- box-shadow: inset 3px 0 0 rgba(var(--accent-rgb), 0.55);
+ box-shadow: none;
}
.da-gfs-move-dialog__tree-select.ui-button[aria-selected='true'] {
border-color: rgba(var(--accent-rgb), 0.52);
background: rgba(var(--accent-rgb), 0.14);
- box-shadow: inset 3px 0 0 var(--accent);
+ box-shadow: none;
}
.da-gfs-move-dialog__tree-folder-icon {
- width: 30px;
- height: 30px;
- flex: 0 0 30px;
+ width: 20px;
+ height: 20px;
+ flex: 0 0 20px;
display: grid;
place-items: center;
- border: 1px solid rgba(var(--warning-rgb), 0.28);
- border-radius: var(--radius-sm);
- background: rgba(var(--warning-rgb), 0.1);
+ border: 0;
+ border-radius: 0;
+ background: transparent;
color: var(--warning);
}
.da-gfs-move-dialog__tree-folder-icon svg {
- width: 16px;
- height: 16px;
+ width: 18px;
+ height: 18px;
}
.da-gfs-move-dialog__tree-folder-name {
min-width: 0;
flex: 1 1 auto;
overflow: hidden;
- font-size: var(--font-size-md);
- font-weight: var(--font-weight-semibold);
+ font-size: var(--font-size-sm);
+ font-weight: var(--font-weight-medium);
text-overflow: ellipsis;
white-space: nowrap;
}
@@ -15618,7 +15679,7 @@ pre {
align-items: center;
justify-content: space-between;
gap: var(--space-3);
- padding-top: var(--space-3);
+ padding: var(--space-3) var(--space-5);
border-top: 1px solid rgba(var(--edge-rgb), 0.2);
}
@@ -15644,6 +15705,10 @@ pre {
gap: var(--space-2);
}
+.da-gfs-move-dialog__action-buttons .ui-button {
+ border-radius: 999px;
+}
+
.da-gfs-manage-section--actions .da-gfs-inline-form__field {
min-width: 0;
}
diff --git a/profile-ui/package-lock.json b/profile-ui/package-lock.json
index eed5f0c95..6ae0184f5 100644
--- a/profile-ui/package-lock.json
+++ b/profile-ui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-profile-ui",
- "version": "0.1.125",
+ "version": "0.1.126",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-profile-ui",
- "version": "0.1.125",
+ "version": "0.1.126",
"dependencies": {
"@clerum/desktop-app-links": "file:../packages/desktop-app-links",
"next": "16.2.11",
@@ -99,7 +99,6 @@
"integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==",
"dev": true,
"license": "MIT",
- "peer": true,
"dependencies": {
"@babel/helper-validator-identifier": "^7.29.7",
"js-tokens": "^4.0.0",
@@ -115,7 +114,6 @@
"integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==",
"dev": true,
"license": "MIT",
- "peer": true,
"engines": {
"node": ">=6.9.0"
}
@@ -235,6 +233,7 @@
}
],
"license": "MIT",
+ "peer": true,
"engines": {
"node": ">=20.19.0"
},
@@ -283,6 +282,7 @@
}
],
"license": "MIT",
+ "peer": true,
"engines": {
"node": ">=20.19.0"
}
@@ -1309,8 +1309,7 @@
"resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
"integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
"dev": true,
- "license": "MIT",
- "peer": true
+ "license": "MIT"
},
"node_modules/@types/chai": {
"version": "5.2.3",
@@ -1343,6 +1342,7 @@
"integrity": "sha512-oH72nZRfDv9lADUBSo104Aq7gPHpQZc4BTx38r9xf9pg5LfP6EzSyH2n7qFmmxRQXh7YlUXODcYsg6PuTDSxGg==",
"dev": true,
"license": "MIT",
+ "peer": true,
"dependencies": {
"undici-types": "~7.16.0"
}
@@ -1360,6 +1360,7 @@
"integrity": "sha512-z9VXpC7MWrhfWipitjNdgCauoMLRdIILQsAEV+ZesIzBq/oUlxk0m3ApZuMFCXdnS4U7KrI+l3WRUEGQ8K1QKw==",
"dev": true,
"license": "MIT",
+ "peer": true,
"dependencies": {
"@types/prop-types": "*",
"csstype": "^3.2.2"
@@ -1371,6 +1372,7 @@
"integrity": "sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==",
"dev": true,
"license": "MIT",
+ "peer": true,
"peerDependencies": {
"@types/react": "^18.0.0"
}
@@ -1504,7 +1506,6 @@
"integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
"dev": true,
"license": "MIT",
- "peer": true,
"engines": {
"node": ">=8"
}
@@ -1515,7 +1516,6 @@
"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
"dev": true,
"license": "MIT",
- "peer": true,
"engines": {
"node": ">=10"
},
@@ -1716,8 +1716,7 @@
"resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
"integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
"dev": true,
- "license": "MIT",
- "peer": true
+ "license": "MIT"
},
"node_modules/entities": {
"version": "8.0.0",
@@ -1862,6 +1861,7 @@
"integrity": "sha512-0+MoQNYyr2rBHqO1xilltfDjV9G7ymYGlAUazgcDLQaUf8JDHbuGwsxN6U9qWaElZ4w1B2r7yEGIL3GdeW3Rug==",
"dev": true,
"license": "MIT",
+ "peer": true,
"dependencies": {
"@acemir/cssom": "^0.9.31",
"@asamuzakjp/dom-selector": "^6.8.1",
@@ -2186,7 +2186,6 @@
"integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
"dev": true,
"license": "MIT",
- "peer": true,
"bin": {
"lz-string": "bin/bin.js"
}
@@ -2342,6 +2341,7 @@
"integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==",
"dev": true,
"license": "MIT",
+ "peer": true,
"engines": {
"node": ">=12"
},
@@ -2383,7 +2383,6 @@
"integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
"dev": true,
"license": "MIT",
- "peer": true,
"dependencies": {
"ansi-regex": "^5.0.1",
"ansi-styles": "^5.0.0",
@@ -2408,6 +2407,7 @@
"resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
"integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"loose-envify": "^1.1.0"
},
@@ -2420,6 +2420,7 @@
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
"integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"loose-envify": "^1.1.0",
"scheduler": "^0.23.2"
@@ -2433,8 +2434,7 @@
"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
"dev": true,
- "license": "MIT",
- "peer": true
+ "license": "MIT"
},
"node_modules/redent": {
"version": "3.0.0",
@@ -2784,6 +2784,7 @@
"integrity": "sha512-pn+CFpM0lwDeKwmOq1ZaBK/9sjorZcgqxki6MbY/jPEVd9vichIlmlD4HmQ5wdP5EgqQCFRaACBxMC7uEGc6lQ==",
"dev": true,
"license": "MIT",
+ "peer": true,
"dependencies": {
"lightningcss": "^1.33.0",
"picomatch": "^4.0.5",
diff --git a/profile-ui/package.json b/profile-ui/package.json
index 71718b5c3..325ffaece 100644
--- a/profile-ui/package.json
+++ b/profile-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-profile-ui",
- "version": "0.1.125",
+ "version": "0.1.126",
"private": true,
"scripts": {
"dev": "next dev",