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): folder composer for create->folder (#7726)
Seamus138b056ca56c
diff --git a/apps/web/src/components/app/split-layout/componentRegistry.tsx b/apps/web/src/components/app/split-layout/componentRegistry.tsxindex 06bfa2aa72..eed660910c 100644--- a/apps/web/src/components/app/split-layout/componentRegistry.tsx+++ b/apps/web/src/components/app/split-layout/componentRegistry.tsx@@ -81,6 +81,10 @@ const SearchRouteView = lazyNamed(() => import('@app/features/next-soup/route-views'),'SearchRouteView');+const FolderComposeView = lazyNamed(+ () => import('@app/features/drive-view/folder-compose-view'),+ 'FolderComposeView'+);const CreateProjectView = lazyNamed(() => import('@app/features/projects/project-view'),'CreateProjectView'@@ -264,6 +268,9 @@ const GatedCreateProjectView = (registerComponent('new-project', withAuth(GatedCreateProjectView), {splitPanelLayout: 'composable',});+registerComponent('folder-compose', withAuth(FolderComposeView), {+ splitPanelLayout: 'composable',+});registerComponent('project-compose', withAuth(GatedCreateProjectView), {splitPanelLayout: 'composable',});diff --git a/apps/web/src/features/command/Launcher.test.tsx b/apps/web/src/features/command/Launcher.test.tsxindex 335eede692..d376af46af 100644--- a/apps/web/src/features/command/Launcher.test.tsx+++ b/apps/web/src/features/command/Launcher.test.tsx@@ -149,23 +149,19 @@ it('offers Project in the shared create menu and opens its native composer', ()expect(host.createFolder).not.toHaveBeenCalled();});-it('keeps the existing Folder action separate from Project creation', async () => {+it('opens the Folder composer without creating a folder immediately', () => {const folder = CREATABLE_BLOCKS.find((item) => item.label === 'Folder');expect(folder).toBeDefined();- if (!folder) return;- host.createFolder.mockResolvedValueOnce('folder-id');- folder.keyDownHandler();-- await vi.waitFor(() => {- expect(host.openWithSplit).toHaveBeenCalledExactlyOnceWith(- { type: 'project', id: 'folder-id' },- { referredFrom: 'launcher', preferNewSplit: false }- );- });- expect(host.createFolder).toHaveBeenCalledExactlyOnceWith({- name: 'New Folder',- source: 'create_menu',- parentId: undefined,+ folder?.keyDownHandler();+ expect(host.popoverSplit).toHaveBeenCalledExactlyOnceWith({+ type: 'component',+ id: 'folder-compose',+ params: {+ parentId: undefined,+ destination: undefined,+ source: 'create_menu',+ },});- expect(host.popoverSplit).not.toHaveBeenCalled();+ expect(host.createFolder).not.toHaveBeenCalled();+ expect(host.openWithSplit).not.toHaveBeenCalled();});diff --git a/apps/web/src/features/command/Launcher.tsx b/apps/web/src/features/command/Launcher.tsxindex 54cc047249..a28e7e94e3 100644--- a/apps/web/src/features/command/Launcher.tsx+++ b/apps/web/src/features/command/Launcher.tsx@@ -58,7 +58,6 @@ import MagnifyingGlassIcon from '@phosphor/magnifying-glass.svg';import PlusIcon from '@phosphor/plus.svg';import { createDatabase } from '@queries/storage/databases';import { createForm } from '@queries/storage/forms';-import { createProject } from '@queries/storage/projects';import { makePersisted } from '@solid-primitives/storage';import { useNavigate } from '@solidjs/router';import {@@ -266,7 +265,12 @@ const createComponent = async (spec: {export function runCreateAction(blockName: CreatableName,- options: { shouldInsert?: boolean; source?: string; projectId?: string } = {}+ options: {+ shouldInsert?: boolean;+ source?: string;+ projectId?: string;+ destination?: string;+ } = {}) {const shouldInsert = options.shouldInsert ?? false;// Creation analytics fire at the data-layer chokepoints (create.ts /@@ -434,15 +438,14 @@ export function runCreateAction(});return;case 'project':- createBlock({- blockName: 'project',- createFn: () =>- createProject({- name: 'New Folder',- source,- parentId: options.projectId,- }),- shouldInsert,+ createComponent({+ componentId: 'folder-compose',+ asPopover: true,+ params: {+ parentId: options.projectId,+ destination: options.destination,+ source,+ },});return;case 'database':diff --git a/apps/web/src/features/drive-view/components/folder-composer.tsx b/apps/web/src/features/drive-view/components/folder-composer.tsxnew file mode 100644index 0000000000..e6f8549477--- /dev/null+++ b/apps/web/src/features/drive-view/components/folder-composer.tsx@@ -0,0 +1,236 @@+import { fileFolderDrop } from '@core/directive/fileFolderDrop';+import ArrowsOutIcon from '@phosphor/arrows-out.svg';+import FileIcon from '@phosphor/file.svg';+import FolderIcon from '@phosphor/folder.svg';+import UploadIcon from '@phosphor/upload-simple.svg';+import XIcon from '@phosphor/x.svg';+import { Button, EntityComposer } from '@ui';+import { createSignal, For, type JSX, Show } from 'solid-js';+import type { FolderUpload } from '../core/folder-composer';++false && fileFolderDrop;++export function FolderComposer(props: {+ name: string;+ destination: string;+ files: FolderUpload[];+ showUploads?: boolean;+ tags: JSX.Element;+ busy: boolean;+ preparing: boolean;+ created: boolean;+ error?: string;+ onName(value: string): void;+ onRemove(file: FolderUpload): void;+ onFiles(): void;+ onFolder(): void;+ onDrop(+ files: FileSystemFileEntry[],+ folders: FileSystemDirectoryEntry[]+ ): void;+ onClear(): void;+ onClose(): void;+ onExpand?(): void;+ onSubmit(): void;+}) {+ const [dragging, setDragging] = createSignal(false);+ let nameInput: HTMLInputElement | undefined;+ return (+ <form+ class="h-full min-h-0"+ aria-label="New folder"+ aria-busy={props.busy}+ onSubmit={(event) => {+ event.preventDefault();+ props.onSubmit();+ }}+ onKeyDown={(event) => {+ if (+ event.key === 'Enter' &&+ (event.metaKey || event.ctrlKey) &&+ !event.isComposing+ ) {+ event.preventDefault();+ event.stopPropagation();+ props.onSubmit();+ }+ }}+ >+ <EntityComposer.Root>+ <EntityComposer.Header>+ <div class="flex-1 flex items-center">+ <Show when={props.onExpand}>+ <Button+ tabIndex={-1}+ size="icon-composer"+ aria-label="Continue editing in split"+ tooltip="Continue editing in split"+ disabled={props.busy}+ onClick={props.onExpand}+ >+ <ArrowsOutIcon />+ </Button>+ </Show>+ </div>+ <Show when={!props.created}>+ <Button+ tabIndex={-1}+ size="sm"+ variant="outline"+ depth={3}+ disabled={props.busy}+ onClick={() => {+ props.onClear();+ nameInput?.focus();+ }}+ >+ Clear Draft+ </Button>+ </Show>+ <Button+ tabIndex={-1}+ size="icon-composer"+ aria-label="Close"+ tooltip="Close"+ disabled={props.busy}+ onClick={props.onClose}+ >+ <XIcon />+ </Button>+ </EntityComposer.Header>+ <EntityComposer.Main class="gap-4">+ <EntityComposer.Title class="mb-0">+ <input+ ref={nameInput}+ autofocus+ aria-label="Folder name"+ placeholder="Folder name"+ required+ class="ph-no-capture w-full min-w-0 text-xl/7 font-medium outline-none bg-transparent placeholder:text-ink-placeholder"+ value={props.name}+ disabled={props.busy || props.created}+ onInput={(event) => props.onName(event.currentTarget.value)}+ />+ </EntityComposer.Title>+ <fieldset+ disabled={props.busy || props.created}+ class="px-2 disabled:pointer-events-none disabled:opacity-60"+ >+ <EntityComposer.Properties>{props.tags}</EntityComposer.Properties>+ </fieldset>+ <Show when={props.showUploads !== false}>+ <div+ class="mx-2 flex min-h-60 flex-1 flex-col overflow-auto rounded-lg border border-dashed border-edge-muted p-4"+ classList={{ 'bg-hover': dragging() }}+ use:fileFolderDrop={{+ disabled: props.busy,+ onDrop: props.onDrop,+ onDragStart: setDragging,+ onDragEnd: () => setDragging(false),+ }}+ >+ <div class="flex min-h-44 flex-1 flex-col items-center justify-center gap-3 text-center">+ <UploadIcon class="size-8 text-ink-extra-muted" />+ <div>+ <p class="text-sm text-ink">+ Drop files or nested folders here+ </p>+ <p class="mt-1 text-xs text-ink-muted">+ Add everything you want inside this folder.+ </p>+ </div>+ <div class="flex flex-wrap justify-center gap-2">+ <Button+ size="sm"+ variant="outline"+ disabled={props.busy}+ onClick={props.onFiles}+ >+ Add files+ </Button>+ <Button+ size="sm"+ variant="outline"+ disabled={props.busy}+ onClick={props.onFolder}+ >+ Add folder+ </Button>+ </div>+ <Show when={props.preparing}>+ <p role="status" class="text-xs text-ink-muted">+ Preparing files…+ </p>+ </Show>+ </div>+ <Show when={props.files.length}>+ <ul+ aria-label="Folder contents"+ class="mt-4 flex flex-col gap-1 border-t border-edge-muted pt-3"+ >+ <For each={props.files}>+ {(entry) => (+ <li class="flex min-w-0 items-center gap-2 text-sm">+ <Show+ when={entry.isFolder}+ fallback={+ <FileIcon class="size-4 shrink-0 text-ink-muted" />+ }+ >+ <FolderIcon class="size-4 shrink-0 text-ink-muted" />+ </Show>+ <span+ class="min-w-0 flex-1 truncate"+ title={entry.file.name}+ >+ {entry.isFolder+ ? entry.file.name.replace(/\.zip$/, '')+ : entry.file.name}+ </span>+ <Button+ size="icon-sm"+ aria-label={`Remove ${entry.file.name}`}+ tooltip="Remove"+ disabled={props.busy}+ onClick={() => props.onRemove(entry)}+ >+ <XIcon />+ </Button>+ </li>+ )}+ </For>+ </ul>+ </Show>+ </div>+ </Show>+ </EntityComposer.Main>+ <Show when={props.error}>+ <p role="alert" class="px-2 text-sm text-failure">+ {props.error}+ </p>+ </Show>+ <EntityComposer.Footer class="items-center">+ <span class="flex min-w-0 items-center gap-1.5 px-2 text-xs text-ink-muted">+ <FolderIcon class="size-4 shrink-0" />+ <span class="truncate" title={props.destination}>+ Inside {props.destination}+ </span>+ </span>+ <EntityComposer.Submit+ type="submit"+ hasContent={!!props.name.trim()}+ disabled={props.busy || !props.name.trim()}+ >+ {props.busy+ ? props.preparing+ ? 'Preparing…'+ : 'Creating…'+ : props.created+ ? 'Retry'+ : 'Create Folder'}+ </EntityComposer.Submit>+ </EntityComposer.Footer>+ </EntityComposer.Root>+ </form>+ );+}diff --git a/apps/web/src/features/drive-view/components/new-folder-dialog.tsx b/apps/web/src/features/drive-view/components/new-folder-dialog.tsxdeleted file mode 100644index e343700f53..0000000000--- a/apps/web/src/features/drive-view/components/new-folder-dialog.tsx+++ /dev/null@@ -1,101 +0,0 @@-import FolderIcon from '@phosphor/folder.svg';-import { ActionDialogShell, Button, Dialog, TextField } from '@ui';-import { createSignal, Show } from 'solid-js';--export const DEFAULT_NEW_FOLDER_NAME = 'Untitled folder';--/** Names a folder before it is created inside `destination`. */-export function NewFolderDialog(props: {- /** Name of the folder the new one is created in. */- destination: string;- onOpenChange(open: boolean): void;- /** Resolves once the folder exists; rejects to keep the dialog open. */- onCreate(name: string): Promise<void>;-}) {- const [value, setValue] = createSignal(DEFAULT_NEW_FOLDER_NAME);- const [pending, setPending] = createSignal(false);- const [failed, setFailed] = createSignal(false);- const name = () => value().trim();- const canSubmit = () => !pending() && name().length > 0;-- const submit = async (event: SubmitEvent) => {- event.preventDefault();- if (!canSubmit()) return;- setPending(true);- setFailed(false);- try {- await props.onCreate(name());- props.onOpenChange(false);- } catch (error) {- console.error('Failed to create folder', error);- setFailed(true);- } finally {- setPending(false);- }- };-- return (- <Dialog- open- onOpenChange={(open) => {- if (!pending()) props.onOpenChange(open);- }}- position="center"- class="w-110"- visibleScrim- >- <ActionDialogShell>- <form- class="flex min-h-0 flex-col"- aria-busy={pending()}- onSubmit={(event) => void submit(event)}- >- <ActionDialogShell.Body>- <ActionDialogShell.Header>- <ActionDialogShell.Title>New folder</ActionDialogShell.Title>- <ActionDialogShell.Description class="flex min-w-0 items-center gap-1.5">- <span class="shrink-0">Inside</span>- <FolderIcon aria-hidden="true" class="size-4 shrink-0" />- <span class="min-w-0 truncate font-medium text-ink">- {props.destination}- </span>- </ActionDialogShell.Description>- </ActionDialogShell.Header>- <TextField value={value()} onChange={setValue}>- <TextField.Label>Name</TextField.Label>- <TextField.Input- placeholder="Folder name"- readOnly={pending()}- onFocus={(event) => event.currentTarget.select()}- />- </TextField>- <Show when={failed()}>- <p role="alert" class="text-sm text-failure">- Could not create the folder. Please try again.- </p>- </Show>- </ActionDialogShell.Body>- <ActionDialogShell.Footer>- <Button- type="button"- variant="ghost"- depth={2}- disabled={pending()}- onClick={() => props.onOpenChange(false)}- >- Cancel- </Button>- <Button- type="submit"- variant="strong"- depth={2}- disabled={!canSubmit()}- >- {pending() ? 'Creating…' : 'Create'}- </Button>- </ActionDialogShell.Footer>- </form>- </ActionDialogShell>- </Dialog>- );-}diff --git a/apps/web/src/features/drive-view/core/folder-composer.ts b/apps/web/src/features/drive-view/core/folder-composer.tsnew file mode 100644index 0000000000..9dffd32bc4--- /dev/null+++ b/apps/web/src/features/drive-view/core/folder-composer.ts@@ -0,0 +1,23 @@+export type FolderUpload = { file: File; isFolder: boolean };++export type FolderDraft = {+ name: string;+ tags: Record<string, string[]>;+ files: FolderUpload[];+ createdId?: string;+ error?: string;+};++export type FolderCreationCommands = {+ create(name: string): Promise<string>;+ saveTags(id: string, tags: Record<string, string[]>): Promise<void>;+ upload(id: string, file: FolderUpload): Promise<void>;+};++/** Owned by the host after it dismisses the submitted composer. */+export type FolderSubmission = {+ result: Promise<+ | { type: 'created'; id: string; name: string }+ | { type: 'failed'; draft: FolderDraft }+ >;+};diff --git a/apps/web/src/features/drive-view/drive-create-menu.test.tsx b/apps/web/src/features/drive-view/drive-create-menu.test.tsxindex 384b535e76..687dee81a0 100644--- a/apps/web/src/features/drive-view/drive-create-menu.test.tsx+++ b/apps/web/src/features/drive-view/drive-create-menu.test.tsx@@ -1,18 +1,10 @@-import {- cleanup,- fireEvent,- render,- screen,- waitFor,-} from '@solidjs/testing-library';+import { cleanup, fireEvent, render, screen } from '@solidjs/testing-library';import { createSignal, type ParentProps } from 'solid-js';import { afterEach, beforeEach, expect, it, vi } from 'vitest';import { DriveCreateMenu } from './drive-create-menu';const host = vi.hoisted(() => ({runCreateAction: vi.fn(),- createProject: vi.fn(),- toastSuccess: vi.fn(),selectFolder: vi.fn(),}));@@ -39,12 +31,6 @@ vi.mock('@app/features/command/Launcher', () => ({runCreateAction: host.runCreateAction,useCreatableEnabled: () => () => true,}));-vi.mock('@core/component/Toast/Toast', () => ({- toast: { success: host.toastSuccess },-}));-vi.mock('@queries/storage/projects', () => ({- createProject: host.createProject,-}));vi.mock('./context/drive-context', () => ({useDriveView: () => ({state: { projectId, selectFolder: host.selectFolder },@@ -60,7 +46,6 @@ vi.mock('./context/drive-context', () => ({beforeEach(() => {setProjectId('child');- host.createProject.mockResolvedValue('new-folder');});afterEach(() => {@@ -93,57 +78,25 @@ it('creates files inside the open folder', async () => {expect(host.runCreateAction).toHaveBeenCalledWith('md', {projectId: 'child',source: 'drive',+ destination: 'Wireframes',});});-it('names a new folder and creates it inside the open folder', async () => {+it('opens a folder composer inside the current folder', async () => {await openMenu();fireEvent.keyDown(screen.getByRole('menuitem', { name: 'Folder' }), {key: 'Enter',});-- const dialog = await screen.findByRole('dialog');- expect(dialog.textContent).toContain('Wireframes');-- fireEvent.input(screen.getByLabelText('Name'), {- target: { value: ' Sketches ' },- });- fireEvent.click(screen.getByRole('button', { name: 'Create' }));-- await waitFor(() =>- expect(host.createProject).toHaveBeenCalledWith({- name: 'Sketches',- parentId: 'child',- source: 'drive',- })- );- expect(host.runCreateAction).not.toHaveBeenCalled();- await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull());- expect(host.toastSuccess).toHaveBeenCalledWith(- 'Created “Sketches”',- expect.objectContaining({ subtext: 'In Wireframes' })- );-});--it('keeps the dialog open when the folder is not created', async () => {- host.createProject.mockResolvedValue(undefined);- vi.spyOn(console, 'error').mockImplementation(() => {});-- await openMenu();- fireEvent.keyDown(screen.getByRole('menuitem', { name: 'Folder' }), {- key: 'Enter',+ expect(host.runCreateAction).toHaveBeenCalledWith('project', {+ projectId: 'child',+ source: 'drive',+ destination: 'Wireframes',});- await screen.findByRole('dialog');- fireEvent.click(screen.getByRole('button', { name: 'Create' }));-- expect(await screen.findByRole('alert')).toBeTruthy();- expect(screen.getByRole('dialog')).toBeTruthy();});-it('creates at the Drive root outside a folder', async () => {+it('opens a folder composer at the Drive root outside a folder', async () => {setProjectId(undefined);render(() => <DriveCreateMenu />);-fireEvent.keyDown(screen.getByRole('button', { name: 'New file or folder in Drive' }),{ key: 'Enter' }@@ -152,14 +105,9 @@ it('creates at the Drive root outside a folder', async () => {fireEvent.keyDown(screen.getByRole('menuitem', { name: 'Folder' }), {key: 'Enter',});- await screen.findByRole('dialog');- fireEvent.click(screen.getByRole('button', { name: 'Create' }));-- await waitFor(() =>- expect(host.createProject).toHaveBeenCalledWith({- name: 'Untitled folder',- parentId: undefined,- source: 'drive',- })- );+ expect(host.runCreateAction).toHaveBeenCalledWith('project', {+ projectId: undefined,+ source: 'drive',+ destination: 'Drive',+ });});diff --git a/apps/web/src/features/drive-view/drive-create-menu.tsx b/apps/web/src/features/drive-view/drive-create-menu.tsxindex 1d2a8ad7cc..f4597a372d 100644--- a/apps/web/src/features/drive-view/drive-create-menu.tsx+++ b/apps/web/src/features/drive-view/drive-create-menu.tsx@@ -5,16 +5,13 @@ import {runCreateAction,useCreatableEnabled,} from '@app/features/command/Launcher';-import { toast } from '@core/component/Toast/Toast';import CaretDownIcon from '@phosphor/caret-down.svg';import FolderIcon from '@phosphor/folder.svg';import PlusIcon from '@phosphor/plus.svg';import UploadIcon from '@phosphor/upload-simple.svg';-import { createProject } from '@queries/storage/projects';import { Dropdown } from '@ui';-import { createSignal, For, Show } from 'solid-js';+import { For } from 'solid-js';import { Dynamic } from 'solid-js/web';-import { NewFolderDialog } from './components/new-folder-dialog';import { useDriveView } from './context/drive-context';import { driveCreateDestinationLabel } from './core/location-label';@@ -24,11 +21,6 @@ export function DriveCreateMenu() {const isEnabled = useCreatableEnabled();- const [newFolderDestination, setNewFolderDestination] = createSignal<{- projectId: string | undefined;- label: string;- }>();-const destination = () =>driveCreateDestinationLabel(state.projectId(), sidebar.folders());@@ -52,100 +44,61 @@ export function DriveCreateMenu() {);const select = (blockName: CreatableName) => {- // As in Google Drive, a folder is named first and then appears in the- // open folder instead of navigating away from it.- if (blockName === 'project') {- setNewFolderDestination({- projectId: state.projectId(),- label: destination(),- });- return;- }-runCreateAction(blockName, {projectId: state.projectId(),source: 'drive',- });- };-- const createFolder = async (- name: string,- target: { projectId: string | undefined; label: string }- ) => {- const id = await createProject({- name,- parentId: target.projectId,- source: 'drive',- });- if (!id) throw new Error('Folder was not created');-- toast.success(`Created “${name}”`, {- subtext: `In ${target.label}`,- actions: [{ label: 'Open', onClick: () => state.selectFolder(id) }],+ destination: destination(),});};return (- <>- <Dropdown placement="bottom-start">- <Dropdown.Trigger- as={ViewSidebar.Action}- aria-label={`New file or folder in ${destination()}`}- >- <ViewSidebar.Icon>- <PlusIcon class="size-4" />- </ViewSidebar.Icon>- <span class="truncate">New</span>- <ViewSidebar.Trailing>- <CaretDownIcon class="size-3 shrink-0" />- </ViewSidebar.Trailing>- </Dropdown.Trigger>- <Dropdown.Content class="min-w-48 max-w-72">- <Dropdown.Group>- <Dropdown.GroupLabel class="min-w-0 gap-1.5">- <span class="shrink-0">Create in</span>- <FolderIcon aria-hidden="true" class="size-3.5 shrink-0" />- <span class="min-w-0 truncate font-medium text-ink-muted">- {destination()}- </span>- </Dropdown.GroupLabel>- <For each={options()}>- {(option) => (- <Dropdown.Item onSelect={() => select(option.blockName)}>- <span- aria-hidden="true"- class="flex size-4 shrink-0 items-center justify-center [&_svg]:size-4"- >- <Dynamic component={option.icon} />- </span>- <span>{option.label}</span>- </Dropdown.Item>- )}- </For>- </Dropdown.Group>- <Dropdown.Group>- <Dropdown.Item onSelect={actions.uploadFiles}>- <UploadIcon aria-hidden="true" class="size-4 shrink-0" />- <span>Upload files</span>- </Dropdown.Item>- <Dropdown.Item onSelect={actions.uploadFolder}>- <FolderIcon aria-hidden="true" class="size-4 shrink-0" />- <span>Upload folder</span>- </Dropdown.Item>- </Dropdown.Group>- </Dropdown.Content>- </Dropdown>- <Show when={newFolderDestination()} keyed>- {(target) => (- <NewFolderDialog- destination={target.label}- onOpenChange={(open) => {- if (!open) setNewFolderDestination(undefined);- }}- onCreate={(name) => createFolder(name, target)}- />- )}- </Show>- </>+ <Dropdown placement="bottom-start">+ <Dropdown.Trigger+ as={ViewSidebar.Action}+ aria-label={`New file or folder in ${destination()}`}+ >+ <ViewSidebar.Icon>+ <PlusIcon class="size-4" />+ </ViewSidebar.Icon>+ <span class="truncate">New</span>+ <ViewSidebar.Trailing>+ <CaretDownIcon class="size-3 shrink-0" />+ </ViewSidebar.Trailing>+ </Dropdown.Trigger>+ <Dropdown.Content class="min-w-48 max-w-72">+ <Dropdown.Group>+ <Dropdown.GroupLabel class="min-w-0 gap-1.5">+ <span class="shrink-0">Create in</span>+ <FolderIcon aria-hidden="true" class="size-3.5 shrink-0" />+ <span class="min-w-0 truncate font-medium text-ink-muted">+ {destination()}+ </span>+ </Dropdown.GroupLabel>+ <For each={options()}>+ {(option) => (+ <Dropdown.Item onSelect={() => select(option.blockName)}>+ <span+ aria-hidden="true"+ class="flex size-4 shrink-0 items-center justify-center [&_svg]:size-4"+ >+ <Dynamic component={option.icon} />+ </span>+ <span>{option.label}</span>+ </Dropdown.Item>+ )}+ </For>+ </Dropdown.Group>+ <Dropdown.Group>+ <Dropdown.Item onSelect={actions.uploadFiles}>+ <UploadIcon aria-hidden="true" class="size-4 shrink-0" />+ <span>Upload files</span>+ </Dropdown.Item>+ <Dropdown.Item onSelect={actions.uploadFolder}>+ <FolderIcon aria-hidden="true" class="size-4 shrink-0" />+ <span>Upload folder</span>+ </Dropdown.Item>+ </Dropdown.Group>+ </Dropdown.Content>+ </Dropdown>);}diff --git a/apps/web/src/features/drive-view/folder-compose-view.test.tsx b/apps/web/src/features/drive-view/folder-compose-view.test.tsxnew file mode 100644index 0000000000..803e9fb9a7--- /dev/null+++ b/apps/web/src/features/drive-view/folder-compose-view.test.tsx@@ -0,0 +1,96 @@+import { cleanup, fireEvent, render, waitFor } from '@solidjs/testing-library';+import type { ParentProps } from 'solid-js';+import { afterEach, expect, it, vi } from 'vitest';+import type { FolderSubmission } from './core/folder-composer';++const host = vi.hoisted(() => ({+ close: vi.fn(),+ popoverSplit: vi.fn(),+ openWithSplit: vi.fn(),+ success: vi.fn(),+ failure: vi.fn(),+ submission: undefined as FolderSubmission | undefined,+}));+vi.mock('@components/app/split-layout/layout', () => ({+ useSplitLayout: () => host,+}));+vi.mock('@components/app/split-layout/layoutUtils', () => ({+ useSplitPanelOrThrow: () => ({+ handle: {+ close: host.close,+ isPopover: () => true,+ setDisplayName: vi.fn(),+ },+ }),+}));+vi.mock('@components/app/split-panel', () => ({+ SplitPanel: {+ Root: (props: ParentProps) => props.children,+ Body: (props: ParentProps) => props.children,+ },+}));+vi.mock('@core/component/Toast/Toast', () => ({+ toast: { success: host.success, failure: host.failure },+}));+vi.mock('./queries/folder-creation', () => ({+ createFolderCommands: () => ({}),+}));+vi.mock('./views/create-folder', () => ({+ CreateFolder: (props: { onSubmit(submission: FolderSubmission): void }) => (+ <button onClick={() => props.onSubmit(host.submission!)}>Confirm</button>+ ),+}));++import { FolderComposeView } from './folder-compose-view';++afterEach(() => {+ cleanup();+ vi.clearAllMocks();+});++function submit() {+ const completion =+ Promise.withResolvers<Awaited<FolderSubmission['result']>>();+ host.submission = { result: completion.promise };+ const view = render(() => (+ <FolderComposeView parentId="parent" destination="Design" source="drive" />+ ));+ fireEvent.click(view.getByRole('button', { name: 'Confirm' }));+ expect(host.close).toHaveBeenCalledOnce();+ expect(host.success).not.toHaveBeenCalled();+ view.unmount();+ return completion;+}++it('closes before the result and never closes a later composer when the upload completes', async () => {+ const completion = submit();+ completion.resolve({ type: 'created', id: 'folder', name: 'Assets' });+ await waitFor(() => expect(host.success).toHaveBeenCalledOnce());+ expect(host.close).toHaveBeenCalledOnce();+ expect(host.openWithSplit).not.toHaveBeenCalled();+});++it('offers retry after failure with the original destination and unfinished draft', async () => {+ const completion = submit();+ const draft = {+ name: 'Assets',+ tags: { tags: ['blue'] },+ files: [{ file: new File(['test'], 'brief.txt'), isFolder: false }],+ createdId: 'folder',+ error: 'Upload failed',+ };+ completion.resolve({ type: 'failed', draft });+ await waitFor(() => expect(host.failure).toHaveBeenCalledOnce());+ expect(host.popoverSplit).not.toHaveBeenCalled();+ host.failure.mock.calls[0][1].actions[0].onClick();+ expect(host.popoverSplit).toHaveBeenCalledWith({+ type: 'component',+ id: 'folder-compose',+ params: {+ parentId: 'parent',+ destination: 'Design',+ source: 'drive',+ initialDraft: draft,+ },+ });+});diff --git a/apps/web/src/features/drive-view/folder-compose-view.tsx b/apps/web/src/features/drive-view/folder-compose-view.tsxnew file mode 100644index 0000000000..7466dd58d9--- /dev/null+++ b/apps/web/src/features/drive-view/folder-compose-view.tsx@@ -0,0 +1,110 @@+import { useSplitLayout } from '@components/app/split-layout/layout';+import { useSplitPanelOrThrow } from '@components/app/split-layout/layoutUtils';+import { SplitPanel } from '@components/app/split-panel';+import { toast } from '@core/component/Toast/Toast';+import { isTouchDevice } from '@core/mobile/isTouchDevice';+import { onMount, Suspense } from 'solid-js';+import type { FolderDraft, FolderSubmission } from './core/folder-composer';+import { createFolderCommands } from './queries/folder-creation';+import { CreateFolder } from './views/create-folder';++type FolderComposeProps = {+ parentId?: string;+ destination?: string;+ source?: string;+ initialDraft?: FolderDraft;+};++async function settleFolderSubmission(+ submission: FolderSubmission,+ options: FolderComposeProps,+ layout: Pick<+ ReturnType<typeof useSplitLayout>,+ 'popoverSplit' | 'openWithSplit'+ >+) {+ const outcome = await submission.result;+ if (outcome.type === 'failed') {+ toast.failure(+ outcome.draft.error ?? 'Could not finish creating the folder.',+ {+ actions: [+ {+ label: 'Retry',+ onClick: () => {+ layout.popoverSplit({+ type: 'component',+ id: 'folder-compose',+ params: { ...options, initialDraft: outcome.draft },+ });+ },+ },+ ],+ }+ );+ return;+ }+ toast.success(`Created “${outcome.name}”`, {+ actions: [+ {+ label: 'Open',+ onClick: () => {+ layout.openWithSplit({ type: 'project', id: outcome.id });+ },+ },+ ],+ });+}++export function FolderComposeView(props: FolderComposeProps) {+ const layout = useSplitLayout();+ const panel = useSplitPanelOrThrow();+ const commands = createFolderCommands({+ parentId: props.parentId,+ source: props.source,+ });+ onMount(() => panel.handle.setDisplayName('New folder'));+ const close = () => panel.handle.close();+ return (+ <SplitPanel.Root class="bg-transparent">+ <SplitPanel.Body>+ <Suspense>+ <CreateFolder+ commands={commands}+ showUploads={!isTouchDevice()}+ destination={+ props.destination ??+ (props.parentId ? 'Selected folder' : 'Drive')+ }+ initialDraft={props.initialDraft}+ onClose={close}+ onExpand={+ panel.handle.isPopover()+ ? (initialDraft) => {+ layout.openWithSplit(+ {+ type: 'component',+ id: 'folder-compose',+ params: { ...props, initialDraft },+ },+ { preferNewSplit: true }+ );+ close();+ }+ : undefined+ }+ onSubmit={(submission) => {+ const options = {+ parentId: props.parentId,+ destination: props.destination,+ source: props.source,+ };+ close();+ void settleFolderSubmission(submission, options, layout);+ }}+ />+ </Suspense>+ </SplitPanel.Body>+ </SplitPanel.Root>+ );+}diff --git a/apps/web/src/features/drive-view/primitives/folder-composer.test.ts b/apps/web/src/features/drive-view/primitives/folder-composer.test.tsnew file mode 100644index 0000000000..a1fa356d66--- /dev/null+++ b/apps/web/src/features/drive-view/primitives/folder-composer.test.ts@@ -0,0 +1,164 @@+import { createRoot } from 'solid-js';+import { describe, expect, it, vi } from 'vitest';+import { createFolderComposer } from './folder-composer';++function setup() {+ const commands = {+ create: vi.fn(async (_name: string) => 'folder-id'),+ saveTags: vi.fn(async (_id: string, _tags: Record<string, string[]>) => {}),+ upload: vi.fn(+ async (_id: string, _file: { file: File; isFolder: boolean }) => {}+ ),+ };+ const composer = createRoot(() => createFolderComposer(commands));+ return { commands, composer };+}++const upload = (name: string, isFolder = false) => ({+ file: new File(['test'], name),+ isFolder,+});++describe('folder composer', () => {+ it('stages contents and tags without creating anything until submit', async () => {+ const { composer, commands } = setup();+ const file = upload('brief.txt');+ const folder = upload('Assets.zip', true);+ composer.setName(' Design ');+ composer.setTags({ tags: ['blue'] });+ composer.addFiles([file, folder]);+ expect(commands.create).not.toHaveBeenCalled();+ expect(await composer.submit()?.result).toEqual({+ type: 'created',+ id: 'folder-id',+ name: 'Design',+ });+ expect(commands.create).toHaveBeenCalledWith('Design');+ expect(commands.saveTags).toHaveBeenCalledWith('folder-id', {+ tags: ['blue'],+ });+ expect(commands.upload.mock.calls).toEqual([+ ['folder-id', file],+ ['folder-id', folder],+ ]);+ });++ it('retries failed contents without creating another folder or reuploading successes', async () => {+ const { composer, commands } = setup();+ const file = upload('brief.txt');+ const folder = upload('Assets.zip', true);+ composer.setName('Design');+ composer.addFiles([file, folder]);+ commands.upload+ .mockResolvedValueOnce()+ .mockRejectedValueOnce(new Error('offline'));+ const failed = await composer.submit()?.result;+ expect(failed?.type).toBe('failed');+ if (failed?.type !== 'failed') throw new Error('Expected upload failure');+ expect(failed.draft.createdId).toBe('folder-id');+ expect(failed.draft.files).toEqual([folder]);+ const retry = createRoot(() =>+ createFolderComposer(commands, failed.draft)+ );+ expect(await retry.submit()?.result).toEqual({+ type: 'created',+ id: 'folder-id',+ name: 'Design',+ });+ expect(commands.create).toHaveBeenCalledTimes(1);+ expect(commands.upload.mock.calls).toEqual([+ ['folder-id', file],+ ['folder-id', folder],+ ['folder-id', folder],+ ]);+ });++ it('retains the draft when creation fails and retries tags on the same created folder', async () => {+ const { composer, commands } = setup();+ composer.setName('Design');+ composer.setTags({ tags: ['blue'] });+ commands.create.mockRejectedValueOnce(new Error('offline'));+ const failed = await composer.submit()?.result;+ if (failed?.type !== 'failed') throw new Error('Expected creation failure');+ expect(failed.draft.createdId).toBeUndefined();+ expect(failed.draft.tags).toEqual({ tags: ['blue'] });+ commands.saveTags.mockRejectedValueOnce(new Error('offline'));+ const retry = createRoot(() =>+ createFolderComposer(commands, failed.draft)+ );+ const tagsFailed = await retry.submit()?.result;+ if (tagsFailed?.type !== 'failed') throw new Error('Expected tag failure');+ expect(tagsFailed.draft.createdId).toBe('folder-id');+ const finalRetry = createRoot(() =>+ createFolderComposer(commands, tagsFailed.draft)+ );+ expect(await finalRetry.submit()?.result).toEqual({+ type: 'created',+ id: 'folder-id',+ name: 'Design',+ });+ expect(commands.create).toHaveBeenCalledTimes(2);+ });++ it('rejects empty names and concurrent submissions', async () => {+ const { composer, commands } = setup();+ await composer.submit();+ expect(commands.create).not.toHaveBeenCalled();+ composer.setName('Design');+ const first = composer.submit();+ await composer.submit();+ await first?.result;+ expect(commands.create).toHaveBeenCalledTimes(1);+ });++ it('finishes uploads after the composer is disposed, using its submitted snapshot', async () => {+ const { commands } = setup();+ const creation = Promise.withResolvers<string>();+ const uploading = Promise.withResolvers<void>();+ commands.create.mockReturnValue(creation.promise);+ commands.upload.mockReturnValue(uploading.promise);+ let dispose!: () => void;+ const composer = createRoot((cleanup) => {+ dispose = cleanup;+ return createFolderComposer(commands);+ });+ const file = upload('brief.txt');+ composer.setName('Design');+ composer.addFiles([file]);+ const submission = composer.submit();+ expect(submission).toBeDefined();+ dispose();+ creation.resolve('folder-id');+ await vi.waitFor(() =>+ expect(commands.upload).toHaveBeenCalledWith('folder-id', file)+ );+ uploading.resolve();+ expect(await submission?.result).toEqual({+ type: 'created',+ id: 'folder-id',+ name: 'Design',+ });+ });++ it('keeps files and tags when moving to a split, and clears a draft', () => {+ const { composer, commands } = setup();+ const file = upload('brief.txt');+ composer.setName('Design');+ composer.setTags({ tags: ['blue'] });+ composer.addFiles([file]);+ const restored = createRoot(() =>+ createFolderComposer(commands, composer.snapshot())+ );+ expect(restored.snapshot()).toEqual(composer.snapshot());+ restored.removeFile(file);+ expect(restored.files()).toEqual([]);+ composer.clear();+ expect(composer.snapshot()).toEqual({+ name: '',+ tags: {},+ files: [],+ createdId: undefined,+ error: undefined,+ });+ });+});diff --git a/apps/web/src/features/drive-view/primitives/folder-composer.ts b/apps/web/src/features/drive-view/primitives/folder-composer.tsnew file mode 100644index 0000000000..fd410762a2--- /dev/null+++ b/apps/web/src/features/drive-view/primitives/folder-composer.ts@@ -0,0 +1,104 @@+import { createSignal } from 'solid-js';+import type {+ FolderCreationCommands,+ FolderDraft,+ FolderSubmission,+ FolderUpload,+} from '../core/folder-composer';++/** Finish a detached draft without reading or updating the disposed composer. */+async function finishFolder(+ commands: FolderCreationCommands,+ draft: FolderDraft+): FolderSubmission['result'] {+ let id = draft.createdId;+ try {+ id ??= await commands.create(draft.name);+ } catch {+ return {+ type: 'failed',+ draft: {+ ...draft,+ error: 'Could not create the folder. Please try again.',+ },+ };+ }+ let tagsFailed = false;+ try {+ await commands.saveTags(id, draft.tags);+ } catch {+ tagsFailed = true;+ }+ const results = await Promise.allSettled(+ draft.files.map((file) => commands.upload(id, file))+ );+ const failedFiles = draft.files.filter(+ (_, index) => results[index].status === 'rejected'+ );+ if (tagsFailed || failedFiles.length) {+ return {+ type: 'failed',+ draft: {+ ...draft,+ createdId: id,+ files: failedFiles,+ error:+ 'Folder created, but some items could not be saved. Retry to finish adding your tags and files.',+ },+ };+ }+ return { type: 'created', id, name: draft.name };+}++export function createFolderComposer(+ commands: FolderCreationCommands,+ initial?: FolderDraft+) {+ const [name, setName] = createSignal(initial?.name ?? '');+ const [tags, setTags] = createSignal(initial?.tags ?? {});+ const [files, setFiles] = createSignal<FolderUpload[]>(initial?.files ?? []);+ const createdId = () => initial?.createdId;+ const [pending, setPending] = createSignal(false);+ const [error, setError] = createSignal(initial?.error);+ const snapshot = (): FolderDraft => ({+ name: name(),+ tags: Object.fromEntries(+ Object.entries(tags()).map(([id, ids]) => [id, [...ids]])+ ),+ files: [...files()],+ createdId: createdId(),+ error: error(),+ });++ const submit = (): FolderSubmission | undefined => {+ if (pending() || !name().trim()) return;+ setPending(true);+ const draft = { ...snapshot(), name: name().trim(), error: undefined };+ return { result: finishFolder(commands, draft) };+ };++ return {+ name,+ setName,+ tags,+ setTags,+ files,+ createdId,+ pending,+ error,+ snapshot,+ submit,+ addFiles: (entries: FolderUpload[]) => {+ setFiles((current) => [...current, ...entries]);+ },+ removeFile: (entry: FolderUpload) =>+ setFiles((current) => current.filter((file) => file !== entry)),+ clear() {+ if (pending() || createdId()) return;+ setName('');+ setTags({});+ setFiles([]);+ setError(undefined);+ },+ };+}diff --git a/apps/web/src/features/drive-view/queries/folder-creation.ts b/apps/web/src/features/drive-view/queries/folder-creation.tsnew file mode 100644index 0000000000..a22098cc43--- /dev/null+++ b/apps/web/src/features/drive-view/queries/folder-creation.ts@@ -0,0 +1,49 @@+import { uploadFiles } from '@core/util/upload';+import { refetchHistory } from '@queries/history/history';+import { refetchSoupEntity } from '@queries/soup/cache';+import { createProject } from '@queries/storage/projects';+import { propertiesServiceClient } from '@service-properties/client';+import type { FolderCreationCommands } from '../core/folder-composer';++export function createFolderCommands(options: {+ parentId?: string;+ source?: string;+}): FolderCreationCommands {+ return {+ async create(name) {+ const id = await createProject({ name, ...options });+ if (!id) throw new Error('Folder was not created');+ return id;+ },+ async saveTags(id, tags) {+ const properties = Object.entries(tags)+ .filter(([, ids]) => ids.length > 0)+ .map(([property_id, add_option_ids]) => ({+ property_id,+ add_option_ids,+ remove_option_ids: [],+ }));+ if (!properties.length) return;+ const result =+ await propertiesServiceClient.bulkUpdateEntityPropertyOptions({+ entity_type: 'PROJECT',+ entity_id: id,+ body: { properties },+ });+ if (result.isErr()) throw result.error;+ refetchSoupEntity(id, 'project', { refreshGraphql: true });+ },+ async upload(id, file) {+ const [result] = await uploadFiles([file], 'dss', { projectId: id });+ if (!result || result.failed) throw new Error('Upload failed');+ if (result.type === 'folder') {+ const folderId = await result.projectId;+ if (!folderId) throw new Error('Folder upload failed');+ refetchSoupEntity(folderId, 'project', { includeRoot: true });+ } else {+ refetchSoupEntity(result.documentId, 'document');+ }+ refetchHistory();+ },+ };+}diff --git a/apps/web/src/features/drive-view/views/create-folder.test.tsx b/apps/web/src/features/drive-view/views/create-folder.test.tsxnew file mode 100644index 0000000000..e3e0f8ef1b--- /dev/null+++ b/apps/web/src/features/drive-view/views/create-folder.test.tsx@@ -0,0 +1,184 @@+import {+ cleanup,+ fireEvent,+ render,+ screen,+ waitFor,+} from '@solidjs/testing-library';+import { createSignal, Show } from 'solid-js';+import { afterEach, expect, it, vi } from 'vitest';+import type { FolderSubmission } from '../core/folder-composer';+import { CreateFolder } from './create-folder';++const pickers = vi.hoisted(() => ({+ files: vi.fn(),+ folder: vi.fn(),+ prepareFolder: vi.fn(),+}));++// Native pickers and the shared query-backed tag widget are tested separately.+vi.mock('@core/util/upload', () => ({+ openFilePicker: pickers.files,+ openFolderPicker: pickers.folder,+ handleFolderSelect: pickers.prepareFolder,+ handleFileFolderDrop: vi.fn(),+}));+vi.mock('@property/tags', () => ({+ useLocalDocTags: (+ _read: unknown,+ save: (definition: { id: string }, ids: string[]) => void+ ) => ({+ select: () => save({ id: 'tags' }, ['blue']),+ }),+ InlineTagsPill: (props: { docTags: { select(): void } }) => (+ <button type="button" onClick={props.docTags.select}>+ Add tags+ </button>+ ),+}));++afterEach(() => {+ cleanup();+ vi.resetAllMocks();+});++it('stages files and nested folders with tags, removes items, and submits to the created folder', async () => {+ const file = new File(['brief'], 'brief.txt');+ const nested = { file: new File(['zip'], 'Assets.zip'), isFolder: true };+ pickers.files.mockImplementation((_options, select) => select([file]));+ pickers.folder.mockImplementation((_options, select) => select([file]));+ pickers.prepareFolder.mockImplementation(async (_files, ready) =>+ ready([nested])+ );+ const commands = {+ create: vi.fn(async () => 'folder-id'),+ saveTags: vi.fn(async () => {}),+ upload: vi.fn(async () => {}),+ };+ const onSubmit = vi.fn();+ render(() => (+ <CreateFolder+ commands={commands}+ destination="Design"+ onClose={() => {}}+ onSubmit={onSubmit}+ />+ ));++ expect(+ screen+ .getByRole('button', { name: /Create Folder/ })+ .hasAttribute('disabled')+ ).toBe(true);+ fireEvent.input(screen.getByLabelText('Folder name'), {+ target: { value: 'Assets' },+ });+ fireEvent.click(screen.getByRole('button', { name: 'Add tags' }));+ fireEvent.click(screen.getByRole('button', { name: 'Add files' }));+ fireEvent.click(screen.getByRole('button', { name: 'Add folder' }));+ await screen.findByRole('button', { name: 'Remove Assets.zip' });+ expect(commands.create).not.toHaveBeenCalled();+ expect(commands.upload).not.toHaveBeenCalled();+ fireEvent.click(screen.getByRole('button', { name: 'Remove brief.txt' }));+ await waitFor(() =>+ expect(+ screen+ .getByRole('button', { name: /Create Folder/ })+ .hasAttribute('disabled')+ ).toBe(false)+ );+ fireEvent.keyDown(screen.getByLabelText('Folder name'), {+ key: 'Enter',+ ctrlKey: true,+ });+ expect(onSubmit).toHaveBeenCalledOnce();+ const submission: FolderSubmission = onSubmit.mock.calls[0][0];+ expect(await submission.result).toEqual({+ type: 'created',+ id: 'folder-id',+ name: 'Assets',+ });+ expect(commands.saveTags).toHaveBeenCalledWith('folder-id', {+ tags: ['blue'],+ });+ expect(commands.upload).toHaveBeenCalledExactlyOnceWith('folder-id', nested);+});++it('dismisses immediately on confirmation before folder creation or uploads finish', async () => {+ const creation = Promise.withResolvers<string>();+ const upload = Promise.withResolvers<void>();+ const commands = {+ create: vi.fn(() => creation.promise),+ saveTags: vi.fn(async () => {}),+ upload: vi.fn(() => upload.promise),+ };+ const [open, setOpen] = createSignal(true);+ let submission: FolderSubmission | undefined;+ render(() => (+ <Show when={open()}>+ <CreateFolder+ commands={commands}+ destination="Drive"+ initialDraft={{+ name: 'Assets',+ tags: {},+ files: [{ file: new File(['test'], 'brief.txt'), isFolder: false }],+ }}+ onClose={() => setOpen(false)}+ onSubmit={(value) => {+ submission = value;+ setOpen(false);+ }}+ />+ </Show>+ ));+ fireEvent.click(screen.getByRole('button', { name: /Create Folder/ }));+ expect(screen.queryByRole('form', { name: 'New folder' })).toBeNull();+ expect(commands.upload).not.toHaveBeenCalled();+ creation.resolve('folder-id');+ await waitFor(() => expect(commands.upload).toHaveBeenCalledOnce());+ expect(screen.queryByRole('form', { name: 'New folder' })).toBeNull();+ upload.resolve();+ expect(await submission?.result).toEqual({+ type: 'created',+ id: 'folder-id',+ name: 'Assets',+ });+});++it('allows name and tag creation with uploads hidden in the mobile composer', async () => {+ const commands = {+ create: vi.fn(async () => 'folder-id'),+ saveTags: vi.fn(async () => {}),+ upload: vi.fn(async () => {}),+ };+ const onSubmit = vi.fn();+ render(() => (+ <CreateFolder+ commands={commands}+ destination="Drive"+ showUploads={false}+ onClose={() => {}}+ onSubmit={onSubmit}+ />+ ));+ expect(screen.queryByText('Drop files or nested folders here')).toBeNull();+ expect(screen.queryByRole('button', { name: 'Add files' })).toBeNull();+ expect(screen.queryByRole('button', { name: 'Add folder' })).toBeNull();+ fireEvent.input(screen.getByLabelText('Folder name'), {+ target: { value: 'Mobile folder' },+ });+ fireEvent.click(screen.getByRole('button', { name: 'Add tags' }));+ fireEvent.click(screen.getByRole('button', { name: /Create Folder/ }));+ expect(onSubmit).toHaveBeenCalledOnce();+ const submission: FolderSubmission = onSubmit.mock.calls[0][0];+ expect(await submission.result).toEqual({+ type: 'created',+ id: 'folder-id',+ name: 'Mobile folder',+ });+ expect(commands.saveTags).toHaveBeenCalledWith('folder-id', {+ tags: ['blue'],+ });+ expect(commands.upload).not.toHaveBeenCalled();+});diff --git a/apps/web/src/features/drive-view/views/create-folder.tsx b/apps/web/src/features/drive-view/views/create-folder.tsxnew file mode 100644index 0000000000..d9303ba757--- /dev/null+++ b/apps/web/src/features/drive-view/views/create-folder.tsx@@ -0,0 +1,111 @@+import {+ handleFileFolderDrop,+ handleFolderSelect,+ openFilePicker,+ openFolderPicker,+} from '@core/util/upload';+import { InlineTagsPill, useLocalDocTags } from '@property/tags';+import { createSignal, onMount, Suspense } from 'solid-js';+import { FolderComposer } from '../components/folder-composer';+import type {+ FolderCreationCommands,+ FolderDraft,+ FolderSubmission,+} from '../core/folder-composer';+import { createFolderComposer } from '../primitives/folder-composer';++export function CreateFolder(props: {+ commands: FolderCreationCommands;+ destination: string;+ initialDraft?: FolderDraft;+ showUploads?: boolean;+ onClose(): void;+ onSubmit(submission: FolderSubmission): void;+ onExpand?(draft: FolderDraft): void;+}) {+ const composer = createFolderComposer(props.commands, props.initialDraft);+ const [preparing, setPreparing] = createSignal(false);+ const [preparationError, setPreparationError] = createSignal<string>();+ const busy = () => composer.pending() || preparing();+ const tags = useLocalDocTags(+ (id) => composer.tags()[id] ?? [],+ (definition, ids) => {+ composer.setTags((current) => ({ ...current, [definition.id]: ids }));+ }+ );+ let form: HTMLDivElement | undefined;+ onMount(() => form?.querySelector<HTMLInputElement>('input')?.focus());++ const prepare = async (action: () => Promise<void>) => {+ if (busy()) return;+ setPreparing(true);+ setPreparationError(undefined);+ try {+ await action();+ } catch {+ setPreparationError(+ 'Could not prepare the files. Please select them again.'+ );+ } finally {+ setPreparing(false);+ }+ };+ const submit = () => {+ if (busy()) return;+ const submission = composer.submit();+ if (submission) props.onSubmit(submission);+ };++ return (+ <div ref={form} class="h-full min-h-0">+ <FolderComposer+ name={composer.name()}+ destination={props.destination}+ files={composer.files()}+ showUploads={props.showUploads}+ tags={+ <Suspense+ fallback={<span class="text-xs text-ink-muted">Loading tags…</span>}+ >+ <InlineTagsPill docTags={tags} showAddButton />+ </Suspense>+ }+ busy={busy()}+ preparing={preparing()}+ created={!!composer.createdId()}+ error={preparationError() ?? composer.error()}+ onName={composer.setName}+ onRemove={composer.removeFile}+ onClear={() => {+ composer.clear();+ setPreparationError(undefined);+ }}+ onClose={props.onClose}+ onExpand={+ props.onExpand+ ? () => props.onExpand?.(composer.snapshot())+ : undefined+ }+ onSubmit={submit}+ onFiles={() => {+ openFilePicker({ multiple: true }, (files) => {+ if (!busy())+ composer.addFiles(+ files.map((file) => ({ file, isFolder: false }))+ );+ });+ }}+ onFolder={() => {+ openFolderPicker({}, (files) =>+ prepare(() => handleFolderSelect(files, composer.addFiles))+ );+ }}+ onDrop={(files, folders) => {+ void prepare(() =>+ handleFileFolderDrop(files, folders, composer.addFiles)+ );+ }}+ />+ </div>+ );+}diff --git a/docs/AGENT_GUIDE/surfaces.md b/docs/AGENT_GUIDE/surfaces.mdindex b7891810f8..c1d10fe33a 100644--- a/docs/AGENT_GUIDE/surfaces.md+++ b/docs/AGENT_GUIDE/surfaces.md@@ -1139,7 +1139,18 @@ combine to narrow the results. Created by is hidden while My Filesis restricted to your own files. Recent offers only file-scope filtering.`Sort files` offers modified, created, and viewed dates.Recent uses the viewer's own interaction order and does not offer a sort override.-The New menu and drag/drop uploads target the selected folder. In a folder+The New menu and drag/drop uploads target the selected folder. **New → Folder**+and the launcher’s **Folder** action open the folder composer. Enter **Folder name**,+choose **Add tags**, and stage files or nested folders in the large drop area+(or use **Add files** / **Add folder**). Staged items can be removed before+**Create Folder** (Cmd/Ctrl+Enter); nothing uploads until submission. Confirmation+closes the composer immediately while creation and uploads finish in the background.+On touch devices, the folder composer uses the same bottom drawer as Task, with+the name and tags fields; the upload area and file/folder picker buttons are hidden.+Expanding into a split keeps the draft. Creation preserves the current location+and offers an **Open** toast action when finished. On failure, the toast’s **Retry**+action restores the draft, retaining any created folder and only unsuccessful uploads. Close an unused draft+without submitting when verifying against hosted dev data. In a folderopened in its own split or an inline preview, drop files from the computer ontothe empty state or file list, then reopen the folder to verify membership.Check both one file and multiple files; the nested list drop target must retain