Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
feat(drive): rank open folders in Move to folder and drop rows into them (#9204)
gbirman0ff09a887513
diff --git a/apps/web/AGENTS.md b/apps/web/AGENTS.mdindex 9e4cdd4299..fdabc18f72 100644--- a/apps/web/AGENTS.md+++ b/apps/web/AGENTS.md@@ -482,6 +482,15 @@ resolved session ID; keep the existing `AgentSessionProvider` subscription tofeature-specific query orchestration with its owning feature.- Refresh the channel list's bounded unread edge when opening a conversation,including an empty unread result after a read on another device.+- Read folders for picking or moving through `createFolderList`+ (`queries/storage/folder-list`): it matches the Drive sidebar's source, so a+ folder open in Drive, including a team folder, is always in the list. Keep+ move rules in `folder-destinations.ts` so the picker and drop targets agree.+ Create one `createFolderDropTargets` per surface, not per row, so a long+ folder tree shares its folder list and mutation. Rows learn what a drag+ carries from `EntityDragSelectionContext`,+ which `SoupEntityContextMenu` provides; see+ [dragging rows into a folder](../../docs/agent-guide/navigation.md#dragging-rows-into-a-folder).- Keep channel rail and title menus on `CHANNEL_ACTION_VIEW_CONTEXT`, includingthe shared desktop `Open in new split` action and its mobile/capacity guards.- Route supported move, trash, restore, permanent-delete, duplicate, and share-policydiff --git a/apps/web/src/components/app/ItemDragAndDrop.tsx b/apps/web/src/components/app/ItemDragAndDrop.tsxindex 9e37035d57..e4fa456136 100644--- a/apps/web/src/components/app/ItemDragAndDrop.tsx+++ b/apps/web/src/components/app/ItemDragAndDrop.tsx@@ -1,3 +1,4 @@+import { t } from '@app/lib/i18n';import {EntityIcon,type EntityIconSelector,@@ -67,13 +68,20 @@ function ItemDragOverlay() {return getEntityIconType(data as EntityDragData);});- const centeredOnPointerStyle = createMemo(() => {+ const additionalCount = () => {+ const data = activeDraggable()?.data as EntityDragData | undefined;+ return (data?.selection?.entities().length ?? 1) - 1;+ };++ // Beside the pointer, not under it: a narrow target like a sidebar folder+ // has to stay visible while it is being aimed at.+ const besidePointerStyle = createMemo(() => {const overlay = state?.active.overlay;const sensor = state?.active.sensor;if (!overlay || !sensor) return;return {- transform: `translate(${sensor.coordinates.origin.x - overlay.layout.left}px, ${sensor.coordinates.origin.y - overlay.layout.top}px) translate(-50%, -50%)`,+ transform: `translate(${sensor.coordinates.origin.x - overlay.layout.left + 12}px, ${sensor.coordinates.origin.y - overlay.layout.top + 12}px)`,};});@@ -81,7 +89,7 @@ function ItemDragOverlay() {<Layer depth={2}><divclass="w-auto max-w-75 flex flex-col gap-2 bg-surface p-2 rounded-lg z-drag shadow-md shadow-drop-shadow pointer-events-none"- style={centeredOnPointerStyle()}+ style={besidePointerStyle()}><div class="flex flex-row items-center gap-2"><Show@@ -94,12 +102,11 @@ function ItemDragOverlay() {{activeDraggable()?.data.name}</TruncatedText></div>- {/* TODO: when multiselect exists */}- {/* <Show when={activeDraggable()?.data.selectedItems.length > 1}>- <div class={`${TEXT_SIZE_CLASSES[size ?? 'sm']} text-ink-muted pl-2`}>- + {activeDraggable()?.data.selectedItems.length - 1} items- </div>- </Show> */}+ <Show when={additionalCount() > 0}>+ <div class="pl-6 text-xs text-ink-muted">+ {t('entityActions.dragMoreItems', { count: additionalCount() })}+ </div>+ </Show></div></Layer>);diff --git a/apps/web/src/components/app/split-layout/components/SplitFileMenu.tsx b/apps/web/src/components/app/split-layout/components/SplitFileMenu.tsxindex 7470a0d6e5..3c75cd09de 100644--- a/apps/web/src/components/app/split-layout/components/SplitFileMenu.tsx+++ b/apps/web/src/components/app/split-layout/components/SplitFileMenu.tsx@@ -1,4 +1,5 @@import { openBulkEditModal } from '@app/features/entity/bulk-edit/BulkEditEntityModal';+import { toastMovedToFolder } from '@app/features/entity/bulk-edit/moved-to-folder-toast';import {makeAddTagAction,makeCopyEntityIdAction,@@ -632,8 +633,7 @@ export function SplitFileMenu(props: SplitFileMenuProps) {openBulkEditModal({view: 'moveToProject',entities: [entity],- onFinish: () =>- toast.success(t('entityActions.toastMovedToFolder')),+ onMoved: (folder) => toastMovedToFolder(1, folder.id),onError: () =>toast.failure(t('entityActions.toastMoveToFolderFailed')),});diff --git a/apps/web/src/components/app/split-layout/open-folders.test.ts b/apps/web/src/components/app/split-layout/open-folders.test.tsnew file mode 100644index 0000000000..0cb77b268a--- /dev/null+++ b/apps/web/src/components/app/split-layout/open-folders.test.ts@@ -0,0 +1,73 @@+import { driveFolderContent } from '@app/features/drive-view/drive-hosted-content';+import { paneRoute } from '@app/routes/app-route';+import { describe, expect, it, vi } from 'vitest';+import type { SplitContent, SplitManager } from './layoutManager';+import { openFolder, openFolderIds } from './open-folders';++const folderBlock = (id: string): SplitContent => ({ type: 'project', id });+const documentInFolder = (folderId: string): SplitContent => ({+ type: 'component',+ id: 'documents',+ entryMetadata: {+ route: paneRoute(+ { id: 'drive', params: {} },+ { id: 'drive-folder', params: { view: 'folder', folderId } },+ {+ id: 'drive-folder-document',+ params: { documentId: 'doc', documentType: 'md' },+ }+ ),+ },+});++const managerWith = (...contents: SplitContent[]) =>+ ({+ splits: () =>+ contents.map((content, index) => ({ id: `split-${index}`, content })),+ activateSplit: vi.fn(),+ openWithSplit: vi.fn(),+ }) as unknown as SplitManager;++describe('openFolder', () => {+ it.each([true, false])(+ 'opens the folder in Drive (new split: %s)',+ (newSplit) => {+ const manager = managerWith(driveFolderContent('other'));+ openFolder(manager, 'folder', { newSplit });+ expect(manager.openWithSplit).toHaveBeenCalledWith(+ driveFolderContent('folder'),+ { preferNewSplit: newSplit, allowDuplicate: true }+ );+ expect(manager.activateSplit).not.toHaveBeenCalled();+ }+ );++ it('lists the folder rather than focusing an item open inside it', () => {+ const manager = managerWith(documentInFolder('folder'));+ expect(openFolderIds(manager)).toEqual(['folder']);++ openFolder(manager, 'folder', { newSplit: false });++ expect(manager.activateSplit).not.toHaveBeenCalled();+ expect(manager.openWithSplit).toHaveBeenCalledWith(+ driveFolderContent('folder'),+ { preferNewSplit: false, allowDuplicate: true }+ );+ });++ it.each([+ ['its own block', folderBlock('folder')],+ ['Drive', driveFolderContent('folder')],+ ])('focuses a split showing the folder in %s', (_, content) => {+ const manager = managerWith({ type: 'md', id: 'doc' }, content);+ expect(openFolderIds(manager)).toEqual(['folder']);++ for (const newSplit of [false, true]) {+ openFolder(manager, 'folder', { newSplit });+ }++ expect(manager.activateSplit).toHaveBeenCalledTimes(2);+ expect(manager.activateSplit).toHaveBeenCalledWith('split-1');+ expect(manager.openWithSplit).not.toHaveBeenCalled();+ });+});diff --git a/apps/web/src/components/app/split-layout/open-folders.ts b/apps/web/src/components/app/split-layout/open-folders.tsnew file mode 100644index 0000000000..a78fa690cf--- /dev/null+++ b/apps/web/src/components/app/split-layout/open-folders.ts@@ -0,0 +1,57 @@+import { LIST_VIEW_ID } from '@app/constants/list-views';+import { driveFolderContent } from '@app/features/drive-view/drive-hosted-content';+import { routeParams, type SplitLocation } from '@app/lib/split-router';+import { getIsSpecialProject } from '@block-project/isSpecial';+import type { SplitContent, SplitManager } from './layoutManager';++/**+ * The folder a split shows. A folder's own block names it as content; Drive+ * hosts folders on its route, so its content only names the view.+ */+function splitFolderId(content: SplitContent): string | undefined {+ if (content.type === 'project') {+ return getIsSpecialProject(content.id) ? undefined : content.id;+ }+ if (content.type !== 'component' || content.id !== LIST_VIEW_ID.documents) {+ return undefined;+ }+ const location = content.entryMetadata as SplitLocation | undefined;+ return routeParams<{ folderId?: string }>(location?.route).folderId;+}++/** Folders open in the layout's splits, in split order. */+export function openFolderIds(manager: SplitManager | undefined): string[] {+ return (+ manager?.splits().flatMap(({ content }) => splitFolderId(content) ?? []) ??+ []+ );+}++/** Whether a split lists the folder, rather than an item opened inside it. */+function listsFolder(content: SplitContent, folderId: string): boolean {+ if (splitFolderId(content) !== folderId) return false;+ const location = content.entryMetadata as SplitLocation | undefined;+ return !routeParams<{ documentId?: string }>(location?.route).documentId;+}++/**+ * Opens a folder in Drive, focusing a split already listing it. The layout+ * reuses any Drive split as the same shell, so finding the folder falls here.+ */+export function openFolder(+ manager: SplitManager | undefined,+ folderId: string,+ options: { newSplit: boolean }+) {+ const showing = manager+ ?.splits()+ .find(({ content }) => listsFolder(content, folderId));+ if (showing) {+ manager?.activateSplit(showing.id);+ return;+ }+ manager?.openWithSplit(driveFolderContent(folderId), {+ preferNewSplit: options.newSplit,+ allowDuplicate: true,+ });+}diff --git a/apps/web/src/features/block-project/component/Block.test.tsx b/apps/web/src/features/block-project/component/Block.test.tsxindex 6266d7ba15..7eebbfc9d6 100644--- a/apps/web/src/features/block-project/component/Block.test.tsx+++ b/apps/web/src/features/block-project/component/Block.test.tsx@@ -14,6 +14,7 @@ const upload = vi.hoisted(() => ({}));vi.mock('@app/features/next-soup/actions', () => ({+ FolderDropZone: (props: ParentProps) => props.children,useBlockEntityCommands: () => {},}));vi.mock('@app/features/next-soup/create-soup-state', () => ({diff --git a/apps/web/src/features/block-project/component/Block.tsx b/apps/web/src/features/block-project/component/Block.tsxindex 6c67256518..5c5b581e25 100644--- a/apps/web/src/features/block-project/component/Block.tsx+++ b/apps/web/src/features/block-project/component/Block.tsx@@ -1,4 +1,7 @@-import { useBlockEntityCommands } from '@app/features/next-soup/actions';+import {+ FolderDropZone,+ useBlockEntityCommands,+} from '@app/features/next-soup/actions';import {createSoupState,type SoupState,@@ -130,21 +133,23 @@ const Block: Component = () => {<Show when={isDragging() && !isSpecialProject}><FileDropOverlay>Upload to this folder</FileDropOverlay></Show>- <SidePanel.Layout defaultOpen={false} floating>- <Show when={!isSpecialProject}>- <ProjectSidePanelSections />- </Show>- <div class="flex size-full min-w-0 flex-col overflow-hidden">- <TopBar />- <ProjectEntityList- projectId={projectId}- soup={projectSoup}- // Scope is already attached by the block container so we can use that- // Change this when we remove blocks- scopeId={blockHotkeyScopeSignal.get()}- />- </div>- </SidePanel.Layout>+ <FolderDropZone folderId={isSpecialProject ? undefined : projectId}>+ <SidePanel.Layout defaultOpen={false} floating>+ <Show when={!isSpecialProject}>+ <ProjectSidePanelSections />+ </Show>+ <div class="flex size-full min-w-0 flex-col overflow-hidden">+ <TopBar />+ <ProjectEntityList+ projectId={projectId}+ soup={projectSoup}+ // Scope is already attached by the block container so we can use that+ // Change this when we remove blocks+ scopeId={blockHotkeyScopeSignal.get()}+ />+ </div>+ </SidePanel.Layout>+ </FolderDropZone></div></DocumentBlockContainer>);diff --git a/apps/web/src/features/drive-view/components/folder-tree.tsx b/apps/web/src/features/drive-view/components/folder-tree.tsxindex 0c86b5ede6..6df529e0d6 100644--- a/apps/web/src/features/drive-view/components/folder-tree.tsx+++ b/apps/web/src/features/drive-view/components/folder-tree.tsx@@ -1,5 +1,7 @@import { ViewSidebar } from '@app/components/view-shell';+import type { CreateFolderDropTarget } from '@app/features/next-soup/actions';import FolderIcon from '@icon/system/regular/folder.svg';+import { cn } from '@ui';import { For } from 'solid-js';import type { DriveFolderNode } from '../core/types';import type { DriveLocationMenu } from './drive-navigation';@@ -12,6 +14,7 @@ export function FolderTree(props: {onToggle: (id: string) => void;onSelect: (id: string) => void;locationMenu: DriveLocationMenu;+ createDropTarget?: CreateFolderDropTarget;}) {return (<ul class="flex min-w-0 flex-col gap-(--sidebar-row-gap)">@@ -19,21 +22,31 @@ export function FolderTree(props: {{(node) => {const open = () =>props.searching || props.expandedIds.includes(node.id);+ const dropTarget = props.createDropTarget?.(() => node.id);return (<li class="min-w-0"><props.locationMenu location={{ kind: 'folder', id: node.id }}>- <ViewSidebar.TreeItem- active={props.selectedId === node.id}- expanded={node.children.length > 0 ? open() : undefined}- label={node.name}- onToggle={() => props.onToggle(node.id)}- onClick={() => props.onSelect(node.id)}+ <div+ ref={(element) => dropTarget?.ref(element)}+ class={cn(+ 'rounded-lg',+ dropTarget?.isOver() &&+ 'outline-2 -outline-offset-2 outline-accent'+ )}>- <ViewSidebar.Icon>- <FolderIcon class="size-4" />- </ViewSidebar.Icon>- <span class="truncate">{node.name}</span>- </ViewSidebar.TreeItem>+ <ViewSidebar.TreeItem+ active={props.selectedId === node.id}+ expanded={node.children.length > 0 ? open() : undefined}+ label={node.name}+ onToggle={() => props.onToggle(node.id)}+ onClick={() => props.onSelect(node.id)}+ >+ <ViewSidebar.Icon>+ <FolderIcon class="size-4" />+ </ViewSidebar.Icon>+ <span class="truncate">{node.name}</span>+ </ViewSidebar.TreeItem>+ </div></props.locationMenu><ViewSidebar.Branch open={open() && node.children.length > 0}><FolderTree {...props} nodes={node.children} />diff --git a/apps/web/src/features/drive-view/drive-folder-actions.tsx b/apps/web/src/features/drive-view/drive-folder-actions.tsxindex d21a33405b..a34a5d016b 100644--- a/apps/web/src/features/drive-view/drive-folder-actions.tsx+++ b/apps/web/src/features/drive-view/drive-folder-actions.tsx@@ -1,4 +1,5 @@import { openBulkEditModal } from '@app/features/entity/bulk-edit/BulkEditEntityModal';+import { toastMovedToFolder } from '@app/features/entity/bulk-edit/moved-to-folder-toast';import {makeCopyAction,makeCopyEntityIdAction,@@ -55,13 +56,11 @@ export function DriveFolderActions(props: { folder: DriveFolderMetadata }) {onFinish: () => {fireAndForget(invalidateProjects(), 'drive-view');- toast.success(- view === 'rename'- ? t('entityActions.toastRenamed')- : t('entityActions.toastMovedToFolder')- );+ if (view === 'rename') toast.success(t('entityActions.toastRenamed'));},+ onMoved: (folder) => toastMovedToFolder(1, folder.id),+onError: () => toast.failure(t('entityActions.toastFolderUpdateFailed')),});};diff --git a/apps/web/src/features/drive-view/drive-hosted-content.ts b/apps/web/src/features/drive-view/drive-hosted-content.tsindex 3531bf113d..967a8ad8f1 100644--- a/apps/web/src/features/drive-view/drive-hosted-content.ts+++ b/apps/web/src/features/drive-view/drive-hosted-content.ts@@ -38,6 +38,20 @@ function driveDocumentContent(};}+/** A split showing a folder on Drive's own route. */+export function driveFolderContent(folderId: string): SplitContent {+ return {+ type: 'component',+ id: 'documents',+ entryMetadata: {+ route: paneRoute(+ { id: 'drive', params: {} },+ { id: 'drive-folder', params: { view: 'folder', folderId } }+ ),+ },+ };+}+/** Construct Drive-owned split content before the layout mounts a block. */export function driveHostedContent(content: { type: string; id: string },diff --git a/apps/web/src/features/drive-view/views/drive-sidebar.tsx b/apps/web/src/features/drive-view/views/drive-sidebar.tsxindex 452a6dd2a7..a4c00e34cf 100644--- a/apps/web/src/features/drive-view/views/drive-sidebar.tsx+++ b/apps/web/src/features/drive-view/views/drive-sidebar.tsx@@ -1,3 +1,4 @@+import { createDragAutoScroll } from '@app/components/drag-drop/create-drag-auto-scroll';import {CollapsibleSection,SearchBar,@@ -6,6 +7,7 @@ import {import { ConnectorImportSidebar } from '@app/features/connector-import/connector-import';import { FavoriteContextMenu } from '@app/features/favorites/FavoriteContextMenu';import { FavoriteIcon } from '@app/features/favorites/FavoriteIcon';+import { createFolderDropTargets } from '@app/features/next-soup/actions';import { useFavoriteDisplayName } from '@app/util/favorites';import { createScrollTopFade } from '@core/util/createScrollTopFade';import { fireAndForget } from '@core/util/fireAndForget';@@ -14,6 +16,7 @@ import FolderIcon from '@icon/system/regular/folder.svg';import SearchIcon from '@icon/system/regular/magnifying-glass.svg';import UploadIcon from '@icon/system/regular/upload-simple.svg';import type { Favorite } from '@service-storage/generated/schemas/favorite';+import { useDragDropContext } from '@thisbeyond/solid-dnd';import { Button, cn, Scroll } from '@ui';import { createMemo, createSignal, For, Show } from 'solid-js';import { DriveNavigation } from '../components/drive-navigation';@@ -89,6 +92,9 @@ function DriveFavorite(props: { favorite: Favorite; onNavigate?: () => void }) {export function DriveSidebarContent(props: { onNavigate?: () => void }) {const { state, sidebar } = useDriveView();+ // Rows here live in the same split as the list, so its rows can drop on them.+ const createDropTarget = createFolderDropTargets();+const [folderSearch, setFolderSearch] = createSignal('');const [searchingFolders, setSearchingFolders] = createSignal(false);@@ -238,6 +244,7 @@ export function DriveSidebarContent(props: { onNavigate?: () => void }) {searching={!!folderSearch().trim()}onToggle={state.toggleFolder}onSelect={selectFolder}+ createDropTarget={createDropTarget}/><Show when={filteredTree().length === 0}><p class="px-3 py-2 text-sm text-ink-extra-muted">@@ -283,6 +290,11 @@ function DriveImportPromotion() {export function DriveSidebar() {const { state } = useDriveView();+ const [content, setContent] = createSignal<HTMLDivElement>();+ // A long folder tree scrolls under a drag held at its edge.+ if (useDragDropContext()) {+ createDragAutoScroll({ getViewport: content, axis: 'both' });+ }return (<ViewSidebar.Root aria-label="Drive navigation"><ViewSidebar.Header@@ -304,7 +316,7 @@ export function DriveSidebar() {<ViewSidebar.Primary><DriveCreateMenu /></ViewSidebar.Primary>- <ViewSidebar.Content>+ <ViewSidebar.Content ref={setContent}><DriveSidebarContent /><DriveImportPromotion /></ViewSidebar.Content>diff --git a/apps/web/src/features/drive-view/views/drive-workspace.tsx b/apps/web/src/features/drive-view/views/drive-workspace.tsxindex 4d69e13f32..0eeca15189 100644--- a/apps/web/src/features/drive-view/views/drive-workspace.tsx+++ b/apps/web/src/features/drive-view/views/drive-workspace.tsx@@ -1,4 +1,5 @@import { useViewTabHotkeys, ViewShell } from '@app/components/view-shell';+import { FolderDropZone } from '@app/features/next-soup/actions';import { SplitRouter } from '@app/lib/split-router';import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';import { SplitPanel } from '@components/app/split-panel';@@ -74,9 +75,11 @@ export function DriveWorkspace(props: { tour?: JSX.Element }) {{props.tour}<ViewShell.Content><Suspense fallback={<DriveLoading />}>- <DriveFileDropzone onDrop={actions.dropFiles}>- <DriveList />- </DriveFileDropzone>+ <FolderDropZone folderId={state.projectId()}>+ <DriveFileDropzone onDrop={actions.dropFiles}>+ <DriveList />+ </DriveFileDropzone>+ </FolderDropZone></Suspense></ViewShell.Content></>diff --git a/apps/web/src/features/entity/bulk-edit/BulkEditEntityModal.test.tsx b/apps/web/src/features/entity/bulk-edit/BulkEditEntityModal.test.tsxindex 07c5f27d7a..5cd0f99ede 100644--- a/apps/web/src/features/entity/bulk-edit/BulkEditEntityModal.test.tsx+++ b/apps/web/src/features/entity/bulk-edit/BulkEditEntityModal.test.tsx@@ -28,7 +28,16 @@ vi.mock('@ui', () => ({ActionDialogShell: (props: ParentProps) => <div>{props.children}</div>,}));vi.mock('./BulkMoveToProjectView', () => ({- BulkMoveToProjectView: () => null,+ BulkMoveToProjectView: (props: {+ onMoved: (folder: { id: string; name: string }) => void;+ }) => (+ <button+ type="button"+ onClick={() => props.onMoved({ id: 'folder', name: 'Folder' })}+ >+ Move+ </button>+ ),}));vi.mock('./BulkRenameEntitiesView', () => ({BulkRenameEntitiesView: () => null,@@ -64,6 +73,26 @@ vi.mock('./BulkDeleteView', () => ({afterEach(cleanup);+describe('move-to-folder modal wiring', () => {+ it('reports the destination once the dialog has closed', () => {+ const entity = { id: 'moved', type: 'document' } as EntityData;+ const onMoved = vi.fn(() => {+ expect(screen.queryByRole('dialog')).toBeNull();+ });+ const onFinish = vi.fn();+ openBulkEditModal({+ view: 'moveToProject',+ entities: [entity],+ onMoved,+ onFinish,+ });+ render(() => <GlobalBulkEditEntityModal />);+ fireEvent.click(screen.getByRole('button', { name: 'Move' }));+ expect(onMoved).toHaveBeenCalledWith({ id: 'folder', name: 'Folder' });+ expect(onFinish).toHaveBeenCalledOnce();+ });+});+describe('bulk-delete modal progress wiring', () => {it.each(['Cancel', 'Dismiss'])('forwards progress without completing the batch before %s',diff --git a/apps/web/src/features/entity/bulk-edit/BulkEditEntityModal.tsx b/apps/web/src/features/entity/bulk-edit/BulkEditEntityModal.tsxindex 5bedc6e1b6..b8efdbbb6f 100644--- a/apps/web/src/features/entity/bulk-edit/BulkEditEntityModal.tsx+++ b/apps/web/src/features/entity/bulk-edit/BulkEditEntityModal.tsx@@ -9,7 +9,10 @@ import {Show,} from 'solid-js';import { BulkDeleteView, type PartialDeleteHandler } from './BulkDeleteView';-import { BulkMoveToProjectView } from './BulkMoveToProjectView';+import {+ BulkMoveToProjectView,+ type MovedFolder,+} from './BulkMoveToProjectView';import { BulkRenameEntitiesView } from './BulkRenameEntitiesView';const BulkEditEntityModalContent = (props: {@@ -18,6 +21,7 @@ const BulkEditEntityModalContent = (props: {view: 'rename' | 'moveToProject' | 'delete' | null;entities: EntityData[];onFinish?: () => void;+ onMoved?: (folder: MovedFolder) => void;onCancel?: () => void;onError?: (error: unknown) => void;onPartialDelete?: PartialDeleteHandler;@@ -26,6 +30,11 @@ const BulkEditEntityModalContent = (props: {props.setIsOpen(false);props.onFinish?.();};+ const handleMoved = (folder: MovedFolder) => {+ const { onMoved } = props;+ handleFinish();+ onMoved?.(folder);+ };const handleCancel = () => {props.setIsOpen(false);props.onCancel?.();@@ -37,8 +46,8 @@ const BulkEditEntityModalContent = (props: {return (<Dialogopen={props.isOpen()}- position="center"- class={props.view === 'moveToProject' ? 'w-120' : 'w-110'}+ position={props.view === 'moveToProject' ? 'top' : 'center'}+ class={props.view === 'moveToProject' ? 'w-140' : 'w-110'}onOpenChange={(open) => {if (!open) {handleCancel();@@ -46,33 +55,37 @@ const BulkEditEntityModalContent = (props: {props.setIsOpen(open);}}>- <ActionDialogShell>- <Show when={props.view === 'rename'}>- <BulkRenameEntitiesView- entities={props.entities}- onFinish={handleFinish}- onCancel={handleCancel}- onError={handleError}- />- </Show>- <Show when={props.view === 'moveToProject'}>- <BulkMoveToProjectView- entities={props.entities}- onFinish={handleFinish}- onCancel={handleCancel}- onError={handleError}- />- </Show>- <Show when={props.view === 'delete'}>- <BulkDeleteView- onPartialDelete={props.onPartialDelete}- entities={props.entities}- onFinish={handleFinish}- onCancel={handleCancel}- onError={handleError}- />- </Show>- </ActionDialogShell>+ <Show+ when={props.view === 'moveToProject'}+ fallback={+ <ActionDialogShell>+ <Show when={props.view === 'rename'}>+ <BulkRenameEntitiesView+ entities={props.entities}+ onFinish={handleFinish}+ onCancel={handleCancel}+ onError={handleError}+ />+ </Show>+ <Show when={props.view === 'delete'}>+ <BulkDeleteView+ onPartialDelete={props.onPartialDelete}+ entities={props.entities}+ onFinish={handleFinish}+ onCancel={handleCancel}+ onError={handleError}+ />+ </Show>+ </ActionDialogShell>+ }+ >+ <BulkMoveToProjectView+ entities={props.entities}+ onMoved={handleMoved}+ onCancel={handleCancel}+ onError={handleError}+ />+ </Show></Dialog>);};@@ -103,6 +116,7 @@ const [globalModalProps, setGlobalModalProps] = createSignal<{view: 'rename' | 'moveToProject' | 'delete';entities: EntityData[];onFinish?: () => void;+ onMoved?: (folder: MovedFolder) => void;onCancel?: () => void;onError?: (error: unknown) => void;onPartialDelete?: PartialDeleteHandler;@@ -115,6 +129,7 @@ export const openBulkEditModal = (props: {view: 'rename' | 'moveToProject' | 'delete';entities: EntityData[];onFinish?: () => void;+ onMoved?: (folder: MovedFolder) => void;onCancel?: () => void;onError?: (error: unknown) => void;onPartialDelete?: PartialDeleteHandler;@@ -155,6 +170,7 @@ export const GlobalBulkEditEntityModal = () => {view={props().view}entities={props().entities}onFinish={handleFinish}+ onMoved={props().onMoved}onCancel={handleCancel}onError={handleError}onPartialDelete={props().onPartialDelete}diff --git a/apps/web/src/features/entity/bulk-edit/BulkMoveToProjectView.tsx b/apps/web/src/features/entity/bulk-edit/BulkMoveToProjectView.tsxindex 7552745769..94b798db0a 100644--- a/apps/web/src/features/entity/bulk-edit/BulkMoveToProjectView.tsx+++ b/apps/web/src/features/entity/bulk-edit/BulkMoveToProjectView.tsx@@ -1,641 +1,247 @@-import { ViewSidebar } from '@app/components/view-shell';-import { analytics } from '@app/lib/analytics';+import { t } from '@app/lib/i18n';+import { globalSplitManager } from '@app/signal/splitLayout';+import { openFolderIds } from '@components/app/split-layout/open-folders';import { toast } from '@core/component/Toast/Toast';-import { registerHotkey, useHotkeyDOMScope } from '@core/hotkey/hotkeys';+import { useUserId } from '@core/context/user';+import { useHotkeyDOMScope } from '@core/hotkey/hotkeys';import { fireAndForget } from '@core/util/fireAndForget';-import { scrollToKeepGap } from '@core/util/scrollToKeepGap';-import {- createBulkMoveToProjectDssEntityMutation,- type EntityData,-} from '@entity';import FolderIcon from '@icon/system/regular/folder.svg';-import FolderPlusIcon from '@icon/system/regular/folder-plus.svg?component-solid';-import CloseIcon from '@icon/system/regular/x.svg?component-solid';-import { createProject, useProjectsQuery } from '@queries/storage/projects';-import type { Project } from '@service-storage/generated/schemas';-import { ActionDialogShell, Button, Input } from '@ui';+import FolderPlusIcon from '@icon/system/regular/folder-plus.svg';+import { createFolderList } from '@queries/storage/folder-list';+import { createProject } from '@queries/storage/projects';+import {+ Button,+ CommandMenuEmptyState,+ CommandMenuList,+ CommandMenuSearchInput,+ CommandMenuShell,+ createCommandListController,+ Dialog,+} from '@ui';import {- createEffect,createMemo,createSignal,- For,+ createUniqueId,onMount,Show,- untrack,} from 'solid-js';+import { match } from 'ts-pattern';+import type { EntityData } from '../types/entity';import { EntityActionSelection } from './components/EntityActionSelection';--type ProjectWithDepth = Project & { depth?: number; path?: string };+import {+ entitiesToMove,+ type FolderGroup,+ type FolderPickerItem,+ folderDestinations,+ folderPickerItems,+ indexFolders,+} from './folder-destinations';+import { createMoveEntitiesToFolder } from './move-entities-to-folder';++const groupLabel = (group: FolderGroup) =>+ match(group)+ .with('open', () => t('entityActions.movePickerOpenInSplit'))+ .with('created', () => t('entityActions.movePickerCreatedByYou'))+ .with('shared', () => t('entityActions.movePickerSharedWithYou'))+ .exhaustive();++export type MovedFolder = { id: string; name: string };export const BulkMoveToProjectView = (props: {entities: EntityData[];- onFinish: () => void;+ onMoved: (folder: MovedFolder) => void;onCancel: () => void;onError?: (error: unknown) => void;}) => {- let listRef!: HTMLDivElement;- let searchInputRef: HTMLInputElement | undefined;- const bulkMoveToProjectMutation = createBulkMoveToProjectDssEntityMutation();- const projectsQuery = useProjectsQuery();- const projects = () => (projectsQuery.isSuccess ? projectsQuery.data : []);- const [searchQuery, setSearchQuery] = createSignal('');- const [selectedProject, setSelectedProject] =- createSignal<ProjectWithDepth | null>(null);- const [expandedProjects, setExpandedProjects] = createSignal<{- [key: string]: boolean;- }>({});- const [focusedIndex, setFocusedIndex] = createSignal(-1);- const [isCreatingFolder, setIsCreatingFolder] = createSignal(false);- const [newFolderName, setNewFolderName] = createSignal('');- const [isSavingFolder, setIsSavingFolder] = createSignal(false);- const [attachHotkeys, moveToProjectHotkeyScopeId] = useHotkeyDOMScope(- 'bulk-move-to-project',- true+ const id = createUniqueId();+ const userId = useUserId();+ const folderList = createFolderList();+ const moveEntities = createMoveEntitiesToFolder('bulk_move');+ const [attachHotkeys] = useHotkeyDOMScope('bulk-move-to-project', true);+ let searchInput!: HTMLInputElement;+ onMount(() => attachHotkeys(searchInput));+ const [query, setQuery] = createSignal('');+ const [isPending, setIsPending] = createSignal(false);++ const destinations = createMemo(() =>+ folderDestinations({+ folders: folderList.folders(),+ openFolderIds: openFolderIds(globalSplitManager()),+ userId: userId(),+ entities: props.entities,+ }));- let rootScopeId!: HTMLDivElement;-- onMount(() => {- attachHotkeys(rootScopeId);- registerHotkey({- hotkey: ['arrowdown', 'ctrl+j'],- scopeId: moveToProjectHotkeyScopeId,- description: 'Down',- keyDownHandler: () => {- if (isCreatingFolder()) return false;- const items = flattenedProjects().items;- if (items.length === 0) return false;-- const currentIndex = focusedIndex();- const nextIndex =- currentIndex === -1- ? 0- : Math.min(currentIndex + 1, items.length - 1);- setFocusedIndex(nextIndex);-- // Update selection- const nextProject = items[nextIndex];- if (nextProject) {- setSelectedProject(nextProject);- scrollToKeepGap({- container: listRef,- target: listRef.querySelector('.focused') as HTMLElement,- align: 'bottom',- });- }- return true;- },- runWithInputFocused: true,- });- registerHotkey({- hotkey: ['arrowup', 'ctrl+k'],- scopeId: moveToProjectHotkeyScopeId,- description: 'Up',- keyDownHandler: () => {- if (isCreatingFolder()) return false;- const items = flattenedProjects().items;- if (items.length === 0) return false;-- const currentIndex = focusedIndex();- const prevIndex =- currentIndex === -1- ? items.length - 1- : Math.max(currentIndex - 1, 0);- setFocusedIndex(prevIndex);-- // Update selection- const prevProject = items[prevIndex];- if (prevProject) {- setSelectedProject(prevProject);- scrollToKeepGap({- container: listRef,- target: listRef.querySelector('.focused') as HTMLElement,- align: 'top',- });- }- return true;- },- runWithInputFocused: true,- });- registerHotkey({- hotkey: ['arrowright'],- scopeId: moveToProjectHotkeyScopeId,- description: 'Expand',- keyDownHandler: () => {- if (isCreatingFolder()) return false;- const items = flattenedProjects().items;- const currentIndex = focusedIndex();- if (currentIndex === -1) return false;- const currentProject = items[currentIndex];-- if (currentProject && !searchQuery()) {- const tree = projectTree();- const hasChildren =- tree.itemMap[currentProject.id]?.children &&- tree.itemMap[currentProject.id].children!.length > 0;- const isExpanded = expandedProjects()[currentProject.id];-- if (hasChildren && !isExpanded) {- // Expand current project- setExpandedProjects((prev) => ({- ...prev,- [currentProject.id]: true,- }));- return true;- } else if (hasChildren && isExpanded) {- // Move to first child- const children = tree.itemMap[currentProject.id].children!;- const firstChild = children[0];- const firstChildIndex = items.findIndex(- (item: Project) => item.id === firstChild.id- );- if (firstChildIndex !== -1) {- setFocusedIndex(firstChildIndex);- setSelectedProject(firstChild);- scrollToKeepGap({- container: listRef,- target: listRef.querySelector('.focused') as HTMLElement,- align: 'bottom',- });- }- return true;- }- }- return false;- },- runWithInputFocused: true,- });- registerHotkey({- hotkey: ['arrowleft'],- scopeId: moveToProjectHotkeyScopeId,- description: 'Collapse',- keyDownHandler: () => {- if (isCreatingFolder()) return false;- const items = flattenedProjects().items;- const currentIndex = focusedIndex();- if (currentIndex === -1) return false;- const currentProject = items[currentIndex];-- if (currentProject && !searchQuery()) {- const isExpanded = expandedProjects()[currentProject.id];-- if (isExpanded) {- // Collapse current project- setExpandedProjects((prev) => ({- ...prev,- [currentProject.id]: false,- }));- return true;- } else {- // Move to parent- const parentId = currentProject.parentId;- if (parentId) {- const parentIndex = items.findIndex(- (item: Project) => item.id === parentId- );- if (parentIndex !== -1) {- setFocusedIndex(parentIndex);- setSelectedProject(items[parentIndex]);- scrollToKeepGap({- container: listRef,- target: listRef.querySelector('.focused') as HTMLElement,- align: 'top',- });- }- }- return true;- }- }- return false;- },- runWithInputFocused: true,- });- });-- const projectTree = createMemo(() => {- const allProjects = projects();- const itemMap: Record<string, Project & { children?: Project[] }> = {};- const rootItems: Project[] = [];- // Build project tree structure-- // First pass: create item map- for (const project of allProjects) {- itemMap[project.id] = { ...project, children: [] };- }-- // Second pass: attach children; projects with a missing or self-referencing parent become roots- for (const project of allProjects) {- if (- project.parentId &&- project.parentId !== project.id &&- itemMap[project.parentId]- ) {- itemMap[project.parentId].children!.push(project);- } else {- rootItems.push(project);- }- }-- return { itemMap, rootItems };- });-- const getProjectPath = (projectId: string): string => {- const tree = projectTree();- const path: string[] = [];- const visited = new Set<string>();- let currentId: string | undefined = projectId;- while (currentId && !visited.has(currentId)) {- visited.add(currentId);- const project: Project & { children?: Project[] } =- tree.itemMap[currentId];- if (project) {- path.unshift(project.name);- currentId = project.parentId || undefined;- } else {- break;- }- }- return path.join(' / ');- };-- const [flattenedProjects, setFlattenedProjects] = createSignal<{- items: ProjectWithDepth[];- }>({ items: [] });-- const updateFlattenedProjects = () => {- const query = searchQuery().toLowerCase();- let newItems: ProjectWithDepth[];-- if (query) {- // Search mode: filter projects that match the query- const searchResults = projects()- .filter((project: Project) =>- project.name.toLowerCase().includes(query)- )- .map(- (item: Project): ProjectWithDepth => ({- ...item,- depth: 0,- path: getProjectPath(item.id),- })- );- setFlattenedProjects({ items: searchResults });- newItems = searchResults;- } else {- // Tree mode: flatten the hierarchy respecting expanded state- const result: ProjectWithDepth[] = [];- const expanded = expandedProjects();- const tree = projectTree();-- const processItems = (- items: Project[],- depth: number = 0,- path: string = ''- ) => {- for (const item of items.sort((a, b) => a.name.localeCompare(b.name))) {- const currentPath = path ? `${path} / ${item.name}` : item.name;- result.push({ ...item, depth, path: currentPath });-- if (expanded[item.id] && tree.itemMap[item.id]?.children) {- const childrenAsTreeItems = tree.itemMap[item.id].children!;- processItems(childrenAsTreeItems, depth + 1, currentPath);- }- }- };-- processItems(tree.rootItems);- setFlattenedProjects({ items: result });- newItems = result;- }-- // Reset selection when it's no longer visible (e.g. filtered out by- // search) — use untrack/newItems directly to avoid re-tracking- const fi = untrack(focusedIndex);- const selected = untrack(selectedProject);- const selectionVisible =- selected != null && newItems.some((item) => item.id === selected.id);- if (!selectionVisible) {- if (newItems.length > 0) {- const newIndex = Math.min(Math.max(fi, 0), newItems.length - 1);- setFocusedIndex(newIndex);- setSelectedProject(newItems[newIndex]);- } else {- setFocusedIndex(-1);- setSelectedProject(null);- }- }- };-- // Update flattened projects when dependencies change- createEffect(() => {- updateFlattenedProjects();- });-- const items = () => flattenedProjects().items;-- const currentSelected = () => selectedProject();-- const currentIndex = () => {- const selected = currentSelected();- return selected ? items().findIndex((item) => item.id === selected.id) : -1;- };+ const items = createMemo(() => folderPickerItems(destinations(), query()));- // Keep focused index in sync with current selection- createEffect(() => {- const index = currentIndex();- if (index !== -1 && index !== untrack(focusedIndex)) {- setFocusedIndex(index);- }- });-- const toggleExpanded = (projectId: string) => {- setExpandedProjects((prev) => ({- ...prev,- [projectId]: !prev[projectId],- }));+ const newFolder = async (name: string) => {+ const folderId = await createProject({ name, source: 'bulk_move' });+ if (!folderId) toast.failure(t('create.failedToCreateFolder'));+ return folderId ? { id: folderId, name } : undefined;};- const startCreatingFolder = () => {- setNewFolderName(searchQuery().trim());- setIsCreatingFolder(true);- };-- const cancelCreatingFolder = () => {- setIsCreatingFolder(false);- setNewFolderName('');- searchInputRef?.focus();- };-- const submitNewFolder = async () => {- const name = newFolderName().trim();- if (!name || isSavingFolder()) return;- setIsSavingFolder(true);+ const moveTo = async (item: FolderPickerItem) => {+ setIsPending(true);try {- const projectId = await createProject({ name });- if (!projectId) {- toast.failure('Failed to create folder');- return;- }- setIsCreatingFolder(false);- setNewFolderName('');- setSearchQuery('');- // Select the new folder so "Move" immediately targets it- const created = projects().find((p) => p.id === projectId);- setSelectedProject(- created ?? { id: projectId, name, userId: '', type: 'project' }+ const folder = item.kind === 'folder' ? item : await newFolder(item.name);+ if (!folder) return;+ await moveEntities(+ entitiesToMove(+ props.entities,+ folder.id,+ indexFolders(folderList.folders())+ ),+ folder);- searchInputRef?.focus();- requestAnimationFrame(() => {- scrollToKeepGap({- container: listRef,- target: listRef.querySelector('.focused') as HTMLElement,- align: 'top',- });- });+ props.onMoved(folder);} catch (error) {- console.error('Failed to create folder:', error);- toast.failure('Failed to create folder');+ console.error('Failed to move entities to folder:', error);+ props.onError?.(error);} finally {- setIsSavingFolder(false);+ setIsPending(false);}};- const finishEditing = async () => {- const selected = selectedProject();- if (selected) {- try {- const projectId = selected.id;- const projectName = selected.name;-- await bulkMoveToProjectMutation.mutateAsync({- entities: props.entities.map((entity) => ({- ...entity,- name: entity.name || entity.id,- })),- project: { id: projectId, name: projectName },- });-- const isBulk = props.entities.length > 1;- for (const entity of props.entities) {- analytics.track('update_entity', {- entityType: entity.type,- entityId: entity.id,- property: 'parent_project',- newProjectId: projectId,- isBulk,- bulkCount: props.entities.length,- source: 'bulk_move',- });- }-- props.onFinish();- } catch (error) {- console.error('Failed to move entities to folder:', error);- props.onError?.(error);- }- }+ const select = (item: FolderPickerItem) => {+ if (!isPending()) fireAndForget(moveTo(item), 'bulk-move-to-project');};- const entityCount = () => props.entities.length;- const entityText = () => (entityCount() === 1 ? 'item' : 'items');+ const list = createCommandListController({ items, onSelect: select });return (- <div ref={rootScopeId} class="flex min-h-0 flex-col">- <ActionDialogShell.Body>- <ActionDialogShell.Header>- <ActionDialogShell.Title>- Move {entityCount()} {entityText()} to folder- </ActionDialogShell.Title>- <ActionDialogShell.Description>- Choose a destination for{' '}- {entityCount() === 1 ? 'this item' : 'these items'}.- </ActionDialogShell.Description>- </ActionDialogShell.Header>+ <CommandMenuShell>+ <CommandMenuShell.Header>+ <CommandMenuSearchInput+ ref={searchInput}+ aria-label={t('entityActions.movePickerSearch')}+ role="combobox"+ aria-expanded="true"+ aria-controls={`${id}-folders`}+ aria-activedescendant={+ items().length ? `${id}-${list.selectedIndex()}` : undefined+ }+ placeholder={t('entityActions.movePickerSearch')}+ value={query()}+ disabled={isPending()}+ onInput={(event) => {+ setQuery(event.currentTarget.value);+ list.setSelectedIndex(0);+ }}+ onKeyDown={(event) => {+ if (+ event.key === 'ArrowDown' ||+ (event.ctrlKey && event.key === 'j')+ ) {+ event.preventDefault();+ list.selectNext();+ }+ if (+ event.key === 'ArrowUp' ||+ (event.ctrlKey && event.key === 'k')+ ) {+ event.preventDefault();+ list.selectPrevious();+ }+ if (event.key === 'Enter') {+ event.preventDefault();+ list.selectSelected();+ }+ }}+ />+ </CommandMenuShell.Header>+ <CommandMenuShell.Toolbar class="flex-col items-start gap-2 px-4 py-3">+ <Dialog.Title class="text-sm font-medium text-ink">+ {t('entityActions.movePickerTitle', {+ count: props.entities.length,+ })}+ </Dialog.Title><EntityActionSelection entities={props.entities} />- <div class="min-w-0">- <Input- ref={searchInputRef}- aria-label="Search folders"- type="text"- placeholder="Search folders..."- value={searchQuery()}- onInput={(e) => setSearchQuery(e.currentTarget.value)}- onKeyDown={(e) => {- const isDown =- e.key === 'ArrowDown' || (e.ctrlKey && e.key === 'j');- const isUp = e.key === 'ArrowUp' || (e.ctrlKey && e.key === 'k');- if (isDown || isUp) {- e.preventDefault();- const itms = items();- if (itms.length === 0) return;- const fi = focusedIndex();- const nextIndex = isDown- ? Math.min(fi + 1, itms.length - 1)- : Math.max(fi - 1, 0);- setFocusedIndex(nextIndex);- setSelectedProject(itms[nextIndex]);- scrollToKeepGap({- container: listRef,- target: listRef.querySelector('.focused') as HTMLElement,- align: isDown ? 'bottom' : 'top',- });- } else if (e.key === 'Enter') {- e.preventDefault();- fireAndForget(finishEditing(), 'bulk-move-to-project');- }- }}- class="mb-2"- />- <div class="h-64 overflow-auto" ref={listRef}>- <For each={items()}>- {(project, index) => {- const isSelected = () => currentSelected()?.id === project.id;- const isFocused = () => focusedIndex() === index();- const isExpanded = () => expandedProjects()[project.id];- const hasChildren = () => {- const tree = projectTree();- return (- tree.itemMap[project.id]?.children &&- tree.itemMap[project.id].children!.length > 0- );- };-- return (- <div- class={- isFocused()- ? 'focused relative min-w-0'- : 'relative min-w-0'- }- style={{- 'padding-left': `calc(${project.depth || 0} * var(--sidebar-icon-slot))`,- }}- >- <For- each={Array.from(- { length: project.depth || 0 },- (_, depth) => depth- )}- >- {(depth) => (- <span- aria-hidden="true"- class="pointer-events-none absolute inset-y-0 w-px bg-edge-muted"- style={{- left: `calc(${depth} * var(--sidebar-icon-slot) + var(--sidebar-local-rail))`,- }}- />- )}- </For>- <ViewSidebar.TreeItem- active={isSelected()}- expanded={- hasChildren() ? Boolean(isExpanded()) : undefined- }- label={project.name}- onToggle={() => toggleExpanded(project.id)}- onClick={() => {- setSelectedProject(project);- setFocusedIndex(index());- scrollToKeepGap({- container: listRef,- target: listRef.querySelector(- '.focused'- ) as HTMLElement,- align: 'top',- });- }}- >- <ViewSidebar.Icon>- <FolderIcon class="size-4" />- </ViewSidebar.Icon>- <span class="min-w-0 flex-1 truncate">- {project.name}- </span>- <Show when={searchQuery()}>- <span class="max-w-48 truncate text-xs text-ink-placeholder">- {getProjectPath(project.id)}- </span>- </Show>- </ViewSidebar.TreeItem>- </div>- );- }}- </For>- </div>-- <div class="mt-2 border-t border-edge-muted pt-2">+ </CommandMenuShell.Toolbar>+ <CommandMenuShell.Body class="flex flex-col">+ <CommandMenuList+ id={`${id}-folders`}+ items={items()}+ selectedIndex={list.selectedIndex()}+ scrollSelectedIntoView={list.shouldScrollSelectedIntoView()}+ itemId={(_, index) => `${id}-${index}`}+ itemDisabled={isPending}+ beforeItem={(item, index) => {+ if (item.kind !== 'folder' || query().trim()) return null;+ const previous = items()[index - 1];+ if (previous?.kind === 'folder' && previous.group === item.group)+ return null;+ return (+ <div class="px-2 pt-3 pb-1 text-xs font-medium text-ink-extra-muted first:pt-0">+ {groupLabel(item.group)}+ </div>+ );+ }}+ onItemMouseMove={list.setSelectedIndexFromPointer}+ onSelect={select}+ class="min-h-0 max-h-80 mobile:[&_[role=option]]:h-auto mobile:[&_[role=option]]:min-h-12 mobile:[&_[role=option]]:py-2"+ >+ {(item) => (<Show- when={isCreatingFolder()}+ when={item.kind === 'folder' ? item : undefined}fallback={- <button- type="button"- class="flex h-8 w-full items-center gap-2 rounded-lg px-2 text-sm text-ink-muted hover:bg-hover hover:text-ink"- onClick={startCreatingFolder}- >- <FolderPlusIcon class="size-4 shrink-0" />- New folder- </button>+ <>+ <FolderPlusIcon class="size-4 shrink-0 text-ink-muted" />+ <span class="min-w-0 flex-1 truncate font-medium">+ {t('entityActions.movePickerCreate', {+ name: item.name,+ })}+ </span>+ </>}>- <div class="flex items-center gap-2 px-2 py-1">- <FolderPlusIcon class="size-4 shrink-0 text-ink-muted" />- <input- ref={(el) => {- requestAnimationFrame(() => el.focus());- }}- type="text"- placeholder="Folder name"- value={newFolderName()}- onInput={(e) => setNewFolderName(e.currentTarget.value)}- onKeyDown={(e) => {- if (e.key === 'Enter') {- e.preventDefault();- e.stopPropagation();- fireAndForget(submitNewFolder(), 'bulk-move-to-project');- } else if (e.key === 'Escape') {- e.preventDefault();- e.stopPropagation();- cancelCreatingFolder();- }- }}- class="flex-1 min-w-0 py-1 text-sm bg-transparent text-ink placeholder:text-ink-placeholder focus:outline-none"- />- <Button- size="sm"- variant="secondary"- class="shrink-0"- disabled={!newFolderName().trim() || isSavingFolder()}- onClick={submitNewFolder}- >- Create- </Button>- <Button- size="icon-sm"- variant="ghost"- class="shrink-0"- tooltip="Cancel"- onClick={cancelCreatingFolder}- >- <CloseIcon class="size-3.5 touch:size-6 shrink-0 pointer-events-none" />- </Button>- </div>+ {(folder) => (+ <>+ <FolderIcon class="size-4 shrink-0 text-ink-muted" />+ <div class="flex min-w-0 flex-1 items-center gap-2 mobile:flex-col mobile:items-start mobile:gap-0.5">+ <span class="min-w-0 max-w-full flex-1 truncate font-medium mobile:flex-none">+ {folder().name}+ </span>+ <Show when={folder().path}>+ <span class="max-w-48 truncate text-xs font-normal text-ink-placeholder mobile:max-w-full">+ {folder().path}+ </span>+ </Show>+ </div>+ </>+ )}</Show>- </div>- </div>- </ActionDialogShell.Body>- <ActionDialogShell.Footer>- <Button variant="ghost" onClick={props.onCancel}>- Cancel- </Button>+ )}+ </CommandMenuList>+ <Show when={!items().length}>+ <CommandMenuEmptyState>+ {folderList.isPending()+ ? t('entityActions.movePickerLoading')+ : t('entityActions.movePickerEmpty')}+ </CommandMenuEmptyState>+ </Show>+ </CommandMenuShell.Body>+ <CommandMenuShell.Footer>+ <span role="status">+ <Show+ when={!isPending()}+ fallback={t('entityActions.movePickerMoving')}+ >+ <span class="mobile:hidden">+ {t('entityActions.movePickerKeyboardHint')}+ </span>+ <span class="hidden mobile:inline">+ {t('entityActions.movePickerTouchHint')}+ </span>+ </Show>+ </span><Button+ variant="ghost"type="button"- variant="secondary"- onClick={() => fireAndForget(finishEditing(), 'bulk-move-to-project')}- disabled={!selectedProject()}+ class="ml-auto shrink-0 text-ink-muted hover:text-ink mobile:min-h-11 mobile:px-2"+ onClick={props.onCancel}>- Move+ {t('common.cancel')}</Button>- </ActionDialogShell.Footer>- </div>+ </CommandMenuShell.Footer>+ </CommandMenuShell>);};diff --git a/apps/web/src/features/entity/bulk-edit/folder-destinations.test.ts b/apps/web/src/features/entity/bulk-edit/folder-destinations.test.tsnew file mode 100644index 0000000000..d9a491b37c--- /dev/null+++ b/apps/web/src/features/entity/bulk-edit/folder-destinations.test.ts@@ -0,0 +1,208 @@+import type { FolderRow } from '@queries/storage/folder-list';+import { describe, expect, it } from 'vitest';+import type { EntityData } from '../types/entity';+import {+ entitiesToMove,+ folderDestinations,+ folderPickerItems,+ indexFolders,+} from './folder-destinations';++const folder = (+ id: string,+ name: string,+ options: { parentId?: string; userId?: string; createdAt?: string } = {}+): FolderRow => ({+ id,+ name,+ parentId: options.parentId,+ userId: options.userId ?? 'macro|me',+ createdAt: options.createdAt,+});++const doc = (id: string, projectId?: string): EntityData => ({+ id,+ type: 'document',+ name: id,+ ownerId: 'macro|me',+ projectId,+});++const folderRow = (id: string, projectId?: string): EntityData => ({+ id,+ type: 'project',+ name: id,+ ownerId: 'macro|me',+ projectId,+});++describe('entitiesToMove', () => {+ const folders = indexFolders([+ folder('work', 'Work'),+ folder('q4', 'Q4', { parentId: 'work' }),+ folder('notes', 'Notes', { parentId: 'q4' }),+ ]);++ it('skips what the folder already holds', () => {+ const inside = doc('inside', 'q4');+ const outside = doc('outside', 'work');++ expect(entitiesToMove([inside, outside], 'q4', folders)).toEqual([outside]);+ expect(entitiesToMove([inside], 'q4', folders)).toEqual([]);+ });++ it('refuses to put a folder inside itself or anything under it', () => {+ const work = folderRow('work');++ expect(entitiesToMove([work], 'work', folders)).toEqual([]);+ expect(entitiesToMove([work], 'notes', folders)).toEqual([]);+ expect(entitiesToMove([doc('a'), work], 'notes', folders)).toEqual([]);+ });++ it('lets a folder move into an unrelated one', () => {+ const notes = folderRow('notes', 'q4');++ expect(entitiesToMove([notes], 'work', folders)).toEqual([notes]);+ });++ it('survives a parent loop in the folder data', () => {+ const looped = indexFolders([+ folder('a', 'A', { parentId: 'b' }),+ folder('b', 'B', { parentId: 'a' }),+ ]);++ expect(entitiesToMove([doc('item')], 'a', looped)).toHaveLength(1);+ });+});++describe('folderDestinations', () => {+ const names = (options: Parameters<typeof folderDestinations>[0]) =>+ folderDestinations(options).map((destination) => [+ destination.group,+ destination.name,+ ]);++ it('lists open folders first, then created, then shared, newest first', () => {+ expect(+ names({+ folders: [+ folder('old-shared', 'Old shared', {+ userId: 'macro|teammate',+ createdAt: '2026-01-01T00:00:00Z',+ }),+ folder('old-mine', 'Old mine', { createdAt: '2026-02-01T00:00:00Z' }),+ folder('open-b', 'Open B', { userId: 'macro|teammate' }),+ folder('new-mine', 'New mine', { createdAt: '2026-03-01T00:00:00Z' }),+ folder('new-shared', 'New shared', {+ userId: 'macro|teammate',+ createdAt: '2026-04-01T00:00:00Z',+ }),+ folder('open-a', 'Open A'),+ ],+ openFolderIds: ['open-a', 'open-b'],+ userId: 'macro|me',+ entities: [doc('item')],+ })+ ).toEqual([+ ['open', 'Open A'],+ ['open', 'Open B'],+ ['created', 'New mine'],+ ['created', 'Old mine'],+ ['shared', 'New shared'],+ ['shared', 'Old shared'],+ ]);+ });++ it('shows nested folders with their parents as the path', () => {+ const [nested] = folderDestinations({+ folders: [+ folder('notes', 'Notes', { parentId: 'q4' }),+ folder('q4', 'Q4', { parentId: 'work' }),+ folder('work', 'Work'),+ ],+ openFolderIds: ['notes'],+ userId: 'macro|me',+ entities: [doc('item')],+ });++ expect(nested).toMatchObject({ name: 'Notes', path: 'Work / Q4' });+ });++ it('leaves out the open folder the items already live in', () => {+ expect(+ names({+ folders: [folder('here', 'Here'), folder('there', 'There')],+ openFolderIds: ['here', 'there'],+ userId: 'macro|me',+ entities: [doc('a', 'here'), doc('b', 'here')],+ })+ ).toEqual([['open', 'There']]);+ });++ it('keeps a folder that holds only some of the items', () => {+ expect(+ names({+ folders: [folder('here', 'Here')],+ openFolderIds: [],+ userId: 'macro|me',+ entities: [doc('a', 'here'), doc('b')],+ })+ ).toEqual([['created', 'Here']]);+ });++ it('leaves out a moved folder and everything under it', () => {+ expect(+ names({+ folders: [+ folder('work', 'Work'),+ folder('q4', 'Q4', { parentId: 'work' }),+ folder('other', 'Other'),+ ],+ openFolderIds: ['q4'],+ userId: 'macro|me',+ entities: [folderRow('work')],+ })+ ).toEqual([['created', 'Other']]);+ });+});++describe('folderPickerItems', () => {+ const destinations = folderDestinations({+ folders: [+ folder('roadmap', 'Roadmap'),+ folder('road', 'Road', { userId: 'macro|teammate' }),+ folder('broad', 'Broad strokes'),+ folder('unrelated', 'Invoices'),+ ],+ openFolderIds: ['broad'],+ userId: 'macro|me',+ entities: [doc('item')],+ });+ const rows = (query: string) =>+ folderPickerItems(destinations, query).map((item) =>+ item.kind === 'folder' ? item.name : `create:${item.name}`+ );++ it('keeps the priority order until something is typed', () => {+ expect(rows(' ')).toEqual([+ 'Broad strokes',+ 'Roadmap',+ 'Invoices',+ 'Road',+ ]);+ });++ it('puts better name matches ahead of an open folder', () => {+ expect(rows('road').slice(0, 3)).toEqual([+ 'Road',+ 'Roadmap',+ 'Broad strokes',+ ]);+ });++ it('offers to create a folder unless the name is taken', () => {+ expect(rows('road')).not.toContain('create:road');+ expect(rows('Inv')).toEqual(['Invoices', 'create:Inv']);+ expect(rows(' Plans ')).toEqual(['create:Plans']);+ });+});diff --git a/apps/web/src/features/entity/bulk-edit/folder-destinations.ts b/apps/web/src/features/entity/bulk-edit/folder-destinations.tsnew file mode 100644index 0000000000..37fad0a0f1--- /dev/null+++ b/apps/web/src/features/entity/bulk-edit/folder-destinations.ts@@ -0,0 +1,140 @@+import { compareDateDesc } from '@core/util/date';+import { createFreshSearch, NAME_MATCH_RANKING } from '@core/util/freshSort';+import type { FolderRow } from '@queries/storage/folder-list';+import { type EntityData, getEntityProjectId } from '../types/entity';++export type FolderGroup = 'open' | 'created' | 'shared';++export type FolderDestination = {+ kind: 'folder';+ id: string;+ name: string;+ /** The folders above this one, outermost first. */+ path: string;+ group: FolderGroup;+};++export type FolderPickerItem =+ | FolderDestination+ | { kind: 'create'; name: string };++// Boosts order rows within a name-match group; they never lift a row past a+// better name match.+const GROUP_SEARCH_BOOST: Record<FolderGroup, number> = {+ open: 0.5,+ created: 0.2,+ shared: 0,+};++const searchFolders = createFreshSearch<FolderDestination>({+ config: {+ ...NAME_MATCH_RANKING,+ timeWeight: 0,+ boostFn: (folder) => GROUP_SEARCH_BOOST[folder.group],+ },+ getName: (folder) => folder.name,+ getTimestamp: () => ({}),+});++/** A folder followed by its parents, tolerating missing or looping parents. */+function folderAncestry(+ folders: ReadonlyMap<string, FolderRow>,+ folderId: string+): FolderRow[] {+ const ancestry: FolderRow[] = [];+ const seen = new Set<string>();+ let current = folders.get(folderId);+ while (current && !seen.has(current.id)) {+ seen.add(current.id);+ ancestry.push(current);+ current = current.parentId ? folders.get(current.parentId) : undefined;+ }+ return ancestry;+}++export const indexFolders = (+ folders: readonly FolderRow[]+): ReadonlyMap<string, FolderRow> =>+ new Map(folders.map((folder) => [folder.id, folder]));++/**+ * The entities a move into the folder would change. Empty when there is+ * nothing to do, or when a folder would land inside itself.+ */+export function entitiesToMove<TEntity extends EntityData>(+ entities: readonly TEntity[],+ folderId: string,+ folders: ReadonlyMap<string, FolderRow>+): TEntity[] {+ const ancestors = new Set(+ folderAncestry(folders, folderId).map((folder) => folder.id)+ ).add(folderId);+ if (entities.some((e) => e.type === 'project' && ancestors.has(e.id))) {+ return [];+ }+ return entities.filter((entity) => getEntityProjectId(entity) !== folderId);+}++/**+ * Where these entities can go: folders open in a split in split order, then+ * the ones the user created, then the ones shared with them, each newest first.+ */+export function folderDestinations(options: {+ folders: readonly FolderRow[];+ openFolderIds: readonly string[];+ userId: string | undefined;+ entities: readonly EntityData[];+}): FolderDestination[] {+ const { folders, openFolderIds, userId, entities } = options;+ const index = indexFolders(folders);++ const groupOf = (folder: FolderRow): FolderGroup => {+ if (openFolderIds.includes(folder.id)) return 'open';+ return folder.userId === userId ? 'created' : 'shared';+ };+ const position = ({ group, id }: FolderDestination) => {+ if (group === 'open') return openFolderIds.indexOf(id);+ return openFolderIds.length + (group === 'created' ? 0 : 1);+ };++ return folders+ .toSorted((a, b) => compareDateDesc(a.createdAt, b.createdAt))+ .filter((folder) => entitiesToMove(entities, folder.id, index).length > 0)+ .map(+ (folder): FolderDestination => ({+ kind: 'folder',+ id: folder.id,+ name: folder.name,+ path: folderAncestry(index, folder.id)+ .slice(1)+ .reverse()+ .map((parent) => parent.name)+ .join(' / '),+ group: groupOf(folder),+ })+ )+ .toSorted((a, b) => position(a) - position(b));+}++/**+ * The picker's rows for a typed query: name matches, then a row that creates+ * a folder with that name unless one already has it.+ */+export function folderPickerItems(+ destinations: FolderDestination[],+ query: string+): FolderPickerItem[] {+ const name = query.trim();+ if (!name) return destinations;++ const matches = searchFolders(destinations, name)+ .toSorted(+ (a, b) =>+ b.nameMatchRank - a.nameMatchRank || b.combinedScore - a.combinedScore+ )+ .map(({ item }) => item);+ const exists = destinations.some(+ (folder) => folder.name.toLocaleLowerCase() === name.toLocaleLowerCase()+ );+ return exists ? matches : [...matches, { kind: 'create', name }];+}diff --git a/apps/web/src/features/entity/bulk-edit/move-entities-to-folder.ts b/apps/web/src/features/entity/bulk-edit/move-entities-to-folder.tsnew file mode 100644index 0000000000..a0a32a84e0--- /dev/null+++ b/apps/web/src/features/entity/bulk-edit/move-entities-to-folder.ts@@ -0,0 +1,43 @@+import { analytics } from '@app/lib/analytics';+import { Telemetry } from '@macro-inc/observability';+import { createBulkMoveToProjectDssEntityMutation } from '../queries/dss';+import type { EntityData } from '../types/entity';++/** Rejects when the move fails, for the caller to report. */+export function createMoveEntitiesToFolder(source: string) {+ const mutation = createBulkMoveToProjectDssEntityMutation();++ return (entities: EntityData[], folder: { id: string; name: string }) =>+ Telemetry.span('entity.move_to_folder', async (span) => {+ span.setAttr('folder.id', folder.id);+ span.setAttr('entity.count', entities.length);+ span.setAttr('move.source', source);++ try {+ await mutation.mutateAsync({+ entities: entities.map((entity) => ({+ ...entity,+ name: entity.name || entity.id,+ })),+ project: folder,+ });+ } catch (error) {+ span.setAttr('move.outcome', 'failed');+ span.error(error);+ throw error;+ }+ span.setAttr('move.outcome', 'moved');++ for (const entity of entities) {+ analytics.track('update_entity', {+ entityType: entity.type,+ entityId: entity.id,+ property: 'parent_project',+ newProjectId: folder.id,+ isBulk: entities.length > 1,+ bulkCount: entities.length,+ source,+ });+ }+ });+}diff --git a/apps/web/src/features/entity/bulk-edit/moved-to-folder-toast.test.ts b/apps/web/src/features/entity/bulk-edit/moved-to-folder-toast.test.tsnew file mode 100644index 0000000000..4a6c9e5bb8--- /dev/null+++ b/apps/web/src/features/entity/bulk-edit/moved-to-folder-toast.test.ts@@ -0,0 +1,80 @@+import { beforeEach, describe, expect, it, vi } from 'vitest';++const mocks = vi.hoisted(() => ({+ toast: { success: vi.fn(() => 7), dismiss: vi.fn() },+ openFolder: vi.fn(),+ isTouchDevice: vi.fn(() => false),+ canAppendSplit: vi.fn(() => true),+}));++vi.mock('@core/component/Toast/Toast', () => ({ toast: mocks.toast }));+vi.mock('@core/mobile/isTouchDevice', () => ({+ isTouchDevice: mocks.isTouchDevice,+}));+vi.mock('@app/signal/splitLayout', () => ({+ globalSplitManager: () => ({ canAppendSplit: mocks.canAppendSplit }),+}));+vi.mock('@components/app/split-layout/open-folders', () => ({+ openFolder: mocks.openFolder,+}));++import { toastMovedToFolder } from './moved-to-folder-toast';++type Action = { label: string; onClick: () => void };++const shownToast = () => {+ const [message, options] = mocks.toast.success.mock.lastCall as unknown as [+ string,+ { actions: Action[] },+ ];+ return { message, actions: options.actions };+};++describe('toastMovedToFolder', () => {+ beforeEach(() => {+ vi.clearAllMocks();+ mocks.isTouchDevice.mockReturnValue(false);+ mocks.canAppendSplit.mockReturnValue(true);+ });++ it('names the count only for several items', () => {+ toastMovedToFolder(1, 'folder');+ expect(shownToast().message).toBe('Moved to folder');+ toastMovedToFolder(3, 'folder');+ expect(shownToast().message).toBe('Moved 3 items');+ });++ it('offers both opens on desktop, dismissing before it opens', () => {+ toastMovedToFolder(1, 'folder');+ const [open, openInNewSplit] = shownToast().actions;+ expect(open?.label).toBe('Open');+ expect(openInNewSplit?.label).toBe('Open in new split');++ open?.onClick();+ expect(mocks.toast.dismiss).toHaveBeenCalledWith(7);+ expect(mocks.openFolder).toHaveBeenLastCalledWith(+ expect.anything(),+ 'folder',+ { newSplit: false }+ );++ openInNewSplit?.onClick();+ expect(mocks.openFolder).toHaveBeenLastCalledWith(+ expect.anything(),+ 'folder',+ { newSplit: true }+ );+ });++ it('offers only Open on a touch device, which has no splits', () => {+ mocks.isTouchDevice.mockReturnValue(true);+ toastMovedToFolder(1, 'folder');+ expect(shownToast().actions.map(({ label }) => label)).toEqual(['Open']);+ });++ it('offers only Open when no split fits', () => {+ mocks.canAppendSplit.mockReturnValue(false);+ toastMovedToFolder(1, 'folder');+ expect(shownToast().actions.map(({ label }) => label)).toEqual(['Open']);+ });+});diff --git a/apps/web/src/features/entity/bulk-edit/moved-to-folder-toast.ts b/apps/web/src/features/entity/bulk-edit/moved-to-folder-toast.tsnew file mode 100644index 0000000000..078e4ca6e6--- /dev/null+++ b/apps/web/src/features/entity/bulk-edit/moved-to-folder-toast.ts@@ -0,0 +1,40 @@+import { t } from '@app/lib/i18n';+import { globalSplitManager } from '@app/signal/splitLayout';+import { openFolder } from '@components/app/split-layout/open-folders';+import { toast } from '@core/component/Toast/Toast';+import { isTouchDevice } from '@core/mobile/isTouchDevice';+import ArrowSquareOutIcon from '@icon/system/regular/arrow-square-out.svg';+import SplitIcon from '@icon/system/regular/square-half.svg';++/** Reports a finished move and offers to open its destination folder. */+export function toastMovedToFolder(count: number, folderId: string) {+ const open = (newSplit: boolean) => {+ if (toastId !== undefined) toast.dismiss(toastId);+ openFolder(globalSplitManager(), folderId, { newSplit });+ };+ const canOpenNewSplit =+ !isTouchDevice() && !!globalSplitManager()?.canAppendSplit();+ const toastId = toast.success(+ count > 1+ ? t('entityActions.toastMovedCount', { count })+ : t('entityActions.toastMovedToFolder'),+ {+ actions: [+ {+ label: t('entityActions.open'),+ icon: ArrowSquareOutIcon,+ onClick: () => open(false),+ },+ ...(canOpenNewSplit+ ? [+ {+ label: t('entityActions.openInNewSplit'),+ icon: SplitIcon,+ onClick: () => open(true),+ },+ ]+ : []),+ ],+ }+ );+}diff --git a/apps/web/src/features/entity/index.ts b/apps/web/src/features/entity/index.tsindex 8406898d0e..bcc4eaf4c4 100644--- a/apps/web/src/features/entity/index.ts+++ b/apps/web/src/features/entity/index.ts@@ -59,7 +59,10 @@ export {getCompanyOwnerId,getCompanyStageOptionId,} from './utils/company-properties';-export { createEntityDraggable } from './utils/draggable';+export {+ createEntityDraggable,+ EntityDragSelectionContext,+} from './utils/draggable';export { unreadFilterFn } from './utils/filter';export {filterNotDoneNotifications,diff --git a/apps/web/src/features/entity/types/drag.ts b/apps/web/src/features/entity/types/drag.tsindex 7d5bb6e390..53c9d3599e 100644--- a/apps/web/src/features/entity/types/drag.ts+++ b/apps/web/src/features/entity/types/drag.ts@@ -4,10 +4,20 @@ import type { EntityData } from './entity';export type EntityDragOperation = 'move' | 'copy';+/** The selection a row belongs to while it is dragged. */+export type EntityDragSelection = {+ /** What the drag carries: the whole selection for a selected row, else the row. */+ entities: Accessor<EntityData[]>;+ /** The list's current selection, whether or not it holds the dragged row. */+ selected: Accessor<EntityData[]>;+ clear: () => void;+};+export type EntityDragData = EntityData & {dragType: 'entity';operation: Accessor<EntityDragOperation>;splitId?: string;+ selection?: EntityDragSelection;};export type EntityDragEvent = DragEvent & {diff --git a/apps/web/src/features/entity/utils/draggable.test.tsx b/apps/web/src/features/entity/utils/draggable.test.tsxindex 001a3df858..206acbe864 100644--- a/apps/web/src/features/entity/utils/draggable.test.tsx+++ b/apps/web/src/features/entity/utils/draggable.test.tsx@@ -7,8 +7,9 @@ import {import { type Accessor, createSignal, Show } from 'solid-js';import { createStore } from 'solid-js/store';import { afterEach, describe, expect, it, vi } from 'vitest';+import type { EntityDragSelection } from '../types/drag';import type { ChannelEntity } from '../types/entity';-import { createEntityDraggable } from './draggable';+import { createEntityDraggable, EntityDragSelectionContext } from './draggable';vi.mock('@components/app/ItemDragAndDrop', () => ({useOptionalDragOperation: () => ({ isAltKey: () => false }),@@ -24,7 +25,8 @@ const entity: ChannelEntity = {function setup(deferUntilInteraction?: Accessor<boolean>,- rowEntity: ChannelEntity = entity+ rowEntity: ChannelEntity = entity,+ selection?: EntityDragSelection) {let state!: NonNullable<ReturnType<typeof useDragDropContext>>[0];let removeRow!: () => void;@@ -50,7 +52,9 @@ function setup(<><DragDropSensors /><Show when={mounted()}>- <Row />+ <EntityDragSelectionContext.Provider value={selection}>+ <Row />+ </EntityDragSelectionContext.Provider></Show></>);@@ -105,6 +109,26 @@ describe('createEntityDraggable', () => {});+ it('carries the selection its list provides', () => {+ const other: ChannelEntity = { ...entity, id: 'other', name: 'Another' };+ const selection = {+ entities: () => [entity, other],+ selected: () => [entity, other],+ clear: vi.fn(),+ };+ const { state } = setup(undefined, entity, selection);++ const data = state.draggables['row-split']!.data;++ expect(data.selection.entities()).toEqual([entity, other]);+ });++ it('carries no selection outside a list', () => {+ const { state } = setup();++ expect(state.draggables['row-split']!.data.selection).toBeUndefined();+ });+it('does not register or measure opted-in rows until a primary press', () => {const rect = vi.spyOn(HTMLElement.prototype, 'getBoundingClientRect');const { state, getByTestId } = setup(() => true);diff --git a/apps/web/src/features/entity/utils/draggable.ts b/apps/web/src/features/entity/utils/draggable.tsindex 34a9179842..052c57153e 100644--- a/apps/web/src/features/entity/utils/draggable.ts+++ b/apps/web/src/features/entity/utils/draggable.ts@@ -3,16 +3,21 @@ import { createSubRoot } from '@solid-primitives/rootless';import { createDraggable } from '@thisbeyond/solid-dnd';import {type Accessor,+ createContext,createEffect,createUniqueId,getOwner,mergeProps,onCleanup,untrack,+ useContext,} from 'solid-js';-import type { EntityDragData } from '../types/drag';+import type { EntityDragData, EntityDragSelection } from '../types/drag';import type { EntityData } from '../types/entity';+/** Lets a list tell its rows what dragging them carries. */+export const EntityDragSelectionContext = createContext<EntityDragSelection>();+export function createEntityDraggable(options: {entity: EntityData;splitId?: string;@@ -22,6 +27,7 @@ export function createEntityDraggable(options: {const operation = useOptionalDragOperation();if (!operation) return () => {};const { isAltKey } = operation;+ const selection = useContext(EntityDragSelectionContext);const draggableId = `${options.entity.id}-${options.splitId ?? createUniqueId()}`;const create = () => {@@ -32,6 +38,7 @@ export function createEntityDraggable(options: {dragType: 'entity' as const,splitId: options.splitId,operation: () => (isAltKey() ? 'copy' : 'move'),+ selection,});return createDraggable(draggableId, dragData);};diff --git a/apps/web/src/features/next-soup/actions/folder-drop-zone.test.tsx b/apps/web/src/features/next-soup/actions/folder-drop-zone.test.tsxnew file mode 100644index 0000000000..1428648c70--- /dev/null+++ b/apps/web/src/features/next-soup/actions/folder-drop-zone.test.tsx@@ -0,0 +1,439 @@+import type { EntityData, EntityDragData } from '@entity';+import { cleanup, render, screen } from '@solidjs/testing-library';+import {+ createDraggable,+ DragDropProvider,+ useDragDropContext,+} from '@thisbeyond/solid-dnd';+import { For, type JSX } from 'solid-js';+import { afterEach, describe, expect, it, vi } from 'vitest';++const mocks = vi.hoisted(() => ({+ moveEntities: vi.fn(),+ toast: { success: vi.fn(), failure: vi.fn(), dismiss: vi.fn() },+}));++vi.mock('@app/features/entity/bulk-edit/BulkEditEntityModal', () => ({+ openBulkEditModal: vi.fn(),+}));+vi.mock('@app/features/entity/bulk-edit/move-entities-to-folder', () => ({+ createMoveEntitiesToFolder: () => mocks.moveEntities,+}));+vi.mock('@components/app/split-layout/layoutUtils', () => ({+ useSplitPanel: () => ({ handle: { id: 'folder-split' } }),+}));+vi.mock('@core/component/Toast/Toast', () => ({ toast: mocks.toast }));+vi.mock('@core/context/user', () => ({ useUserId: () => () => 'macro|me' }));+vi.mock('@queries/storage/folder-list', () => ({+ createFolderList: () => ({+ folders: () => [+ { id: 'folder', name: 'Folder', parentId: 'parent', userId: 'macro|me' },+ { id: 'parent', name: 'Parent', userId: 'macro|me' },+ { id: 'other', name: 'Other', userId: 'macro|me' },+ ],+ isPending: () => false,+ }),+}));+vi.mock('../utils', () => ({ restoreSoupFocus: vi.fn() }));++import {+ createFolderDropTargets,+ createFolderRowDropTarget,+ FolderDropZone,+} from './folder-drop-zone';++const doc = (id: string, ownerId = 'macro|me'): EntityData => ({+ id,+ type: 'document',+ name: id,+ ownerId,+});++function dragData(+ entity: EntityData,+ options: {+ splitId?: string;+ selected?: EntityData[];+ currentSelection?: () => EntityData[];+ clear?: () => void;+ operation?: 'move' | 'copy';+ }+): EntityDragData {+ return {+ ...entity,+ dragType: 'entity',+ operation: () => options.operation ?? 'move',+ splitId: options.splitId ?? 'list-split',+ selection: options.selected && {+ entities: () => options.selected ?? [],+ selected: options.currentSelection ?? (() => options.selected ?? []),+ clear: options.clear ?? (() => {}),+ },+ };+}++function setup(data: EntityDragData, target: () => JSX.Element = FolderBody) {+ let actions!: NonNullable<ReturnType<typeof useDragDropContext>>[1];+ function Harness() {+ const context = useDragDropContext();+ if (!context) throw new Error('Missing drag provider');+ actions = context[1];+ const draggable = createDraggable('row', data);+ return (+ <>+ <div ref={draggable}>Row</div>+ {target()}+ </>+ );+ }+ render(() => (+ <DragDropProvider+ collisionDetector={(_, droppables) =>+ droppables.find((droppable) => {+ const disabled = droppable.data.isDropTargetDisabled as () => boolean;+ return !disabled();+ }) ?? null+ }+ >+ <Harness />+ </DragDropProvider>+ ));+ return {+ start: () => actions.dragStart('row'),+ drop: () => actions.dragEnd(),+ };+}++function FolderBody() {+ return <FolderDropZone folderId="folder">Folder contents</FolderDropZone>;+}++/** Folder rows as Drive's sidebar builds them: one controller, one target each. */+function FolderRows() {+ const createTarget = createFolderDropTargets();+ return (+ <For each={['folder', 'other']}>+ {(id) => {+ const target = createTarget?.(() => id);+ return (+ <div+ ref={(element) => target?.ref(element)}+ data-testid={id}+ data-over={target?.isOver()}+ />+ );+ }}+ </For>+ );+}++const folder = (id: string): EntityData => ({+ id,+ type: 'project',+ name: id,+ ownerId: 'macro|me',+});++function ListRow(props: { entity: EntityData }) {+ const target = createFolderRowDropTarget(() => props.entity);+ return (+ <div+ ref={(element) => target?.ref(element)}+ data-testid={props.entity.id}+ data-target={target !== undefined}+ data-over={target?.isOver()}+ />+ );+}++/** A folder's list, as Drive renders one inside its drop zone. */+function FolderList() {+ return (+ <FolderDropZone folderId="parent">+ <ListRow entity={folder('folder')} />+ <ListRow entity={doc('document-row')} />+ </FolderDropZone>+ );+}++afterEach(() => {+ cleanup();+ vi.clearAllMocks();+});++describe('FolderDropZone', () => {+ it('moves the whole selection and clears it', async () => {+ mocks.moveEntities.mockResolvedValue(undefined);+ const clear = vi.fn();+ const first = doc('first');+ const second = doc('second');+ const { start, drop } = setup(+ dragData(first, { selected: [first, second], clear })+ );++ start();+ expect(screen.getByText('Move 2 items to this folder')).toBeTruthy();+ drop();+ await vi.waitFor(() => expect(mocks.toast.success).toHaveBeenCalled());++ expect(mocks.moveEntities).toHaveBeenCalledWith([first, second], {+ id: 'folder',+ name: 'Folder',+ });+ expect(clear).toHaveBeenCalled();+ });++ it('moves a row that carries no selection', async () => {+ mocks.moveEntities.mockResolvedValue(undefined);+ const { start, drop } = setup(dragData(doc('row'), {}));++ start();+ expect(screen.getByText('Move 1 item to this folder')).toBeTruthy();+ drop();+ await vi.waitFor(() => expect(mocks.toast.success).toHaveBeenCalled());++ expect(mocks.moveEntities.mock.calls[0]?.[0]).toHaveLength(1);+ });++ it('skips selected rows the folder already holds', async () => {+ mocks.moveEntities.mockResolvedValue(undefined);+ const held = { ...doc('held'), projectId: 'folder' };+ const moved = doc('moved');+ const { start, drop } = setup(dragData(moved, { selected: [held, moved] }));++ start();+ drop();+ await vi.waitFor(() => expect(mocks.toast.success).toHaveBeenCalled());++ expect(mocks.moveEntities.mock.calls[0]?.[0]).toEqual([moved]);+ });++ it('refuses a selection holding a row the user cannot move', () => {+ const mine = doc('mine');+ const theirs = doc('theirs', 'macro|teammate');+ const { start, drop } = setup(dragData(mine, { selected: [mine, theirs] }));++ start();+ expect(screen.queryByText(/to this folder/)).toBeNull();+ drop();++ expect(mocks.moveEntities).not.toHaveBeenCalled();+ });++ it('refuses a row dragged within its own split', () => {+ const { start, drop } = setup(+ dragData(doc('row'), { splitId: 'folder-split' })+ );++ start();+ expect(screen.queryByText(/to this folder/)).toBeNull();+ drop();++ expect(mocks.moveEntities).not.toHaveBeenCalled();+ });++ it('refuses to put a folder inside its own subfolder', () => {+ const parent: EntityData = {+ id: 'parent',+ type: 'project',+ name: 'Parent',+ ownerId: 'macro|me',+ };+ const { start, drop } = setup(dragData(parent, {}));++ start();+ drop();++ expect(mocks.moveEntities).not.toHaveBeenCalled();+ });++ it('moves a row onto a folder row in its own split', async () => {+ mocks.moveEntities.mockResolvedValue(undefined);+ const row = doc('row');+ const { start, drop } = setup(+ dragData(row, { splitId: 'folder-split' }),+ FolderList+ );++ start();+ expect(screen.queryByText(/to this folder/)).toBeNull();+ drop();+ await vi.waitFor(() => expect(mocks.toast.success).toHaveBeenCalled());++ expect(mocks.moveEntities).toHaveBeenCalledTimes(1);+ expect(mocks.moveEntities.mock.calls[0]?.[1]).toEqual({+ id: 'folder',+ name: 'Folder',+ });+ });++ it('refuses a folder dropped on its own row', () => {+ const { start, drop } = setup(+ dragData(folder('folder'), { splitId: 'folder-split' }),+ FolderList+ );++ start();+ drop();++ expect(mocks.moveEntities).not.toHaveBeenCalled();+ });++ it('makes only folder rows into targets', () => {+ setup(dragData(doc('row'), {}), FolderList);++ expect(screen.getByTestId('folder').dataset.target).toBe('true');+ expect(screen.getByTestId('document-row').dataset.target).toBe('false');+ });++ it('gives rows outside a folder drop zone no target', () => {+ setup(dragData(doc('row'), {}), () => (+ <ListRow entity={folder('folder')} />+ ));++ expect(screen.getByTestId('folder').dataset.target).toBe('false');+ });++ it('moves a row into a sidebar folder from the split it sits in', async () => {+ mocks.moveEntities.mockResolvedValue(undefined);+ const row = doc('row');+ const { start, drop } = setup(+ dragData(row, { splitId: 'folder-split' }),+ FolderRows+ );++ start();+ drop();+ await vi.waitFor(() => expect(mocks.toast.success).toHaveBeenCalled());++ expect(mocks.moveEntities).toHaveBeenCalledTimes(1);+ expect(mocks.moveEntities.mock.calls[0]?.[1]).toEqual({+ id: 'folder',+ name: 'Folder',+ });+ });++ it('skips a sidebar folder that already holds the row', async () => {+ mocks.moveEntities.mockResolvedValue(undefined);+ const held = { ...doc('held'), projectId: 'folder' };+ const { start, drop } = setup(dragData(held, {}), FolderRows);++ start();+ expect(screen.getByTestId('folder').dataset.over).toBe('false');+ expect(screen.getByTestId('other').dataset.over).toBe('true');+ drop();+ await vi.waitFor(() => expect(mocks.toast.success).toHaveBeenCalled());++ expect(mocks.moveEntities.mock.calls[0]?.[1]).toEqual({+ id: 'other',+ name: 'Other',+ });+ });++ it('moves once when a folder pane and sidebar rows share the drag', async () => {+ mocks.moveEntities.mockResolvedValue(undefined);+ const { start, drop } = setup(dragData(doc('row'), {}), () => (+ <>+ <FolderRows />+ <FolderBody />+ </>+ ));++ start();+ drop();+ await vi.waitFor(() => expect(mocks.toast.success).toHaveBeenCalled());++ expect(mocks.moveEntities).toHaveBeenCalledTimes(1);+ });++ it('refuses a drag held as a copy', () => {+ const { start, drop } = setup(dragData(doc('row'), { operation: 'copy' }));++ start();+ expect(screen.queryByText(/to this folder/)).toBeNull();+ drop();++ expect(mocks.moveEntities).not.toHaveBeenCalled();+ });++ it('clears the selection only once the move lands', async () => {+ let finishMove = () => {};+ mocks.moveEntities.mockReturnValue(+ new Promise<void>((resolve) => {+ finishMove = resolve;+ })+ );+ const clear = vi.fn();+ const row = doc('row');+ const { start, drop } = setup(dragData(row, { selected: [row], clear }));++ start();+ drop();+ await vi.waitFor(() => expect(mocks.moveEntities).toHaveBeenCalled());+ expect(clear).not.toHaveBeenCalled();++ finishMove();+ await vi.waitFor(() => expect(clear).toHaveBeenCalled());+ });++ it('keeps a selection made while the move was in flight', async () => {+ let finishMove = () => {};+ mocks.moveEntities.mockReturnValue(+ new Promise<void>((resolve) => {+ finishMove = resolve;+ })+ );+ const clear = vi.fn();+ const row = doc('row');+ let selection = [row];+ const { start, drop } = setup(+ dragData(row, {+ selected: [row],+ currentSelection: () => selection,+ clear,+ })+ );++ start();+ drop();+ await vi.waitFor(() => expect(mocks.moveEntities).toHaveBeenCalled());+ selection = [row, doc('picked-later')];+ finishMove();+ await vi.waitFor(() => expect(mocks.toast.success).toHaveBeenCalled());++ expect(clear).not.toHaveBeenCalled();+ });++ it('leaves another selection alone when an unselected row moves', async () => {+ mocks.moveEntities.mockResolvedValue(undefined);+ const clear = vi.fn();+ const row = doc('row');+ const { start, drop } = setup(+ dragData(row, {+ selected: [row],+ currentSelection: () => [doc('someone-else')],+ clear,+ })+ );++ start();+ drop();+ await vi.waitFor(() => expect(mocks.toast.success).toHaveBeenCalled());++ expect(clear).not.toHaveBeenCalled();+ });++ it('reports a failed move and keeps the selection', async () => {+ mocks.moveEntities.mockRejectedValue(new Error('offline'));+ const clear = vi.fn();+ const row = doc('row');+ const { start, drop } = setup(dragData(row, { selected: [row], clear }));++ start();+ drop();++ await vi.waitFor(() => expect(mocks.toast.failure).toHaveBeenCalled());+ expect(mocks.toast.success).not.toHaveBeenCalled();+ expect(clear).not.toHaveBeenCalled();+ });+});diff --git a/apps/web/src/features/next-soup/actions/folder-drop-zone.tsx b/apps/web/src/features/next-soup/actions/folder-drop-zone.tsxnew file mode 100644index 0000000000..62c2b77337--- /dev/null+++ b/apps/web/src/features/next-soup/actions/folder-drop-zone.tsx@@ -0,0 +1,178 @@+import {+ entitiesToMove,+ indexFolders,+} from '@app/features/entity/bulk-edit/folder-destinations';+import { createMoveEntitiesToFolder } from '@app/features/entity/bulk-edit/move-entities-to-folder';+import { toastMovedToFolder } from '@app/features/entity/bulk-edit/moved-to-folder-toast';+import { t } from '@app/lib/i18n';+import { useSplitPanel } from '@components/app/split-layout/layoutUtils';+import { FileDropOverlay } from '@core/component/FileDropOverlay';+import { toast } from '@core/component/Toast/Toast';+import { useUserId } from '@core/context/user';+import { fireAndForget } from '@core/util/fireAndForget';+import { type EntityData, isEntityDragData } from '@entity';+import { createFolderList } from '@queries/storage/folder-list';+import { createDroppable, useDragDropContext } from '@thisbeyond/solid-dnd';+import {+ type Accessor,+ createContext,+ createMemo,+ createUniqueId,+ onCleanup,+ type ParentProps,+ Show,+ useContext,+} from 'solid-js';+import { makeMoveToProjectAction } from './make-move-to-project-action';++type FolderDropTarget = {+ ref: (element: HTMLElement) => void;+ count: Accessor<number>;+ isOver: Accessor<boolean>;+};++type FolderDropOptions = {+ ownSplitId?: Accessor<string | undefined>;+};++export type CreateFolderDropTarget = (+ folderId: Accessor<string | undefined>,+ options?: FolderDropOptions+) => FolderDropTarget;++/**+ * Drop handling for one surface's folders, under the same rules as Move to+ * folder. Its targets share one folder list and mutation, so a long folder tree+ * costs a droppable per row. Returns undefined outside the app's+ * DragDropProvider, where there is nothing to drag.+ *+ * A target showing a folder's contents passes its split as `ownSplitId`: a row+ * dragged within that split is not a move, as the split already shows where it+ * lives.+ */+export function createFolderDropTargets(): CreateFolderDropTarget | undefined {+ const context = useDragDropContext();+ if (!context) return undefined;+ const [state, { onDragEnd }] = context;++ const folderList = createFolderList();+ const moveEntities = createMoveEntitiesToFolder('folder_drop');+ const moveToProjectAction = makeMoveToProjectAction({ userId: useUserId() });+ const folders = createMemo(() => indexFolders(folderList.folders()));+ const targets = new Map<+ string | number,+ FolderDropOptions & { folderId: Accessor<string | undefined> }+ >();++ const droppableEntities = (+ data: unknown,+ folderId: string | undefined,+ ownSplitId: string | undefined+ ): EntityData[] => {+ if (!folderId || !isEntityDragData(data)) return [];+ if (data.operation() !== 'move') return [];+ if (ownSplitId && data.splitId === ownSplitId) return [];+ const dragged = data.selection?.entities() ?? [data];+ if (!dragged.every(moveToProjectAction.canExecute)) return [];+ return entitiesToMove(dragged, folderId, folders());+ };++ const move = async (+ entities: EntityData[],+ folderId: string,+ clearSelection: () => void+ ) => {+ const name = folders().get(folderId)?.name ?? folderId;+ try {+ await moveEntities(entities, { id: folderId, name });+ clearSelection();+ toastMovedToFolder(entities.length, folderId);+ } catch {+ toast.failure(t('entityActions.toastMoveToFolderFailed'));+ }+ };++ onDragEnd(({ draggable, droppable }) => {+ const data = draggable.data;+ const target = droppable && targets.get(droppable.id);+ const folderId = target?.folderId();+ if (!folderId || !isEntityDragData(data)) return;+ const entities = droppableEntities(data, folderId, target?.ownSplitId?.());+ if (entities.length === 0) return;++ // Read now: the moved rows can leave the list before the server answers.+ const held = new Set(data.selection?.selected().map(({ id }) => id));+ const clearSelection = () => {+ const rowsAdded = data.selection+ ?.selected()+ .some(({ id }) => !held.has(id));+ if (held.has(data.id) && !rowsAdded) data.selection?.clear();+ };+ fireAndForget(move(entities, folderId, clearSelection), 'folder-drop');+ });++ return (folderId, targetOptions) => {+ const count = () =>+ droppableEntities(+ state.active.draggable?.data,+ folderId(),+ targetOptions?.ownSplitId?.()+ ).length;+ const droppableId = `folder-drop:${createUniqueId()}`;+ const droppable = createDroppable(droppableId, {+ isDropTargetDisabled: () => count() === 0,+ });+ targets.set(droppableId, { ...targetOptions, folderId });+ onCleanup(() => targets.delete(droppableId));++ return {+ ref: droppable.ref,+ count,+ isOver: () => droppable.isActiveDroppable && count() > 0,+ };+ };+}++const FolderRowDropTargets = createContext<CreateFolderDropTarget>();++/**+ * A folder row's drop target, in a list inside a `FolderDropZone`. Unlike the+ * zone it accepts rows from its own split, as the row names another folder.+ */+export function createFolderRowDropTarget(+ entity: Accessor<EntityData>+): FolderDropTarget | undefined {+ const createTarget = useContext(FolderRowDropTargets);+ if (!createTarget || entity().type !== 'project') return undefined;+ return createTarget(() => entity().id);+}++/** The body of a split showing a folder: dragged rows dropped here move into it. */+export function FolderDropZone(+ props: ParentProps<{ folderId: string | undefined }>+) {+ const panel = useSplitPanel();+ const createTarget = createFolderDropTargets();+ const target = createTarget?.(() => props.folderId, {+ ownSplitId: () => panel?.handle.id,+ });++ return (+ <div+ ref={(element) => target?.ref(element)}+ class="relative flex size-full min-h-0 min-w-0 flex-col"+ >+ <Show when={target?.isOver()}>+ {/* The pointer passes through, or the overlay would hide folder rows. */}+ <div class="pointer-events-none contents">+ <FileDropOverlay>+ {t('entityActions.dropIntoFolder', { count: target?.count() ?? 0 })}+ </FileDropOverlay>+ </div>+ </Show>+ <FolderRowDropTargets.Provider value={createTarget}>+ {props.children}+ </FolderRowDropTargets.Provider>+ </div>+ );+}diff --git a/apps/web/src/features/next-soup/actions/index.ts b/apps/web/src/features/next-soup/actions/index.tsindex 3cc235b0ed..1f9875dc0f 100644--- a/apps/web/src/features/next-soup/actions/index.ts+++ b/apps/web/src/features/next-soup/actions/index.ts@@ -11,6 +11,11 @@ export {toEntityActionListState,toSingleEntityActionListState,} from './entity-action-context';+export {+ type CreateFolderDropTarget,+ createFolderDropTargets,+ FolderDropZone,+} from './folder-drop-zone';export { makeAddTagAction } from './make-add-tag-action';export { makeArchiveSessionAction } from './make-archive-session-action';export { makeBlockSenderAction } from './make-block-sender-action';diff --git a/apps/web/src/features/next-soup/actions/make-move-to-project-action.ts b/apps/web/src/features/next-soup/actions/make-move-to-project-action.tsindex 387488d67b..73e3d6146c 100644--- a/apps/web/src/features/next-soup/actions/make-move-to-project-action.ts+++ b/apps/web/src/features/next-soup/actions/make-move-to-project-action.ts@@ -1,4 +1,5 @@import { openBulkEditModal } from '@app/features/entity/bulk-edit/BulkEditEntityModal';+import { toastMovedToFolder } from '@app/features/entity/bulk-edit/moved-to-folder-toast';import { t } from '@app/lib/i18n';import { toast } from '@core/component/Toast/Toast';import { fireAndForget } from '@core/util/fireAndForget';@@ -30,13 +31,7 @@ export const makeMoveToProjectAction = (options: MakeMoveToProjectOptions) => {openBulkEditModal({view: 'moveToProject',entities,- onFinish: () => {- toast.success(- entities.length > 1- ? t('entityActions.toastMovedCount', { count: entities.length })- : t('entityActions.toastMovedToFolder')- );- },+ onMoved: (folder) => toastMovedToFolder(entities.length, folder.id),onError: () => toast.failure(t('entityActions.toastMoveToFolderFailed')),});};@@ -52,16 +47,12 @@ export const makeMoveToProjectAction = (options: MakeMoveToProjectOptions) => {openBulkEditModal({view: 'moveToProject',entities,- onFinish: () => {+ onMoved: (folder) => {soup.selection.clear();if (nextRow) {soup.focus.set(nextRow.id);}- toast.success(- entities.length > 1- ? t('entityActions.toastMovedCount', { count: entities.length })- : t('entityActions.toastMovedToFolder')- );+ toastMovedToFolder(entities.length, folder.id);fireAndForget(restoreSoupFocus(nextRow?.id), 'entity-actions');},onError: () => toast.failure(t('entityActions.toastMoveToFolderFailed')),diff --git a/apps/web/src/features/soup/SoupEntityContextMenu.tsx b/apps/web/src/features/soup/SoupEntityContextMenu.tsxindex 9ea054edf0..8aa22fef3a 100644--- a/apps/web/src/features/soup/SoupEntityContextMenu.tsx+++ b/apps/web/src/features/soup/SoupEntityContextMenu.tsx@@ -4,6 +4,7 @@ import type {EntityActionViewContext,} from '@app/features/next-soup/actions';import { makeAddTagAction } from '@app/features/next-soup/actions';+import { createFolderRowDropTarget } from '@app/features/next-soup/actions/folder-drop-zone';import type { MarkDoneDelegate } from '@app/features/next-soup/actions/mark-done-delegate';import {ContextMenuContent,@@ -11,7 +12,11 @@ import {} from '@core/component/ContextMenu';import { touchHandler } from '@core/directive/touchHandler';import { isMobile } from '@core/mobile/isMobile';-import type { EntityData } from '@entity';+import {+ type EntityData,+ type EntityDragSelection,+ EntityDragSelectionContext,+} from '@entity';import { ContextMenu } from '@kobalte/core/context-menu';import type { TreeTag } from '@property/tags/core/tag-tree';import { DroppedTagApplier } from '@property/tags/DroppedTagApplier';@@ -70,6 +75,17 @@ export const SoupEntityContextMenu: FlowComponent<const menuEntities = () =>getSoupMenuEntities(props.entity, props.selectedEntities());+ const dragSelection: EntityDragSelection = {+ entities: menuEntities,+ selected: () => props.selectedEntities(),+ clear: () => props.list.selection.clear(),+ };+ const row = () => (+ <EntityDragSelectionContext.Provider value={dragSelection}>+ {props.children}+ </EntityDragSelectionContext.Provider>+ );+const pickers = createSoupEntityMenuPickers({entity: () => props.entity,entities: menuEntities,@@ -91,6 +107,7 @@ export const SoupEntityContextMenu: FlowComponent<entities: menuEntities().filter(addTagAction.canExecute),}),});+ const folderDropTarget = createFolderRowDropTarget(() => props.entity);return (<Switch>@@ -115,17 +132,20 @@ export const SoupEntityContextMenu: FlowComponent<}));}}>- {props.children}+ {row()}</div></Match><Match when={true}><ContextMenu onOpenChange={props.onOpenChange}><ContextMenuTriggeras={props.as}- ref={(element: HTMLElement) => tagDropTarget?.ref(element)}+ ref={(element: HTMLElement) => {+ tagDropTarget?.ref(element);+ folderDropTarget?.ref(element);+ }}class={cn('h-full w-full group/cm-trigger',- tagDropTarget?.isOver() &&+ (tagDropTarget?.isOver() || folderDropTarget?.isOver()) &&'rounded-xl outline-2 -outline-offset-2 outline-accent',props.class)}@@ -133,7 +153,7 @@ export const SoupEntityContextMenu: FlowComponent<setMenuPosition({ x: event.clientX, y: event.clientY })}>- {props.children}+ {row()}</ContextMenuTrigger><ContextMenu.Portal><Show when={props.entity}>diff --git a/apps/web/src/lib/i18n/locales/en/entity-actions.ts b/apps/web/src/lib/i18n/locales/en/entity-actions.tsindex d7cec0474c..d2961c1462 100644--- a/apps/web/src/lib/i18n/locales/en/entity-actions.ts+++ b/apps/web/src/lib/i18n/locales/en/entity-actions.ts@@ -5,6 +5,7 @@ export default {markNotDone: 'Mark Not Done',markRead: 'Mark Read',markUnread: 'Mark Unread',+ open: 'Open',openInNewSplit: 'Open in new split',openInCurrentSplit: 'Open in current split',openFullscreen: 'Open fullscreen',@@ -195,6 +196,28 @@ export default {other: 'Moved {{count}} items',},toastMoveToFolderFailed: 'Failed to move to folder',+ movePickerTitle: {+ one: 'Move {{count}} item to folder',+ other: 'Move {{count}} items to folder',+ },+ movePickerSearch: 'Search folders or name a new one…',+ movePickerOpenInSplit: 'Open in split',+ movePickerCreatedByYou: 'Created by you',+ movePickerSharedWithYou: 'Shared with you',+ movePickerCreate: 'New folder “{{name}}”',+ movePickerLoading: 'Loading folders…',+ movePickerEmpty: 'No folders yet. Type a name to create one.',+ movePickerMoving: 'Moving…',+ movePickerKeyboardHint: '↑ ↓ to choose · Enter to move · Esc to cancel',+ movePickerTouchHint: 'Tap a folder to move here',+ dragMoreItems: {+ one: '+ {{count}} more item',+ other: '+ {{count}} more items',+ },+ dropIntoFolder: {+ one: 'Move {{count}} item to this folder',+ other: 'Move {{count}} items to this folder',+ },toastRemovedFromFolder: 'Removed from folder',toastRemovedCountFromFolder: {one: 'Removed {{count}} item from folder',diff --git a/apps/web/src/lib/queries/storage/folder-list.ts b/apps/web/src/lib/queries/storage/folder-list.tsnew file mode 100644index 0000000000..3b25b9c7db--- /dev/null+++ b/apps/web/src/lib/queries/storage/folder-list.ts@@ -0,0 +1,40 @@+import {+ enableGraphqlSoup,+ isFeatureEnabled,+} from '@core/constant/featureFlags';+import type { Accessor } from 'solid-js';+import { createGraphqlFoldersQuery } from './graphql-folders';+import { useProjectsQuery } from './projects';++export type FolderRow = {+ id: string;+ name: string;+ parentId?: string | null;+ userId: string;+ createdAt?: string | null;+};++/**+ * Every folder the user can reach, from the same source as the Drive sidebar+ * so a folder open in Drive is always in the list. GraphQL `user.folders`+ * includes team folders; the REST list doesn't.+ */+export function createFolderList(): {+ folders: Accessor<FolderRow[]>;+ isPending: Accessor<boolean>;+} {+ if (isFeatureEnabled(enableGraphqlSoup)) {+ const query = createGraphqlFoldersQuery();+ return {+ folders: () => query.data ?? [],+ isPending: () => query.isPending && !query.data,+ };+ }++ const query = useProjectsQuery();+ return {+ folders: () =>+ query.isSuccess ? query.data.filter((folder) => !folder.deletedAt) : [],+ isPending: () => query.isPending,+ };+}diff --git a/apps/web/src/lib/queries/storage/graphql-folders.ts b/apps/web/src/lib/queries/storage/graphql-folders.tsindex 4a998f0cec..f3a5f79985 100644--- a/apps/web/src/lib/queries/storage/graphql-folders.ts+++ b/apps/web/src/lib/queries/storage/graphql-folders.ts@@ -13,6 +13,7 @@ export type GraphqlDriveFolder = {name: string;parentId: string | null;userId: string;+ createdAt: string;};type GraphqlFoldersQuery = UrqlQueryResult<@@ -31,6 +32,7 @@ function selectFolders(data: DriveFoldersQuery): GraphqlDriveFolder[] {name: folder.name,parentId: folder.parentId ?? null,userId: folder.ownerId,+ createdAt: folder.createdAt,}));}diff --git a/docs/agent-guide/navigation.md b/docs/agent-guide/navigation.mdindex 4f57594dd1..169b685b2e 100644--- a/docs/agent-guide/navigation.md+++ b/docs/agent-guide/navigation.md@@ -801,7 +801,7 @@ Verify first-press dragging after navigation as well as ordinary row clicks andright-click menus. A completed drop can move or copy real data; use a disposabletest item when verifying drop actions.-Split-header, file-upload, and conversation drop targets use plain color+Split-header, folder, file-upload, and conversation drop targets use plain coloroverlays with small sans-serif hints in fully rounded pills. Invalid file dropsuse the failure background color. Cancel the drag to inspect these hints withoutuploading or moving anything.@@ -1535,8 +1535,8 @@ right-click **Mark Done** moves the preview to the next item, like the `e` key.## Entity action dialogs-Rename, Delete, and Move to folder use compact centered dialogs on desktop and-the shared drawer on mobile, with actions in a separated footer. One selected+Rename and Delete use compact centered dialogs on desktop and the shared drawer+on mobile, with actions in a separated footer. One selecteditem shows a compact name chip; multiple items show two chips and`+N`, which expands single-line names for review.Selected-item chips in action command menus and dialogs use the shared Badge,@@ -1556,9 +1556,17 @@ Email snoozing uses a command menu with quick or typed times, **If no reply** /**Regardless**, and **Remove reminder**. Saving waits for confirmation and showsretry errors inline. See [Email reminders](reminders.md).-Action dialogs share `ActionDialogShell` presentation slots: the same capped selection badges for single and multiple items, compact heading and copy, prominent fields, and an attached footer. Rename, delete, move, and shared confirmations use this layout. Bulk rename keeps bubble tabs and one first-item preview.+Action dialogs share `ActionDialogShell` presentation slots: the same capped selection badges for single and multiple items, compact heading and copy, prominent fields, and an attached footer. Rename, delete, and shared confirmations use this layout. Bulk rename keeps bubble tabs and one first-item preview.-The Move to folder picker uses the Drive sidebar’s folder rows: neutral icons, trailing expand/collapse buttons, and indented branch guides. Click a folder to select it; use the chevron to expand it. Search and arrow-key navigation remain available.+The Move to folder picker is a command menu, like Snooze, over the same folder list as the Drive sidebar. Folders are a flat list with their parent path: **Open in split** (Drive folders and folder splits, in split order, first row selected), **Created by you**, then **Shared with you**, each newest first. It leaves out folders that already hold every item and, for a moved folder, the folder itself and everything under it. Enter or a click moves at once. Typing ranks by name like Cmd+K and adds **New folder “name”** unless a folder has that name; choosing it creates the folder and moves the items into it. Phones show the same list in the drawer with the path under the name.++### Dragging rows into a folder++On desktop, a split showing a folder (Drive's folder route or a folder split) accepts rows dragged from another split and moves them with the same mutation as the picker. Dragging a selected row carries the whole selection, the drag card counts it, and a successful move clears that selection; a failed one keeps it for a retry. Dragging an unselected row carries only that row. The pane shows **Move N items to this folder** only when the drop would work: every row passes Move to folder's owner and type rules, at least one row isn't already there, no folder would land inside itself, the row didn't start in that split, and Alt isn't held, since that marks the drag as a copy. The header still offers **Open in this split**. Other drop targets (composers, documents, canvases) still take only the grabbed row.++Folders in Drive's sidebar take the same drops, outlined while hovered, including rows from the list beside them in the same split. So do folder rows in Drive's lists and in a folder's own list; a row takes the drop ahead of the pane around it, so a drop lands in the row's folder, not the one the pane shows. Held at the sidebar's edge, a drag scrolls a long folder tree. The drag card sits beside the pointer so a narrow target stays visible. Drive's root row is not a drop target.++Every move, from the picker or a drop, ends in a **Moved to folder** or **Moved N items** toast with **Open** and, on desktop with room for another split, **Open in new split**. Either action dismisses the toast and shows the folder on Drive's route; if a split already lists that folder, it focuses that split instead of opening a second copy. A split with an item open inside the folder doesn't count, because the folder's list isn't visible there. Touch devices have no splits, so they show only **Open**.### Native update-required dialog