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
fix(projects): projects ui polish (#7453)
teo657d16212c90
diff --git a/apps/web/src/features/block-md/component/InlinePropertyValue.tsx b/apps/web/src/features/block-md/component/InlinePropertyValue.tsxindex 14c8793607..9050448d2c 100644--- a/apps/web/src/features/block-md/component/InlinePropertyValue.tsx+++ b/apps/web/src/features/block-md/component/InlinePropertyValue.tsx@@ -38,7 +38,9 @@ export const InlinePropertyValue: Component<InlinePropertyValueProps> = (props.property.propertyDefinitionId !== SYSTEM_PROPERTY_IDS.PRIORITY &&!(ctx.entityType === 'TASK' &&- props.property.propertyDefinitionId === SYSTEM_PROPERTY_IDS.ASSIGNEES+ (props.property.propertyDefinitionId ===+ SYSTEM_PROPERTY_IDS.ASSIGNEES ||+ props.property.propertyDefinitionId === SYSTEM_PROPERTY_IDS.PROJECT))}canEdit={ctx.canEdit}diff --git a/apps/web/src/features/projects/components/project-skeletons.tsx b/apps/web/src/features/projects/components/project-skeletons.tsxnew file mode 100644index 0000000000..43d75c388e--- /dev/null+++ b/apps/web/src/features/projects/components/project-skeletons.tsx@@ -0,0 +1,95 @@+import { ListSkeleton } from '@app/components/view-shell/ListSkeleton';+import { For, Show } from 'solid-js';+import type { ProjectSection } from '../core/project';++export function ProjectDescriptionSkeleton() {+ return (+ <ListSkeleton.Root label="Loading project description" class="min-h-24">+ <div class="space-y-3 pt-1.5">+ <ListSkeleton.Bar class="w-4/5 max-w-lg opacity-60" />+ <ListSkeleton.Bar class="w-3/5 max-w-md opacity-60" />+ <ListSkeleton.Bar class="w-2/5 max-w-sm opacity-60" />+ </div>+ </ListSkeleton.Root>+ );+}++export function ProjectsSidebarSkeleton() {+ return (+ <ListSkeleton.Root label="Loading projects">+ <For each={[0, 1, 2, 3]}>+ {() => (+ <ListSkeleton.Row>+ <ListSkeleton.Bar class="size-4 shrink-0 rounded" />+ <ListSkeleton.Bar class="w-28 max-w-full" />+ </ListSkeleton.Row>+ )}+ </For>+ </ListSkeleton.Root>+ );+}++/** Matches the overview's content width, insets, and wrapping property pills. */+export function ProjectContentSkeleton(props: { section: ProjectSection }) {+ return (+ <ListSkeleton.Root label="Loading project" class="h-full overflow-y-auto">+ <Show+ when={props.section === 'overview'}+ fallback={<ProjectTasksSkeleton />}+ >+ <div class="px-6 pb-8 pt-12 touch:pt-6">+ <div class="mx-auto max-w-3xl">+ <ListSkeleton.Bar class="h-8 w-72 max-w-full rounded-lg" />+ <div class="mb-6 mt-3 flex flex-wrap items-center gap-2">+ <ListSkeleton.Bar class="h-6 w-28" />+ <ListSkeleton.Bar class="h-6 w-24" />+ <ListSkeleton.Bar class="h-6 w-20" />+ <ListSkeleton.Bar class="h-6 w-28" />+ </div>+ <div class="mt-1.5 min-h-24 space-y-3 pt-1">+ <ListSkeleton.Bar class="w-full max-w-lg" />+ <ListSkeleton.Bar class="w-4/5 max-w-md" />+ <ListSkeleton.Bar class="w-3/5 max-w-sm" />+ </div>+ <div class="mt-6 space-y-5">+ <ListSkeleton.Bar class="w-24" />+ <div class="flex gap-3">+ <ListSkeleton.Bar class="size-7 shrink-0" />+ <div class="min-w-0 flex-1 space-y-3">+ <ListSkeleton.Bar class="w-36 max-w-full" />+ <ListSkeleton.Bar class="w-2/3 max-w-sm" />+ </div>+ </div>+ <ListSkeleton.Bar class="h-12 w-full" />+ </div>+ </div>+ </div>+ </Show>+ </ListSkeleton.Root>+ );+}++function ProjectTasksSkeleton() {+ return (+ <div class="space-y-6 p-3 touch:px-4">+ <div class="flex flex-wrap items-center justify-between gap-3">+ <ListSkeleton.Bar class="h-10 w-96 max-w-full" />+ <div class="flex gap-2">+ <ListSkeleton.Bar class="h-8 w-32" />+ <ListSkeleton.Bar class="h-8 w-24" />+ </div>+ </div>+ <ListSkeleton.Bar class="h-7 w-full rounded-lg" />+ <For each={[0, 1, 2, 3]}>+ {() => (+ <div class="flex items-center gap-4 px-3">+ <ListSkeleton.Bar class="size-4 shrink-0 rounded" />+ <ListSkeleton.Bar class="h-3 w-2/5" />+ <ListSkeleton.Bar class="ml-auto h-5 w-20" />+ <ListSkeleton.Bar class="h-5 w-24 touch:hidden" />+ </div>+ )}+ </For>+ </div>+ );+}diff --git a/apps/web/src/features/projects/project-description.tsx b/apps/web/src/features/projects/project-description.tsxindex c6a8864737..50ddd49624 100644--- a/apps/web/src/features/projects/project-description.tsx+++ b/apps/web/src/features/projects/project-description.tsx@@ -1,7 +1,8 @@import { useMacroMentionLinkResolver } from '@components/app/split-layout/split-router/mention-links';import { CollabMarkdownEditor } from '@core/collab-surface/CollabMarkdownEditor';import { Button } from '@ui';-import { createMemo, createSignal, onCleanup, Show } from 'solid-js';+import { createMemo, createSignal, onCleanup, Show, Suspense } from 'solid-js';+import { ProjectDescriptionSkeleton } from './components/project-skeletons';import { createProductionProjectDescriptionSession } from './queries/production-project-description';function DescriptionSession(props: {@@ -22,6 +23,7 @@ function DescriptionSession(props: {label="Project description"namespace="project-description"class="min-h-24 mt-1.5 text-base"+ loadingFallback={<ProjectDescriptionSkeleton />}placeholder={props.canEdit? "Add a description. Press '/' for commands, '@' to mention…"@@ -54,14 +56,16 @@ export function ProjectDescription(props: {});return (- <Show when={identity()} keyed>- {(identity) => (- <DescriptionSession- projectId={identity.projectId}- canEdit={props.canEdit}- onRetry={() => setAttempt((attempt) => attempt + 1)}- />- )}- </Show>+ <Suspense fallback={<ProjectDescriptionSkeleton />}>+ <Show when={identity()} keyed>+ {(identity) => (+ <DescriptionSession+ projectId={identity.projectId}+ canEdit={props.canEdit}+ onRetry={() => setAttempt((attempt) => attempt + 1)}+ />+ )}+ </Show>+ </Suspense>);}diff --git a/apps/web/src/features/projects/project-detail.tsx b/apps/web/src/features/projects/project-detail.tsxindex 78ef64e2d6..31b7d66b75 100644--- a/apps/web/src/features/projects/project-detail.tsx+++ b/apps/web/src/features/projects/project-detail.tsx@@ -17,7 +17,8 @@ import { ShareTrigger } from '@core/component/TopBar/ShareButton';import { isTouchDevice } from '@core/mobile/isTouchDevice';import StackIcon from '@phosphor/stack.svg';import { Button } from '@ui';-import { Match, Show, Switch } from 'solid-js';+import { Match, Show, Suspense, Switch } from 'solid-js';+import { ProjectContentSkeleton } from './components/project-skeletons';import {type ProjectsContext,useProjectsContext,@@ -133,18 +134,16 @@ function ProjectDetailHost(props: ProjectDetailProps) {</Show><EntityDetailTopBarnavigation={- <Show when={source.project()}>- <TabsInset- list={[- { value: 'overview', label: 'Overview' },- { value: 'tasks', label: 'Tasks' },- ]}- value={props.route.section}- onChange={(value) => section(value as ProjectSection)}- aria-label="Project sections"- class="shrink-0 whitespace-nowrap"- />- </Show>+ <TabsInset+ list={[+ { value: 'overview', label: 'Overview' },+ { value: 'tasks', label: 'Tasks' },+ ]}+ value={props.route.section}+ onChange={(value) => section(value as ProjectSection)}+ aria-label="Project sections"+ class="shrink-0 whitespace-nowrap"+ />}><Show when={source.project()}>@@ -154,77 +153,79 @@ function ProjectDetailHost(props: ProjectDetailProps) {</Show></EntityDetailTopBar><div class="relative min-h-0 min-w-0 flex-1">- <Switch>- <Match when={source.loading() && !source.project()}>- <p role="status" class="p-6 text-ink-muted">- Loading project…- </p>- </Match>- <Match when={source.project()}>- {(project) => (- <ProjectWorkspace- project={project()}- source={source}- commands={commands}- section={props.route.section}- onDelete={- props.onDelete ??- (() => navigate({ route: tasksSplitRoute, params: {} }))- }- onOpenTask={(task, options) => {- const event = options?.event;- if (- !isTouchDevice() &&- !(- event?.shiftKey ||- event?.metaKey ||- event?.ctrlKey ||- event?.altKey- )- ) {- navigate({- route: projectTaskRoute,- params: {- projectId: props.route.id,- section: props.route.section,- taskId: task.id,- },- });+ <Suspense+ fallback={<ProjectContentSkeleton section={props.route.section} />}+ >+ <Switch>+ <Match when={source.loading() && !source.project()}>+ <ProjectContentSkeleton section={props.route.section} />+ </Match>+ <Match when={source.project()}>+ {(project) => (+ <ProjectWorkspace+ project={project()}+ source={source}+ commands={commands}+ section={props.route.section}+ onDelete={+ props.onDelete ??+ (() => navigate({ route: tasksSplitRoute, params: {} }))+ }+ onOpenTask={(task, options) => {+ const event = options?.event;+ if (+ !isTouchDevice() &&+ !(+ event?.shiftKey ||+ event?.metaKey ||+ event?.ctrlKey ||+ event?.altKey+ )+ ) {+ navigate({+ route: projectTaskRoute,+ params: {+ projectId: props.route.id,+ section: props.route.section,+ taskId: task.id,+ },+ });+ return true;+ }+ layout.openWithSplit(+ { type: 'md', id: task.id },+ { preferNewSplit: options?.event?.shiftKey }+ );return true;+ }}+ onCreateTask={createTask}+ description={+ <ProjectDescription+ projectId={project().id}+ canEdit={canEditProject(project())}+ />+ }+ discussion={+ <ProjectDiscussion+ projectId={project().id}+ canWrite={canDiscussProject(project())}+ targetId={props.route.discussionId}+ />}- layout.openWithSplit(- { type: 'md', id: task.id },- { preferNewSplit: options?.event?.shiftKey }- );- return true;- }}- onCreateTask={createTask}- description={- <ProjectDescription- projectId={project().id}- canEdit={canEditProject(project())}- />- }- discussion={- <ProjectDiscussion- projectId={project().id}- canWrite={canDiscussProject(project())}- targetId={props.route.discussionId}- />- }- />- )}- </Match>- <Match when={true}>- <div role="alert" class="p-6">- <p>- Project unavailable. It may have been deleted, or you may no- longer have access.- </p>- <Button onClick={() => void source.refresh()}>Try again</Button>- </div>- </Match>- </Switch>+ />+ )}+ </Match>+ <Match when={true}>+ <div role="alert" class="p-6">+ <p>+ Project unavailable. It may have been deleted, or you may no+ longer have access.+ </p>+ <Button onClick={() => void source.refresh()}>Try again</Button>+ </div>+ </Match>+ </Switch>+ </Suspense></div></>);diff --git a/apps/web/src/features/projects/projects.tsx b/apps/web/src/features/projects/projects.tsxindex ccf8923d42..d51ac6cb70 100644--- a/apps/web/src/features/projects/projects.tsx+++ b/apps/web/src/features/projects/projects.tsx@@ -40,6 +40,10 @@ import { projectKeys } from './queries/keys';import { createProjectSources } from './queries/project-sources';import { ProjectAssignment } from './views/project-assignment';import { ProjectsCollection } from './views/projects-collection';+import {+ ProjectsSidebar,+ type ProjectsSidebarProps,+} from './views/projects-sidebar';function createProjectReadGate() {// Each source invokes this under its own owner, which can outlive this view.@@ -110,6 +114,14 @@ export function ProjectsTab(props: {);}+export function ProjectsSidebarSection(props: ProjectsSidebarProps) {+ return (+ <Projects>+ <ProjectsSidebar {...props} />+ </Projects>+ );+}+function ProjectsCollectionHost(props: {onOpen: (id: string, event?: MouseEvent, newSplit?: boolean) => void;}) {diff --git a/apps/web/src/features/projects/queries/project-soup.test.ts b/apps/web/src/features/projects/queries/project-soup.test.tsindex 299a98c302..8cead1e373 100644--- a/apps/web/src/features/projects/queries/project-soup.test.ts+++ b/apps/web/src/features/projects/queries/project-soup.test.ts@@ -1,6 +1,11 @@import { SYSTEM_PROPERTY_IDS } from '@property/identifiers';import { refreshActiveGraphqlSoupQueries } from '@queries/soup/graphql/active-queries';-import { CombinedError, createClient, type Exchange } from '@urql/core';+import {+ CombinedError,+ cacheExchange,+ createClient,+ type Exchange,+} from '@urql/core';import { createRoot, createSignal } from 'solid-js';import { afterEach, describe, expect, it, vi } from 'vitest';import { fromPromise, mergeMap, pipe } from 'wonka';@@ -50,6 +55,54 @@ afterEach(() => {});describe('project Soup source', () => {+ it('reuses cached projects on remount while refreshing in the background', async () => {+ const refresh = Promise.withResolvers<void>();+ let networkReads = 0;+ const exchange: Exchange = () => (operations) =>+ pipe(+ operations,+ mergeMap((operation) =>+ fromPromise(+ (async () => {+ if (operation.kind === 'query' && ++networkReads > 1)+ await refresh.promise;+ return {+ operation,+ data: {+ user: {+ id: 'viewer',+ soup: { items: [initiative('cached')], nextCursor: null },+ },+ },+ stale: false,+ hasNext: false,+ };+ })()+ )+ )+ );+ const client = createClient({+ url: 'http://test.invalid/graphql',+ exchanges: [cacheExchange, exchange],+ });+ const mount = () =>+ createRoot((cleanup) => {+ dispose = cleanup;+ return createProjectSoupSource(+ () => client,+ () => ({ sort: 'updated' }),+ () => true+ );+ });+ const first = mount();+ await vi.waitFor(() => expect(first.rows()?.[0].project.id).toBe('cached'));+ dispose?.();+ const second = mount();+ await vi.waitFor(() => expect(networkReads).toBe(2));+ expect(second.loading()).toBe(false);+ expect(second.rows()?.[0].project.id).toBe('cached');+ refresh.resolve();+ });it('scopes all filters to initiatives and excludes folders and task documents', () => {const input = projectSoupInput({query: 'Roadmap',diff --git a/apps/web/src/features/projects/queries/project-tasks.test.ts b/apps/web/src/features/projects/queries/project-tasks.test.tsindex 0fb767e159..1397cda569 100644--- a/apps/web/src/features/projects/queries/project-tasks.test.ts+++ b/apps/web/src/features/projects/queries/project-tasks.test.ts@@ -68,6 +68,7 @@ it('scopes tasks to the Project property and disables the shared source immediatentityId: 'project',});expect(mock.options?.enabled?.()).toBe(true);+ expect(mock.options?.loadAll).toBe(true);setProject(undefined);expect(mock.options?.enabled?.()).toBe(false);sourcediff --git a/apps/web/src/features/projects/queries/project-tasks.ts b/apps/web/src/features/projects/queries/project-tasks.tsindex 039c67d263..46025cbab5 100644--- a/apps/web/src/features/projects/queries/project-tasks.ts+++ b/apps/web/src/features/projects/queries/project-tasks.ts@@ -19,6 +19,7 @@ export function createProjectTasksDataSource(): TasksDataSource {const source = useTasksDataSource(state, {...options,+ loadAll: true,reference: () => ({propertyDefinitionId: SYSTEM_PROPERTY_IDS.PROJECT,entityId: projectId,diff --git a/apps/web/src/features/projects/views/add-project-tasks.test.tsx b/apps/web/src/features/projects/views/add-project-tasks.test.tsxindex a101426e29..fb9447c35a 100644--- a/apps/web/src/features/projects/views/add-project-tasks.test.tsx+++ b/apps/web/src/features/projects/views/add-project-tasks.test.tsx@@ -7,7 +7,7 @@ import { AddProjectTasks } from './add-project-tasks';const mock = vi.hoisted(() => ({ assignTasks: vi.fn() }));vi.mock('@ui', async () => ({...(await import('@app/components/ui/components/Button')),- ...(await import('@app/components/ui/components/Dialog')),+ ...(await import('@app/components/ui/components/Dropdown')),...(await import('@app/components/ui/components/Surface')),...(await import('@app/components/ui/utils/classname')),Hotkey: () => null,@@ -15,6 +15,9 @@ vi.mock('@ui', async () => ({vi.mock('@app/components/ui/components/Tooltip', () => ({Tooltip: (props: ParentProps) => props.children,}));+vi.mock('@core/component/HoverCard', () => ({+ useIsInsideHoverCard: () => false,+}));vi.mock('@core/mobile/isMobile', () => ({ isMobile: () => false }));vi.mock('../context/projects-context', () => ({useProjectsContext: () => ({@@ -61,12 +64,12 @@ const project: ProjectDetail = {it('adds selected tasks and closes only after the request settles', async () => {const result = Promise.withResolvers<{ taskId: string }[]>();mock.assignTasks.mockReturnValue(result.promise);- const close = vi.fn();- render(() => <AddProjectTasks project={project} onClose={close} />);+ render(() => <AddProjectTasks project={project} />);+ fireEvent.keyDown(+ screen.getByRole('button', { name: 'Add existing tasks' }),+ { key: 'Enter' }+ );expect(screen.getByTestId('excluded').textContent).toBe('linked');- expect(- screen.getByText(/Tasks already in another project will move here/)- ).toBeTruthy();fireEvent.click(screen.getByText('Select tasks'));fireEvent.click(screen.getByRole('button', { name: 'Add 2 tasks' }));expect(mock.assignTasks).toHaveBeenCalledWith('project', ['one', 'two']);@@ -74,9 +77,9 @@ it('adds selected tasks and closes only after the request settles', async () =>'disabled',true);- expect(close).not.toHaveBeenCalled();+ expect(screen.getByRole('menu')).toBeTruthy();result.resolve([{ taskId: 'one' }, { taskId: 'two' }]);- await vi.waitFor(() => expect(close).toHaveBeenCalledOnce());+ await vi.waitFor(() => expect(screen.queryByRole('menu')).toBeNull());});it('keeps only failed tasks selected for retry', async () => {@@ -86,8 +89,11 @@ it('keeps only failed tasks selected for retry', async () => {{ taskId: 'two', error: 'You need edit access to this task.' },]).mockResolvedValueOnce([{ taskId: 'two' }]);- const close = vi.fn();- render(() => <AddProjectTasks project={project} onClose={close} />);+ render(() => <AddProjectTasks project={project} />);+ fireEvent.keyDown(+ screen.getByRole('button', { name: 'Add existing tasks' }),+ { key: 'Enter' }+ );fireEvent.click(screen.getByText('Select tasks'));fireEvent.click(screen.getByRole('button', { name: 'Add 2 tasks' }));expect(await screen.findByRole('alert')).toHaveProperty(@@ -95,16 +101,19 @@ it('keeps only failed tasks selected for retry', async () => {'1 task could not be added. You need edit access to this task.');expect(screen.getByTestId('selection').textContent).toBe('two');- expect(close).not.toHaveBeenCalled();+ expect(screen.getByRole('menu')).toBeTruthy();fireEvent.click(screen.getByRole('button', { name: 'Add 1 task' }));- await vi.waitFor(() => expect(close).toHaveBeenCalledOnce());+ await vi.waitFor(() => expect(screen.queryByRole('menu')).toBeNull());expect(mock.assignTasks).toHaveBeenLastCalledWith('project', ['two']);});it('preserves the selection after a request failure and allows canceling', async () => {mock.assignTasks.mockRejectedValue(new Error('Offline'));- const close = vi.fn();- render(() => <AddProjectTasks project={project} onClose={close} />);+ render(() => <AddProjectTasks project={project} />);+ fireEvent.keyDown(+ screen.getByRole('button', { name: 'Add existing tasks' }),+ { key: 'Enter' }+ );fireEvent.click(screen.getByText('Select tasks'));fireEvent.click(screen.getByRole('button', { name: 'Add 2 tasks' }));expect(await screen.findByRole('alert')).toHaveProperty(@@ -113,5 +122,20 @@ it('preserves the selection after a request failure and allows canceling', async);expect(screen.getByTestId('selection').textContent).toBe('one,two');fireEvent.click(screen.getByRole('button', { name: 'Cancel' }));- expect(close).toHaveBeenCalledOnce();+ expect(screen.queryByRole('menu')).toBeNull();+});++it('opens an anchored task dropdown and dismisses without assigning', () => {+ render(() => <AddProjectTasks project={project} />);+ const trigger = screen.getByRole('button', { name: 'Add existing tasks' });+ fireEvent.keyDown(trigger, { key: 'Enter' });+ expect(screen.getByRole('menu')).toBeTruthy();+ expect(screen.queryByRole('dialog')).toBeNull();+ expect(trigger.getAttribute('aria-expanded')).toBe('true');+ fireEvent.click(screen.getByText('Select tasks'));+ fireEvent.keyDown(screen.getByRole('textbox'), { key: 'Escape' });+ expect(screen.queryByRole('menu')).toBeNull();+ expect(mock.assignTasks).not.toHaveBeenCalled();+ fireEvent.keyDown(trigger, { key: 'Enter' });+ expect(screen.getByTestId('selection').textContent).toBe('');});diff --git a/apps/web/src/features/projects/views/add-project-tasks.tsx b/apps/web/src/features/projects/views/add-project-tasks.tsxindex 26c2c71e08..86427ab5e5 100644--- a/apps/web/src/features/projects/views/add-project-tasks.tsx+++ b/apps/web/src/features/projects/views/add-project-tasks.tsx@@ -1,20 +1,20 @@+import ListPlusIcon from '@phosphor/list-plus.svg';+import { EditorPopover } from '@property/editors/popover/EditorPopover';import { PropertyEntitySelector } from '@property/editors/selectors/PropertyEntitySelector';-import { Button, Dialog } from '@ui';+import { Button, Dropdown } from '@ui';import { createMemo, createSignal, Show, Suspense } from 'solid-js';import { useProjectsContext } from '../context/projects-context';import type { ProjectDetail } from '../core/project';-export function AddProjectTasks(props: {- project: ProjectDetail;- onClose(): void;-}) {+export function AddProjectTasks(props: { project: ProjectDetail }) {const commands = useProjectsContext().createCommands();+ const [open, setOpen] = createSignal(false);const [selected, setSelected] = createSignal(new Set<string>());const [error, setError] = createSignal<string>();const [saving, setSaving] = createSignal(false);const excludedIds = createMemo(() => new Set(props.project.taskIds));const close = () => {- if (!saving()) props.onClose();+ if (!saving()) setOpen(false);};const add = async () => {const taskIds = [...selected()].filter((id) => !excludedIds().has(id));@@ -25,7 +25,7 @@ export function AddProjectTasks(props: {const results = await commands.assignTasks(props.project.id, taskIds);const failed = results.filter((result) => result.error);if (!failed.length) {- props.onClose();+ setOpen(false);return;}setSelected(new Set(failed.map((result) => result.taskId)));@@ -44,66 +44,73 @@ export function AddProjectTasks(props: {};return (- <Dialog- open- onOpenChange={(open) => {- if (!open) close();+ <Dropdown+ open={open()}+ onOpenChange={(nextOpen) => {+ if (saving()) return;+ if (nextOpen) {+ setSelected(new Set<string>());+ setError(undefined);+ }+ setOpen(nextOpen);}}- class="max-w-lg"+ placement="bottom-end">- <div class="flex flex-col gap-3 p-4">- <Dialog.Title>Add existing tasks</Dialog.Title>- <Dialog.Description class="text-sm text-ink-muted">- Select tasks to add to {props.project.name}. Tasks already in another- project will move here.- </Dialog.Description>- <div inert={saving()} classList={{ 'opacity-50': saving() }}>- <Suspense fallback={<p role="status">Loading tasks…</p>}>- <PropertyEntitySelector- config={{- specificEntityType: 'TASK',- isMultiSelect: true,- placeholder: 'Search tasks…',- excludedIds,- }}- selectedOptions={selected}- setSelectedOptions={(ids) => {- if (!saving()) setSelected(ids);- }}- onClose={close}- />- </Suspense>- </div>- <Show when={error()}>- {(message) => (- <p role="alert" class="text-sm text-failure">- {message()}- </p>- )}- </Show>- <div- class="flex justify-end gap-2"- onKeyDown={(event) => {- // The selector owns document-level list navigation; footer buttons- // keep their native Enter behavior without toggling another task.- if (['Enter', 'ArrowUp', 'ArrowDown'].includes(event.key))- event.stopPropagation();- }}- >- <Button disabled={saving()} onClick={close}>- Cancel- </Button>- <Button- variant="cta"- disabled={saving() || !selected().size}- onClick={() => void add()}+ <Dropdown.Trigger variant="outline" size="md">+ <ListPlusIcon class="size-4" />+ Add existing tasks+ </Dropdown.Trigger>+ <Show when={open()}>+ <EditorPopover onClose={close}>+ <div inert={saving()} classList={{ 'opacity-50': saving() }}>+ <Suspense fallback={<p role="status">Loading tasks…</p>}>+ <PropertyEntitySelector+ config={{+ specificEntityType: 'TASK',+ isMultiSelect: true,+ placeholder: 'Search tasks…',+ excludedIds,+ }}+ selectedOptions={selected}+ setSelectedOptions={(ids) => {+ if (!saving()) setSelected(ids);+ }}+ onClose={close}+ />+ </Suspense>+ </div>+ <Show when={error()}>+ {(message) => (+ <p role="alert" class="px-3 pb-2 text-sm text-failure">+ {message()}+ </p>+ )}+ </Show>+ <div+ class="flex justify-end gap-2 border-t border-edge-muted p-2"+ onKeyDown={(event) => {+ // The selector owns document-level list navigation; footer buttons+ // keep their native Enter behavior without toggling another task.+ if (['Enter', 'ArrowUp', 'ArrowDown'].includes(event.key))+ event.stopPropagation();+ }}>- {saving()- ? 'Adding tasks…'- : `Add ${selected().size || ''} ${selected().size === 1 ? 'task' : 'tasks'}`}- </Button>- </div>- </div>- </Dialog>+ <Button size="sm" disabled={saving()} onClick={close}>+ Cancel+ </Button>+ <Button+ size="sm"+ variant="cta"+ disabled={saving() || !selected().size}+ onClick={() => void add()}+ >+ {saving()+ ? 'Adding tasks…'+ : `Add ${selected().size || ''} ${selected().size === 1 ? 'task' : 'tasks'}`}+ </Button>+ </div>+ </EditorPopover>+ </Show>+ </Dropdown>);}diff --git a/apps/web/src/features/projects/views/project-tasks-list.tsx b/apps/web/src/features/projects/views/project-tasks-list.tsxindex b0d82e8a0a..762fd404f8 100644--- a/apps/web/src/features/projects/views/project-tasks-list.tsx+++ b/apps/web/src/features/projects/views/project-tasks-list.tsx@@ -6,8 +6,9 @@ import {type TasksViewProviderProps,useTasksView,} from '@app/features/tasks-view/tasks-view-context';+import PlusIcon from '@phosphor/plus.svg';import { Button } from '@ui';-import { type ParentProps, Show } from 'solid-js';+import { type JSX, type ParentProps, Show } from 'solid-js';import { useProjectsContext } from '../context/projects-context';import { createProjectTasksDataSource } from '../queries/project-tasks';@@ -21,7 +22,7 @@ export type ProjectTasksListProps = Omit<'children'> & {onCreateTask?: () => void;- onAddTasks?: () => void;+ addTasksAction?: JSX.Element;};/** Embeds the actual Tasks list, including its controllers, menus and row editors. */@@ -64,7 +65,7 @@ export function ProjectTasksList(props: ProjectTasksListProps) {}function ProjectTasksListBody(props: ProjectTasksListProps) {- const { state, setState } = useTasksView();+ const { state, setState, source } = useTasksView();let listElement: HTMLDivElement | undefined;return (<div class="flex size-full min-h-0 flex-col">@@ -79,14 +80,26 @@ function ProjectTasksListBody(props: ProjectTasksListProps) {/><div class="ml-auto flex shrink-0 items-center gap-3"><TasksControls />- <Show when={props.onAddTasks}>- <Button onClick={props.onAddTasks}>Add existing tasks</Button>- </Show>+ {props.addTasksAction}<Show when={props.onCreateTask}>- <Button onClick={props.onCreateTask}>New task</Button>+ <Button variant="outline" onClick={props.onCreateTask}>+ <PlusIcon class="size-4" />+ New task+ </Button></Show></div></div>+ <Show when={source.paginationError?.()}>+ <div+ role="alert"+ class="flex items-center gap-3 px-3 pb-2 text-sm text-ink-muted"+ >+ Some tasks could not be loaded.+ <Button size="sm" onClick={() => source.retryPagination?.()}>+ Try again+ </Button>+ </div>+ </Show><TaskListref={(element) => {listElement = element;diff --git a/apps/web/src/features/projects/views/project-workspace.tsx b/apps/web/src/features/projects/views/project-workspace.tsxindex 8a4b10579f..deb4bf5ee8 100644--- a/apps/web/src/features/projects/views/project-workspace.tsx+++ b/apps/web/src/features/projects/views/project-workspace.tsx@@ -45,7 +45,6 @@ export function ProjectWorkspace(props: {}) {const definitions = useProjectsContext().createPropertyDefinitionsSource();const [deleting, setDeleting] = createSignal(false);- const [addingTasks, setAddingTasks] = createSignal(false);const [error, setError] = createSignal<string>();const canEdit = () => canEditProject(props.project);const run = async (action: () => Promise<void>) => {@@ -181,7 +180,11 @@ export function ProjectWorkspace(props: {projectId={props.project.id}onOpenTask={props.onOpenTask}onCreateTask={canEdit() ? props.onCreateTask : undefined}- onAddTasks={canEdit() ? () => setAddingTasks(true) : undefined}+ addTasksAction={+ <Show when={canEdit()}>+ <AddProjectTasks project={props.project} />+ </Show>+ }/></Match></Switch>@@ -203,12 +206,6 @@ export function ProjectWorkspace(props: {}/></Show>- <Show when={addingTasks() && canEdit()}>- <AddProjectTasks- project={props.project}- onClose={() => setAddingTasks(false)}- />- </Show></SidePanel.Layout>);}diff --git a/apps/web/src/features/projects/views/projects-sidebar.test.tsx b/apps/web/src/features/projects/views/projects-sidebar.test.tsxnew file mode 100644index 0000000000..16397a9da7--- /dev/null+++ b/apps/web/src/features/projects/views/projects-sidebar.test.tsx@@ -0,0 +1,160 @@+import {+ cleanup,+ fireEvent,+ render,+ screen,+ waitFor,+} from '@solidjs/testing-library';+import {+ type Accessor,+ createResource,+ createRoot,+ createSignal,+ type ParentProps,+} from 'solid-js';+import { afterEach, expect, it, vi } from 'vitest';+import type { ProjectsSource } from '../context/projects-context';+import { ProjectsSidebar } from './projects-sidebar';++vi.mock('@app/components/view-shell', async () => ({+ ...(await import('@app/components/view-shell/CollapsibleSection')),+ ...(await import('@app/components/view-shell/ViewSidebar')),+}));+vi.mock('@app/components/view-shell/ViewShell', () => ({+ ViewSidebarCloseButton: () => null,+ ViewSidebarToggle: () => null,+}));+vi.mock('@ui', async () => ({+ ...(await import('@app/components/ui/utils/classname')),+ ...(await import('@app/components/ui/components/Button')),+}));+vi.mock('@app/components/ui/components/Tooltip', () => ({+ Tooltip: (props: ParentProps) => props.children,+}));+vi.mock('@solid-primitives/resize-observer', () => ({+ createResizeObserver: () => {},+}));+const context = vi.hoisted(() => ({ createCollectionSource: vi.fn() }));+vi.mock('../context/projects-context', () => ({+ useProjectsContext: () => context,+}));+afterEach(() => {+ cleanup();+ vi.clearAllMocks();+});++function setup(overrides: Partial<ProjectsSource> = {}) {+ const source: ProjectsSource = {+ rows: () => [+ {+ project: { id: 'launch', name: 'Launch', updatedAt: '' },+ properties: [],+ },+ ],+ loading: () => false,+ error: () => undefined,+ hasMore: () => false,+ loadingMore: () => false,+ loadMore: vi.fn(async () => {}),+ refresh: vi.fn(async () => {}),+ ...overrides,+ };+ let enabled: Accessor<boolean> = () => false;+ context.createCollectionSource.mockImplementation((_, isEnabled) => {+ enabled = isEnabled;+ return source;+ });+ const [open, setOpen] = createSignal(true);+ const onOpen = vi.fn();+ const onCreate = vi.fn();+ render(() => (+ <ProjectsSidebar+ open={open()}+ onOpenChange={setOpen}+ activeProjectId="launch"+ onOpen={onOpen}+ onCreate={onCreate}+ />+ ));+ return { source, onOpen, onCreate, enabled: () => enabled() };+}++it('highlights the active project and preserves the navigation gesture', () => {+ const { onOpen } = setup();+ const project = screen.getByRole('button', { name: 'Launch' });+ expect(project.getAttribute('aria-current')).toBe('page');+ fireEvent.click(project, { shiftKey: true });+ expect(onOpen).toHaveBeenCalledWith(+ 'launch',+ expect.objectContaining({ shiftKey: true })+ );+});++it('collapses the list and disables reads, then restores it when expanded', async () => {+ const { enabled } = setup();+ const trigger = screen.getByRole('button', { name: 'My projects' });+ expect(enabled()).toBe(true);+ fireEvent.click(trigger);+ expect(enabled()).toBe(false);+ await waitFor(() =>+ expect(screen.queryByRole('navigation', { name: 'My projects' })).toBeNull()+ );+ expect(trigger.getAttribute('aria-expanded')).toBe('false');+ fireEvent.click(trigger);+ expect(enabled()).toBe(true);+ expect(screen.getByRole('button', { name: 'Launch' })).toBeTruthy();+});++it('distinguishes loading from an empty collection', () => {+ const [loading, setLoading] = createSignal(true);+ setup({ rows: () => [], loading });+ expect(screen.getByRole('status').textContent).toBe('Loading projects');+ expect(screen.queryByText('No projects yet')).toBeNull();+ setLoading(false);+ expect(screen.queryByRole('status')).toBeNull();+ expect(screen.getByText('No projects yet')).toBeTruthy();+});++it('keeps the heading and create action available while rows suspend', async () => {+ const pending = Promise.withResolvers<ReturnType<ProjectsSource['rows']>>();+ const resource = createRoot((dispose) => {+ const [rows] = createResource(() => pending.promise);+ return { rows, dispose };+ });+ try {+ const { onCreate } = setup({ rows: resource.rows });+ expect(+ screen.getByRole('status', { name: 'Loading projects' })+ ).toBeTruthy();+ expect(screen.getByRole('button', { name: 'My projects' })).toBeTruthy();+ fireEvent.click(screen.getByRole('button', { name: 'New project' }));+ expect(onCreate).toHaveBeenCalledOnce();+ pending.resolve([]);+ expect(await screen.findByText('No projects yet')).toBeTruthy();+ fireEvent.click(screen.getByRole('button', { name: 'My projects' }));+ fireEvent.click(screen.getByRole('button', { name: 'New project' }));+ expect(onCreate).toHaveBeenCalledTimes(2);+ } finally {+ resource.dispose();+ }+});++it('guards pagination while pending and supports retry after a failed read', async () => {+ const request = Promise.withResolvers<void>();+ const { source } = setup({+ hasMore: () => true,+ loadMore: vi.fn(() => request.promise),+ });+ fireEvent.click(screen.getByRole('button', { name: 'Load more projects' }));+ expect(screen.getByRole('button', { name: 'Loading…' })).toHaveProperty(+ 'disabled',+ true+ );+ expect(source.loadMore).toHaveBeenCalledOnce();+ request.reject(new Error('Network unavailable'));+ expect(await screen.findByRole('alert')).toBeTruthy();+ expect(screen.getByRole('button', { name: 'Launch' })).toBeTruthy();+ fireEvent.click(screen.getByRole('button', { name: 'Try again' }));+ await waitFor(() => expect(source.refresh).toHaveBeenCalledOnce());+ await waitFor(() => expect(screen.queryByRole('alert')).toBeNull());+});diff --git a/apps/web/src/features/projects/views/projects-sidebar.tsx b/apps/web/src/features/projects/views/projects-sidebar.tsxnew file mode 100644index 0000000000..b969b6fa2f--- /dev/null+++ b/apps/web/src/features/projects/views/projects-sidebar.tsx@@ -0,0 +1,114 @@+import { CollapsibleSection, ViewSidebar } from '@app/components/view-shell';+import PlusIcon from '@phosphor/plus.svg';+import StackIcon from '@phosphor/stack.svg';+import { createSignal, For, Show, Suspense } from 'solid-js';+import { ProjectsSidebarSkeleton } from '../components/project-skeletons';+import { useProjectsContext } from '../context/projects-context';++export type ProjectsSidebarProps = {+ open: boolean;+ onOpenChange(open: boolean): void;+ activeProjectId?: string;+ onOpen(id: string, event: MouseEvent): void;+ onCreate(): void;+};++export function ProjectsSidebar(props: ProjectsSidebarProps) {+ // Shares the collection's authorized Soup query and normalized cache client.+ const source = useProjectsContext().createCollectionSource(+ () => ({ sort: 'updated' }),+ () => props.open+ );+ const [pending, setPending] = createSignal(false);+ const [readError, setReadError] = createSignal(false);+ const failed = () => readError() || Boolean(source.error());+ const readProjects = async (action: 'more' | 'refresh') => {+ if (pending() || source.loadingMore()) return;+ setPending(true);+ setReadError(false);+ try {+ if (action === 'more') await source.loadMore();+ else await source.refresh();+ } catch {+ setReadError(true);+ } finally {+ setPending(false);+ }+ };++ return (+ <CollapsibleSection.Root+ open={props.open}+ onOpenChange={props.onOpenChange}+ >+ <CollapsibleSection.Header>+ <CollapsibleSection.Trigger class="flex-1">+ <span class="min-w-0 truncate">My projects</span>+ <CollapsibleSection.Indicator />+ </CollapsibleSection.Trigger>+ <CollapsibleSection.Action label="New project" onClick={props.onCreate}>+ <PlusIcon class="size-3.5" />+ </CollapsibleSection.Action>+ </CollapsibleSection.Header>+ <CollapsibleSection.Content>+ <Suspense fallback={<ProjectsSidebarSkeleton />}>+ <ViewSidebar.Nav+ aria-label="My projects"+ class="max-h-52 overflow-y-auto overscroll-contain"+ >+ <For each={source.rows()}>+ {({ project }) => (+ <ViewSidebar.Item+ active={props.activeProjectId === project.id}+ title={project.name}+ onClick={(event) => props.onOpen(project.id, event)}+ >+ <ViewSidebar.Icon>+ <StackIcon />+ </ViewSidebar.Icon>+ <span class="truncate">{project.name}</span>+ </ViewSidebar.Item>+ )}+ </For>+ <Show when={source.loading()}>+ <ProjectsSidebarSkeleton />+ </Show>+ <Show when={failed()}>+ <p+ role="alert"+ class="px-(--sidebar-item-inset) py-2 text-xs text-ink-muted"+ >+ Could not load projects.+ </p>+ <ViewSidebar.Item+ disabled={pending()}+ onClick={() => void readProjects('refresh')}+ >+ Try again+ </ViewSidebar.Item>+ </Show>+ <Show+ when={+ !source.loading() && !failed() && source.rows()?.length === 0+ }+ >+ <p class="px-(--sidebar-item-inset) py-2 text-xs text-ink-muted">+ No projects yet+ </p>+ </Show>+ <Show when={source.hasMore() && !failed()}>+ <ViewSidebar.Item+ disabled={pending() || source.loadingMore()}+ onClick={() => void readProjects('more')}+ >+ {pending() || source.loadingMore()+ ? 'Loading…'+ : 'Load more projects'}+ </ViewSidebar.Item>+ </Show>+ </ViewSidebar.Nav>+ </Suspense>+ </CollapsibleSection.Content>+ </CollapsibleSection.Root>+ );+}diff --git a/apps/web/src/features/property/component/ListPropertyValue.test.tsx b/apps/web/src/features/property/component/ListPropertyValue.test.tsxnew file mode 100644index 0000000000..560238b876--- /dev/null+++ b/apps/web/src/features/property/component/ListPropertyValue.test.tsx@@ -0,0 +1,96 @@+import { cleanup, render } from '@solidjs/testing-library';+import { createSignal, type JSX } from 'solid-js';+import { afterEach, expect, it, vi } from 'vitest';+import type { EntityProperty } from '../types';+import { ListPropertyValue } from './ListPropertyValue';++vi.mock('@property', async () => {+ const { PropertyText } = await import('../extractors/PropertyText');+ const passthrough = (props: { children: JSX.Element }) => props.children;+ return {+ Property: {+ Root: passthrough,+ Tooltip: passthrough,+ EditTrigger: (props: JSX.ButtonHTMLAttributes<HTMLButtonElement>) => (+ <button {...props} />+ ),+ Text: PropertyText,+ Icon: () => null,+ UserStack: () => null,+ Caret: () => null,+ PopoverEditor: () => null,+ },+ };+});+vi.mock('@property/context/PropertiesContext', () => ({+ usePropertiesContext: () => ({+ entityType: 'TASK',+ canEdit: true,+ saveHandler: { saveProperty: vi.fn() },+ onRefresh: vi.fn(),+ }),+}));+vi.mock('@property/utils', async () => import('../utils/typeGuards'));+vi.mock('@ui', async () => {+ const { cn } = await import('../../../components/ui/utils/classname');+ return {+ cn,+ Layer: (props: { children: JSX.Element }) => props.children,+ };+});+vi.mock('../hooks/usePropertyEntityDisplay', () => ({+ usePropertyEntityDisplay: (id: () => string) => ({+ name: () => (id() === 'launch' ? 'Product launch' : 'Website redesign'),+ icon: () => null,+ }),+}));+vi.mock('../hooks/usePropertyUserDisplay', () => ({+ usePropertyUserDisplay: () => ({ shortName: () => 'Alice' }),+}));++const project: EntityProperty = {+ propertyId: 'task-project',+ propertyDefinitionId: 'project-definition',+ displayName: 'Project',+ isMultiSelect: false,+ owner: { scope: 'system' },+ createdAt: new Date(0),+ updatedAt: new Date(0),+ valueType: 'ENTITY',+ specificEntityType: 'INITIATIVE',+ value: [{ entity_id: 'launch', entity_type: 'INITIATIVE' }],+};++afterEach(cleanup);++it('shows the linked project name and follows reassignment and clearing', () => {+ const [property, setProperty] = createSignal(project);+ const view = render(() => (+ <ListPropertyValue entityId="task" property={property()} />+ ));++ expect(view.getByRole('button').textContent).toBe('Product launch');+ setProperty({+ ...project,+ value: [{ entity_id: 'redesign', entity_type: 'INITIATIVE' }],+ });+ expect(view.getByRole('button').textContent).toBe('Website redesign');+ setProperty({ ...project, value: null });+ expect(view.getByRole('button').textContent).toBe('Project');+});++it('keeps a count when multiple projects are linked', () => {+ const view = render(() => (+ <ListPropertyValue+ entityId="task"+ property={{+ ...project,+ value: [+ { entity_id: 'launch', entity_type: 'INITIATIVE' },+ { entity_id: 'redesign', entity_type: 'INITIATIVE' },+ ],+ }}+ />+ ));+ expect(view.getByRole('button').textContent).toBe('2 items');+});diff --git a/apps/web/src/features/property/component/ListPropertyValue.tsx b/apps/web/src/features/property/component/ListPropertyValue.tsxindex 1274614988..3ba511beaf 100644--- a/apps/web/src/features/property/component/ListPropertyValue.tsx+++ b/apps/web/src/features/property/component/ListPropertyValue.tsx@@ -29,6 +29,7 @@ export function ListPropertyValue(props: {if (isInlineType()) {return (<Property.Root+ class="min-w-0 max-w-full"property={props.property}canEdit={context.canEdit}onSave={context.saveHandler.saveProperty}@@ -51,6 +52,7 @@ export function ListPropertyValue(props: {return (<Property.Root+ class="min-w-0 max-w-full"property={props.property}canEdit={context.canEdit}onSave={context.saveHandler.saveProperty}@@ -102,6 +104,9 @@ export function ListPropertyValue(props: {</Switch><Property.Textproperty={props.property}+ resolveSingleEntity={+ props.property.specificEntityType === 'INITIATIVE'+ }class="min-w-0 max-w-full flex-1 @max-[840px]/u-list:hidden"/></Show>diff --git a/apps/web/src/features/property/component/PropertyValuePill.tsx b/apps/web/src/features/property/component/PropertyValuePill.tsxindex bb1eac43ee..0aa5cba536 100644--- a/apps/web/src/features/property/component/PropertyValuePill.tsx+++ b/apps/web/src/features/property/component/PropertyValuePill.tsx@@ -55,7 +55,10 @@ export function PropertyValuePill(props: PropertyValuePillProps) {</Switch><Property.Textproperty={props.property}- resolveSingleEntity={props.showLabel}+ resolveSingleEntity={+ props.showLabel ||+ props.property.specificEntityType === 'INITIATIVE'+ }class="min-w-0 max-w-60"fallback={<Property.Emptydiff --git a/apps/web/src/features/property/extractors/PropertyTooltip.tsx b/apps/web/src/features/property/extractors/PropertyTooltip.tsxindex c851e1bad4..dd70a3ba1f 100644--- a/apps/web/src/features/property/extractors/PropertyTooltip.tsx+++ b/apps/web/src/features/property/extractors/PropertyTooltip.tsx@@ -26,6 +26,7 @@ export function PropertyTooltip(props: Props) {const hasActions = () => actions.toArray().length > 0;return (<HoverCard+ triggerClass="min-w-0 max-w-full"content={<div class="min-w-0"><CorePropertyTooltip property={props.property} />diff --git a/apps/web/src/features/tasks-view/components/TasksSidebar.tsx b/apps/web/src/features/tasks-view/components/TasksSidebar.tsxindex d596f9acae..36f8792187 100644--- a/apps/web/src/features/tasks-view/components/TasksSidebar.tsx+++ b/apps/web/src/features/tasks-view/components/TasksSidebar.tsx@@ -6,8 +6,10 @@ import {import { SidebarCreateHeader } from '@app/components/view-shell/SidebarCreateButton';import { FavoriteContextMenu } from '@app/features/favorites/FavoriteContextMenu';import { FavoriteIcon } from '@app/features/favorites/FavoriteIcon';+import { openProject } from '@app/features/projects/open-project';+import { ProjectsSidebarSection } from '@app/features/projects/projects';import { useFeatureFlag } from '@app/lib/analytics/posthog';-import { useNavigate } from '@app/lib/split-router';+import { useNavigate, useParams } from '@app/lib/split-router';import { reviewsSplitRoute } from '@app/routes/routes';import {favoriteSplitContent,@@ -165,6 +167,7 @@ function TaskFavorites(props: {export function TasksSidebar() {const layout = useSplitLayout();+ const routeParams = useParams<{ projectId?: string }>();const navigate = useNavigate();const panel = useSplitPanelOrThrow();const reviewsFlag = useFeatureFlag(enableTasksReviews);@@ -214,6 +217,19 @@ export function TasksSidebar() {open={isSidebarSectionOpen('favorites')}onOpenChange={(open) => setSidebarSectionOpen('favorites', open)}/>+ <Show when={projectsEnabled()}>+ <ProjectsSidebarSection+ open={isSidebarSectionOpen('projects')}+ onOpenChange={(open) => setSidebarSectionOpen('projects', open)}+ activeProjectId={routeParams.projectId}+ onCreate={() =>+ layout.popoverSplit({ type: 'component', id: 'project-compose' })+ }+ onOpen={(id, event) =>+ openProject(layout, id, { newSplit: event.shiftKey })+ }+ />+ </Show><div ref={tourTarget(TASKS_TOUR.tags)}><SidebarTagsSectionactiveIds={state.facets.tags ?? []}diff --git a/apps/web/src/features/tasks-view/queries/automatic-task-pagination.test.ts b/apps/web/src/features/tasks-view/queries/automatic-task-pagination.test.tsnew file mode 100644index 0000000000..9ad947d1a4--- /dev/null+++ b/apps/web/src/features/tasks-view/queries/automatic-task-pagination.test.ts@@ -0,0 +1,111 @@+import { createRoot, createSignal } from 'solid-js';+import { afterEach, expect, it, vi } from 'vitest';+import {+ createAutomaticTaskPagination,+ type TaskPageSource,+} from './automatic-task-pagination';++let dispose: (() => void) | undefined;+afterEach(() => dispose?.());+function setup(+ sources: () => TaskPageSource[],+ enabled = () => true,+ scope = () => 'project'+) {+ return createRoot((cleanup) => {+ dispose = cleanup;+ return createAutomaticTaskPagination({ sources, enabled, scope });+ });+}++it('drains every group independently without duplicate in-flight requests', async () => {+ const [pages, setPages] = createSignal([3, 2]);+ const pending = Promise.withResolvers<void>();+ const load = vi.fn(async (index: number) => {+ await pending.promise;+ setPages((counts) =>+ counts.map((count, i) => (i === index ? count - 1 : count))+ );+ });+ setup(() =>+ pages().map((count, index) => ({+ id: String(index),+ hasMore: count > 0,+ pending: false,+ load: () => load(index),+ error: () => null,+ }))+ );+ expect(load).toHaveBeenCalledTimes(2);+ pending.resolve();+ await vi.waitFor(() => expect(pages()).toEqual([0, 0]));+ expect(load).toHaveBeenCalledTimes(5);+});++it('stops after a resolved query failure and resumes only on retry', async () => {+ const [remaining, setRemaining] = createSignal(true);+ let failure: Error | null = new Error('Offline');+ const load = vi.fn(async () => {+ if (!failure) setRemaining(false);+ });+ const pagination = setup(() => [+ {+ id: 'group',+ hasMore: remaining(),+ pending: false,+ load,+ error: () => failure,+ },+ ]);+ await vi.waitFor(() => expect(pagination.error()).toBe(failure));+ expect(load).toHaveBeenCalledOnce();+ failure = null;+ pagination.retry();+ await vi.waitFor(() => expect(remaining()).toBe(false));+ expect(load).toHaveBeenCalledTimes(2);+});++it('does not continue fetching when access is lost during a request', async () => {+ const [enabled, setEnabled] = createSignal(true);+ const pending = Promise.withResolvers<void>();+ const load = vi.fn(() => pending.promise);+ setup(+ () => [+ { id: 'group', hasMore: true, pending: false, load, error: () => null },+ ],+ enabled+ );+ setEnabled(false);+ pending.resolve();+ await pending.promise;+ await Promise.resolve();+ expect(load).toHaveBeenCalledOnce();+});++it('ignores a stale request failure after the project or filters change', async () => {+ const [scope, setScope] = createSignal('old');+ const [remaining, setRemaining] = createSignal(true);+ const pending = Promise.withResolvers<void>();+ const pagination = setup(+ () => [+ {+ id: 'group',+ hasMore: remaining(),+ pending: false,+ load:+ scope() === 'old'+ ? () => pending.promise+ : async () => {+ setRemaining(false);+ },+ error: () => null,+ },+ ],+ () => true,+ scope+ );+ setScope('new');+ pending.reject(new Error('Old request failed'));+ await vi.waitFor(() => expect(remaining()).toBe(false));+ expect(pagination.error()).toBeUndefined();+});diff --git a/apps/web/src/features/tasks-view/queries/automatic-task-pagination.ts b/apps/web/src/features/tasks-view/queries/automatic-task-pagination.tsnew file mode 100644index 0000000000..a82fe6ba70--- /dev/null+++ b/apps/web/src/features/tasks-view/queries/automatic-task-pagination.ts@@ -0,0 +1,73 @@+import {+ type Accessor,+ createEffect,+ createSignal,+ onCleanup,+ untrack,+} from 'solid-js';++export type TaskPageSource = {+ id: string;+ hasMore: boolean;+ pending: boolean;+ load(): Promise<void>;+ error(): unknown;+};++/** Drains independent cursor chains, one request per chain at a time. */+export function createAutomaticTaskPagination(options: {+ enabled: Accessor<boolean>;+ scope: Accessor<string>;+ sources: Accessor<TaskPageSource[]>;+}) {+ const [error, setError] = createSignal<unknown>();+ const [revision, setRevision] = createSignal(0);+ const running = new Map<string, object>();+ let scope: string | undefined;+ let generation = 0;+ let disposed = false;+ onCleanup(() => {+ disposed = true;+ });++ const load = async (+ source: TaskPageSource,+ token: object,+ version: number+ ) => {+ try {+ await source.load();+ if (disposed || version !== generation) return;+ const failure = source.error();+ if (failure) setError(() => failure);+ } catch (failure) {+ if (!disposed && version === generation) setError(() => failure);+ } finally {+ if (!disposed && running.get(source.id) === token) {+ running.delete(source.id);+ setRevision((value) => value + 1);+ }+ }+ };++ // This effect drives network reads as cursors settle; it does not derive UI state.+ createEffect(() => {+ revision();+ const nextScope = options.scope();+ if (nextScope !== scope) {+ scope = nextScope;+ generation += 1;+ running.clear();+ setError(undefined);+ }+ if (!options.enabled() || error()) return;+ for (const source of options.sources()) {+ if (!source.hasMore || source.pending || running.has(source.id)) continue;+ const token = {};+ running.set(source.id, token);+ untrack(() => void load(source, token, generation));+ }+ });++ return { error, retry: () => setError(undefined) };+}diff --git a/apps/web/src/features/tasks-view/queries/use-tasks-query.test.ts b/apps/web/src/features/tasks-view/queries/use-tasks-query.test.tsindex 87ce5fdec5..c44110ee46 100644--- a/apps/web/src/features/tasks-view/queries/use-tasks-query.test.ts+++ b/apps/web/src/features/tasks-view/queries/use-tasks-query.test.ts@@ -37,6 +37,94 @@ vi.mock('@queries/soup/grouped/create-grouped-soup-queries', () => ({import { useTasksDataSource } from './use-tasks-query';+it.each([false, true])(+ 'loads all group pages only when requested (%s)',+ async (loadAll) => {+ const tasks = Array.from({ length: 20 }, (_, index) => ({+ type: 'document',+ fileType: 'md',+ id: `task-${index}`,+ name: `Task ${index}`,+ ownerId: 'viewer',+ createdAt: new Date(),+ updatedAt: new Date(),+ subType: { type: 'task', is_completed: false },+ properties: [],+ })) as unknown as TaskEntityWithProperties[];+ const [loaded, setLoaded] = createSignal(false);+ const fetchNextPage = vi.fn(async () => {+ setLoaded(true);+ });+ fixture.query = {+ isLoading: false,+ isPending: false,+ isPlaceholderData: false,+ hasNextPage: false,+ data: {+ entities: tasks.slice(0, 10),+ itemsById: {},+ groups: [+ {+ key: 'todo',+ label: 'To do',+ displayOrder: 0,+ totalCount: 20,+ itemIds: tasks.slice(0, 10).map((task) => task.id),+ nextCursor: 'next',+ },+ ],+ },+ };+ fixture.groupQueries = new Map([+ [+ 'todo',+ {+ key: 'todo',+ data: () => ({ entities: loaded() ? tasks.slice(10) : [] }),+ hasNextPage: () => !loaded(),+ isFetchingNextPage: () => false,+ fetchNextPage,+ error: () => null,+ },+ ],+ ]);+ let cleanup = () => {};+ const source = createRoot((dispose) => {+ cleanup = dispose;+ return useTasksDataSource(+ {+ tab: 'team-tasks',+ search: '',+ facets: {},+ groupBy: 'status',+ sort: [],+ },+ {+ userId: () => 'viewer',+ tagSets: () => [],+ tagSetsReady: () => true,+ isGroupExpanded: () => true,+ loadAll,+ }+ );+ });+ try {+ await vi.waitFor(() =>+ expect(+ source.items().filter((row) => row.kind === 'entity')+ ).toHaveLength(loadAll ? 20 : 10)+ );+ expect(fetchNextPage).toHaveBeenCalledTimes(loadAll ? 1 : 0);+ expect(source.items().some((row) => row.kind === 'load-more')).toBe(+ !loadAll+ );+ } finally {+ cleanup();+ fixture.groupQueries = new Map();+ }+ }+);+it('retains cached rows while a referenced list refetches and hides them when disabled', () => {const [placeholder, setPlaceholder] = createSignal(false);const [enabled, setEnabled] = createSignal(true);diff --git a/apps/web/src/features/tasks-view/queries/use-tasks-query.ts b/apps/web/src/features/tasks-view/queries/use-tasks-query.tsindex 60670fbd73..e9861ea6d7 100644--- a/apps/web/src/features/tasks-view/queries/use-tasks-query.ts+++ b/apps/web/src/features/tasks-view/queries/use-tasks-query.ts@@ -33,6 +33,7 @@ import {taskMatchesView,} from '../filters/task-predicates';import type { TaskReferenceScope, TasksViewState } from '../types';+import { createAutomaticTaskPagination } from './automatic-task-pagination';import { buildTaskQuery } from './task-query';import { buildTaskSearchRequest } from './task-search';@@ -50,12 +51,16 @@ export type UseTasksDataSourceOptions = {reference?: Accessor<TaskReferenceScope>;enabled?: Accessor<boolean>;networkPaused?: Accessor<boolean>;+ /** Project lists drain all cursors instead of requiring per-group Load More. */+ loadAll?: boolean;};export type TasksDataSourceItem = SoupRow<TaskEntityWithProperties>;export type TasksDataSource = ListDataSource<TasksDataSourceItem> & {loadMoreGroup: (groupId: string) => Promise<void>;+ paginationError?: Accessor<unknown>;+ retryPagination?: () => void;};type TaskGroupContinuationReader = {@@ -207,6 +212,56 @@ export function useTasksDataSource(const groupQueryFor = (groupKey: string) =>groupedQueries.map().get(groupKey);+ const automatic = createAutomaticTaskPagination({+ enabled: () =>+ Boolean(options.loadAll) &&+ facetOptionsReady() &&+ !options.networkPaused?.(),+ scope: () =>+ JSON.stringify([+ queryArgs(),+ state.search,+ options.userId(),+ options.enabled?.(),+ ]),+ sources: () => {+ if (search.isSearching()) {+ return [+ {+ id: 'search',+ hasMore: search.hasNextPage(),+ pending: search.isFetching(),+ load: async () => {+ await search.fetchNextPage();+ },+ error: search.error,+ },+ ];+ }+ if (query.isPending || query.isPlaceholderData) return [];+ return [+ {+ id: 'list',+ hasMore: query.hasNextPage,+ pending: query.isFetching,+ load: async () => {+ await query.fetchNextPage();+ },+ error: () => query.error,+ },+ ...[...groupedQueries.map().values()].map((group) => ({+ id: `group:${group.key}`,+ hasMore: group.hasNextPage(),+ pending: group.isFetchingNextPage(),+ load: async () => {+ await group.fetchNextPage();+ },+ error: group.error,+ })),+ ];+ },+ });+const continuations: TaskGroupContinuationReader = {entities: (groupKey) =>(groupQueryFor(groupKey)?.data()?.entities ?? []).flatMap((entity) =>@@ -277,7 +332,7 @@ export function useTasksDataSource(count: group.totalCount,};- if (continuations.hasMore(group.key)) {+ if (!options.loadAll && continuations.hasMore(group.key)) {taskGroup.loadMore = {scopeId: `tasks:${group.key}`,isLoading: continuations.isLoading(group.key),@@ -325,6 +380,7 @@ export function useTasksDataSource(};const hasMore = () => {+ if (options.loadAll) return false;if (usesServiceSearch()) return search.hasNextPage();return query.hasNextPage;};@@ -361,5 +417,7 @@ export function useTasksDataSource(loadMoreGroup: continuations.loadMore,loadMore,refresh,+ paginationError: automatic.error,+ retryPagination: automatic.retry,} satisfies TasksDataSource;}diff --git a/apps/web/src/lib/core/collab-surface/CollabMarkdownEditor.tsx b/apps/web/src/lib/core/collab-surface/CollabMarkdownEditor.tsxindex ab2c88952f..71cacbde24 100644--- a/apps/web/src/lib/core/collab-surface/CollabMarkdownEditor.tsx+++ b/apps/web/src/lib/core/collab-surface/CollabMarkdownEditor.tsx@@ -87,6 +87,8 @@ export type CollabMarkdownEditorProps = {resolveAppLink?: MentionLinkResolver;/** Optional status UI rendered by the collab provider. */statusChrome?: JSX.Element;+ /** Loading content shown until the editor has applied its initial state. */+ loadingFallback?: JSX.Element;};false && fileFolderDrop;@@ -235,10 +237,18 @@ export function CollabMarkdownEditor(props: CollabMarkdownEditorProps) {}}/>- <Show when={!editorReady()}>+ <Show+ when={+ !editorReady() && !editorError() && !session.connectionError()+ }+ ><div class="absolute inset-0 flex flex-col gap-2 pointer-events-none">- <div class="h-4 w-2/3 animate-pulse rounded bg-ink/10" />- <div class="h-4 w-1/2 animate-pulse rounded bg-ink/10" />+ {props.loadingFallback ?? (+ <>+ <div class="h-4 w-2/3 animate-pulse rounded bg-ink/10" />+ <div class="h-4 w-1/2 animate-pulse rounded bg-ink/10" />+ </>+ )}</div></Show>diff --git a/apps/web/src/lib/queries/create-infinite-queries.ts b/apps/web/src/lib/queries/create-infinite-queries.tsindex 97fdc61dc3..9e5207ce19 100644--- a/apps/web/src/lib/queries/create-infinite-queries.ts+++ b/apps/web/src/lib/queries/create-infinite-queries.ts@@ -32,6 +32,7 @@ type InfiniteQueryResult<TData, TSelect> = {data: Accessor<TSelect | undefined>;hasNextPage: Accessor<boolean>;isFetchingNextPage: Accessor<boolean>;+ error: Accessor<Error | null>;fetchNextPage: () => Promise<InfiniteQueryObserverResult<InfiniteData<TData | null, string | null>,@@ -117,6 +118,7 @@ export function createInfiniteQueries<TData, TSelect = TData[]>(data,hasNextPage: () => query.hasNextPage ?? false,isFetchingNextPage: () => query.isFetchingNextPage,+ error: () => query.error,fetchNextPage: () => query.fetchNextPage(),refetch: () => query.refetch(),};diff --git a/apps/web/src/lib/queries/soup/grouped/graphql/create-graphql-grouped-soup-queries.test.ts b/apps/web/src/lib/queries/soup/grouped/graphql/create-graphql-grouped-soup-queries.test.tsindex 8b95cc66c4..448ca9b5e4 100644--- a/apps/web/src/lib/queries/soup/grouped/graphql/create-graphql-grouped-soup-queries.test.ts+++ b/apps/web/src/lib/queries/soup/grouped/graphql/create-graphql-grouped-soup-queries.test.ts@@ -402,6 +402,7 @@ describe('createGraphqlGroupedSoupQueries', () => {);await failedFetch;+ expect(a.error()?.message).toContain('continuation failed');expect(entityIds(a)).toEqual(['a-1']);expect(a.hasNextPage()).toBe(true);expect(a.isFetchingNextPage()).toBe(false);@@ -415,6 +416,7 @@ describe('createGraphqlGroupedSoupQueries', () => {fake.executions[2]?.next(page([group('a', ['a-2'], null)], [item('a-2')]));await retry;+ expect(a.error()).toBeNull();expect(entityIds(a)).toEqual(['a-1', 'a-2']);expect(a.hasNextPage()).toBe(false);});diff --git a/apps/web/src/lib/queries/soup/grouped/graphql/create-graphql-grouped-soup-queries.ts b/apps/web/src/lib/queries/soup/grouped/graphql/create-graphql-grouped-soup-queries.tsindex 3bc68a50d2..bc14f8173b 100644--- a/apps/web/src/lib/queries/soup/grouped/graphql/create-graphql-grouped-soup-queries.ts+++ b/apps/web/src/lib/queries/soup/grouped/graphql/create-graphql-grouped-soup-queries.ts@@ -62,6 +62,7 @@ type GraphqlGroupQuery = {data: Accessor<GroupQueryData | undefined>;hasNextPage: Accessor<boolean>;isFetchingNextPage: Accessor<boolean>;+ error: Accessor<Error | null>;fetchNextPage: () => Promise<void>;resetToInitialPage: () => void;dispose: () => void;@@ -380,6 +381,7 @@ export function createGraphqlGroupedSoupQueries(return {key,data,+ error: () => getContinuation()?.query.error ?? null,hasNextPage: () => {if (cachedMail()) return false;const current = getContinuation();diff --git a/docs/AGENT_GUIDE/tasks.md b/docs/AGENT_GUIDE/tasks.mdindex 2104f65210..158171e991 100644--- a/docs/AGENT_GUIDE/tasks.md+++ b/docs/AGENT_GUIDE/tasks.md@@ -17,8 +17,24 @@ off-topic text) keep the typed text and show a red error there instead. The boxfocus while you type even if the pointer drifts over the rows; ArrowDown moves intothe rows and hovering a submenu hands focus to it as usual. The mobile drawer has noAI box.-Task creation is available from the `New` button in the Tasks sidebar. Below the tabs the-sidebar has a collapsible `Tags` section listing every personal and team tag, with a+Task creation is available from the `New` button in the Tasks sidebar. With Projects+enabled, `My projects` appears below the tabs and favorites, above Tags. It lists+accessible projects by most recently updated, with a capped height and its own scroll+area. Click a project to open its overview, or Shift-click to open it in a new split.+The current project is highlighted. Collapse the heading to hide the list; this+preference persists. `Load more projects` fetches the next page when available.+The plus button beside `My projects` opens the project composer, even while the+section is collapsed or loading. Its rows use the shared project query/cache and+load inside a local Suspense boundary, leaving sidebar controls available.+Opening a project shows a content-shaped skeleton while its data loads: title,+wrapping property pills, description, and discussion for Overview; toolbar and+rows for Tasks. The mobile skeleton uses the same compact insets as the content.+The description has its own subtle three-line skeleton while its collaborative+editor initializes; the project title, properties, and discussion stay visible.+Project task lists automatically fetch all matching pages in every group, without+per-group `Load More` rows. A failed continuation stops automatic requests and shows+`Try again` above the list; already fetched group rows remain available.+The sidebar also has a collapsible `Tags` section listing every personal and team tag, with a`New tag` button beside the heading. Clicking a tag narrows the current tab to taskscarrying it (the same selection as the `Tags` group of the `Filter` menu); clicking it againclears it, and switching tabs clears it like any other filter. On mobile, the tabs@@ -34,6 +50,13 @@ does nothing. Typing H in a text field remains ordinary input.New accounts are seeded with three sample tasks (`Intro to tasks`, `Advanced task features`,`How we use tasks at Macro`).+The Project column shows the linked project's name when one project is assigned,+and `Project` when empty. Multiple linked projects show an item count.+Long assignee and project names truncate within their columns; hover the cell+to read the full value.+The project pill beneath a task title shows the project icon and name without+a `Project:` prefix.+Click a task row or favorite to replace the list with the editable task document. Its topbar shows the originating task tab as a text-only return breadcrumb,followed by the task name and actions, Share, and the Details/Properties side-panel@@ -276,9 +299,11 @@ request carries it, so there is no separate assignment step. The new row appearsonce the task is created. Verify this with GraphQL Soup both enabled anddisabled. The section tabsuse the same control as Channels. Editors can choose `Add existing tasks` beside-`New task`, search for tasks, select several, and confirm `Add N tasks`. Tasks+`New task`; both actions use bordered buttons with a background. `Add existing+tasks` opens an anchored task-selector dropdown: search, select several, and+confirm `Add N tasks`. Escape or Cancel dismisses without assigning tasks. Tasksalready in this project are excluded. Adding a task moves it from its previous-project; the dialog explains this before saving. A partial failure keeps only+project. A partial failure keeps onlyfailed tasks selected for retry, and a request failure preserves the selection.The regular Tasks list includes a Project column. Its cell is a regular property