Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

Add folder creation dialog to Drive's New menu (#7464)

Jacob Beckerman65f13b3e25b5
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.tsx
new file mode 100644
index 0000000000..e343700f53
--- /dev/null
+++ b/apps/web/src/features/drive-view/components/new-folder-dialog.tsx
@@ -0,0 +1,101 @@
+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/location-label.ts b/apps/web/src/features/drive-view/core/location-label.ts
index 5d09be4a04..5b58507b22 100644
--- a/apps/web/src/features/drive-view/core/location-label.ts
+++ b/apps/web/src/features/drive-view/core/location-label.ts
@@ -9,3 +9,12 @@ export function driveLocationLabel(
}
return DRIVE_TABS.find((tab) => tab.id === location.tab)?.label ?? 'My Files';
}
+
+/** Where Drive's New menu creates items: the open folder, else the root. */
+export function driveCreateDestinationLabel(
+ projectId: string | undefined,
+ folders: readonly DriveFolder[] = []
+): string {
+ if (!projectId) return 'Drive';
+ return folders.find((folder) => folder.id === projectId)?.name ?? 'Folder';
+}
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.tsx
new file mode 100644
index 0000000000..384b535e76
--- /dev/null
+++ b/apps/web/src/features/drive-view/drive-create-menu.test.tsx
@@ -0,0 +1,165 @@
+import {
+ cleanup,
+ fireEvent,
+ render,
+ screen,
+ waitFor,
+} 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(),
+}));
+
+const [projectId, setProjectId] = createSignal<string | undefined>('child');
+
+vi.mock('@app/components/view-shell', () => {
+ const Slot = (props: ParentProps) => <span>{props.children}</span>;
+ return {
+ ViewSidebar: {
+ Action: (props: ParentProps<Record<string, unknown>>) => (
+ <button type="button" {...props} />
+ ),
+ Icon: Slot,
+ Trailing: Slot,
+ },
+ };
+});
+vi.mock('@app/features/command/Launcher', () => ({
+ CREATABLE_BLOCKS: [
+ { label: 'Document', blockName: 'md', icon: () => null },
+ { label: 'Folder', blockName: 'project', icon: () => null },
+ { label: 'Database', blockName: 'database', icon: () => null },
+ ],
+ 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 },
+ sidebar: {
+ folders: () => [
+ { id: 'root', name: 'Design', userId: 'user' },
+ { id: 'child', name: 'Wireframes', parentId: 'root', userId: 'user' },
+ ],
+ },
+ actions: { uploadFiles: vi.fn(), uploadFolder: vi.fn() },
+ }),
+}));
+
+beforeEach(() => {
+ setProjectId('child');
+ host.createProject.mockResolvedValue('new-folder');
+});
+
+afterEach(() => {
+ cleanup();
+ vi.clearAllMocks();
+});
+
+async function openMenu() {
+ render(() => <DriveCreateMenu />);
+ fireEvent.keyDown(
+ screen.getByRole('button', { name: 'New file or folder in Wireframes' }),
+ { key: 'Enter' }
+ );
+ return screen.findByRole('menu');
+}
+
+it('names the open folder as the destination', async () => {
+ const menu = await openMenu();
+
+ expect(menu.textContent).toContain('Create in');
+ expect(menu.textContent).toContain('Wireframes');
+});
+
+it('creates files inside the open folder', async () => {
+ await openMenu();
+ fireEvent.keyDown(screen.getByRole('menuitem', { name: 'Document' }), {
+ key: 'Enter',
+ });
+
+ expect(host.runCreateAction).toHaveBeenCalledWith('md', {
+ projectId: 'child',
+ source: 'drive',
+ });
+});
+
+it('names a new folder and creates it inside the open 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',
+ });
+ 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 () => {
+ setProjectId(undefined);
+ render(() => <DriveCreateMenu />);
+
+ fireEvent.keyDown(
+ screen.getByRole('button', { name: 'New file or folder in Drive' }),
+ { key: 'Enter' }
+ );
+ await screen.findByRole('menu');
+ 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',
+ })
+ );
+});
diff --git a/apps/web/src/features/drive-view/drive-create-menu.tsx b/apps/web/src/features/drive-view/drive-create-menu.tsx
index ab4149d063..5cf04d09e6 100644
--- a/apps/web/src/features/drive-view/drive-create-menu.tsx
+++ b/apps/web/src/features/drive-view/drive-create-menu.tsx
@@ -1,24 +1,37 @@
import { ViewSidebar } from '@app/components/view-shell';
import {
CREATABLE_BLOCKS,
+ type CreatableName,
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 { For } from 'solid-js';
+import { createSignal, For, Show } 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';
/** Launcher integration for the current Drive folder. */
export function DriveCreateMenu() {
- const { state, actions } = useDriveView();
+ const { state, sidebar, actions } = useDriveView();
const isEnabled = useCreatableEnabled();
+ const [newFolderDestination, setNewFolderDestination] = createSignal<{
+ projectId: string | undefined;
+ label: string;
+ }>();
+
+ const destination = () =>
+ driveCreateDestinationLabel(state.projectId(), sidebar.folders());
+
const options = () =>
CREATABLE_BLOCKS.filter(
(block) =>
@@ -35,51 +48,101 @@ export function DriveCreateMenu() {
(block.blockName !== 'database' || !state.projectId())
);
+ 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) }],
+ });
+ };
+
return (
- <Dropdown placement="bottom-start">
- <Dropdown.Trigger as={ViewSidebar.Action} aria-label="New file or folder">
- <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">
- <Dropdown.Group>
- <For each={options()}>
- {(option) => (
- <Dropdown.Item
- onSelect={() =>
- runCreateAction(option.blockName, {
- projectId: state.projectId(),
- source: 'drive',
- })
- }
- >
- <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>
+ <>
+ <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>
+ </>
);
}
diff --git a/apps/web/src/lib/queries/storage/projects.ts b/apps/web/src/lib/queries/storage/projects.ts
index e3abdc8243..e65700f695 100644
--- a/apps/web/src/lib/queries/storage/projects.ts
+++ b/apps/web/src/lib/queries/storage/projects.ts
@@ -8,6 +8,7 @@ import {
useUpsertToHistoryMutation,
} from '@queries/history/history';
import { setPreviewOnCreate } from '@queries/preview/preview';
+import { refetchSoupEntity } from '@queries/soup/cache';
import { type MutationCallbacks, withCallbacks } from '@queries/utils';
import { storageServiceClient } from '@service-storage/client';
import type { Project } from '@service-storage/generated/schemas/project';
@@ -118,6 +119,12 @@ export async function createProject(params: {
itemId: projectId,
itemType: 'project',
});
+ // Drive's folder contents are a Soup list, not the projects list: insert
+ // the new folder there too so it appears in its parent without a reload.
+ void refetchSoupEntity(projectId, 'project', {
+ ownTouch: true,
+ refreshGraphql: true,
+ });
await Promise.all([invalidateProjects(), refetchHistory()]);
return projectId;
}
diff --git a/docs/AGENT_GUIDE/navigation.md b/docs/AGENT_GUIDE/navigation.md
index eed7c4e551..45619aa6bb 100644
--- a/docs/AGENT_GUIDE/navigation.md
+++ b/docs/AGENT_GUIDE/navigation.md
@@ -198,6 +198,12 @@ headings. Tags and folders have a separate disclosure button on the **right** of
the row: clicking the label selects the destination; clicking Expand/Collapse
only opens or closes its children. Selecting a Drive folder or tab closes an
inline detail into that destination; it does not navigate back to Drive's root.
+Drive's **New** menu (sidebar, or the header in narrow layouts) is headed
+**Create in &lt;folder&gt;** and creates everything in the open folder; on a tab or
+the Drive root it reads **Create in Drive**. **Folder** opens a **New folder**
+dialog with `Untitled folder` preselected; creating keeps Drive where it is, adds
+the folder to the open folder's list, and shows a toast with **Open**. Other
+items open after creation. **Database** is offered only outside folders.
Home, Email, Tasks, Channels, and Drive keep their workspace provider mounted
while typed child routes own the accepted inline detail. Tasks and Email replace
the list with detail, capturing its focus and scroll state before disposal. Their child