Skip to content

Commit ddc8c71

Browse files
Add project filtering to mobile thread navigation
- Add project scope menus and filter state across home and sidebar views - Refresh dynamic native header menus as project data loads - Add coverage for project filter menu actions
1 parent 6ddc391 commit ddc8c71

7 files changed

Lines changed: 339 additions & 25 deletions

File tree

‎apps/mobile/src/features/home/HomeHeader.tsx‎

Lines changed: 64 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import type { HomeProjectSortOrder } from "./homeThreadList";
2424
import {
2525
buildHomeListFilterMenu,
2626
type HomeListFilterMenuEnvironment,
27+
type HomeListFilterMenuProject,
2728
} from "./home-list-filter-menu";
2829
import {
2930
hasCustomHomeListOptions,
@@ -36,13 +37,16 @@ export type HomeHeaderEnvironment = HomeListFilterMenuEnvironment;
3637

3738
export function HomeHeader(props: {
3839
readonly environments: ReadonlyArray<HomeHeaderEnvironment>;
40+
readonly projects: ReadonlyArray<HomeListFilterMenuProject>;
3941
readonly searchQuery: string;
4042
readonly selectedEnvironmentId: EnvironmentId | null;
43+
readonly selectedProjectKey: string | null;
4144
readonly projectSortOrder: HomeProjectSortOrder;
4245
readonly threadSortOrder: SidebarThreadSortOrder;
4346
readonly projectGroupingMode: SidebarProjectGroupingMode;
4447
readonly onSearchQueryChange: (query: string) => void;
4548
readonly onEnvironmentChange: (environmentId: EnvironmentId | null) => void;
49+
readonly onProjectChange: (projectKey: string | null) => void;
4650
readonly onProjectSortOrderChange: (sortOrder: HomeProjectSortOrder) => void;
4751
readonly onThreadSortOrderChange: (sortOrder: SidebarThreadSortOrder) => void;
4852
readonly onProjectGroupingModeChange: (mode: SidebarProjectGroupingMode) => void;
@@ -78,7 +82,7 @@ function AndroidHomeHeader(props: HomeHeaderProps) {
7882
const mutedColor = useThemeColor("--color-foreground-muted");
7983
const threadListV2Enabled = useThreadListV2FilterGate();
8084
const hasCustomListOptions = threadListV2Enabled
81-
? props.selectedEnvironmentId !== null
85+
? props.selectedEnvironmentId !== null || props.selectedProjectKey !== null
8286
: hasCustomHomeListOptions(props);
8387
const menuActions = useMemo<MenuAction[]>(
8488
() => [
@@ -98,6 +102,26 @@ function AndroidHomeHeader(props: HomeHeaderProps) {
98102
})),
99103
],
100104
},
105+
...(props.projects.length === 0
106+
? []
107+
: ([
108+
{
109+
id: "project",
110+
title: "Project",
111+
subactions: [
112+
{
113+
id: "project:all",
114+
title: "All projects",
115+
state: checkedMenuState(props.selectedProjectKey === null),
116+
},
117+
...props.projects.map((project) => ({
118+
id: `project:${project.key}`,
119+
title: project.label,
120+
state: checkedMenuState(props.selectedProjectKey === project.key),
121+
})),
122+
],
123+
},
124+
] satisfies MenuAction[])),
101125
...(threadListV2Enabled
102126
? []
103127
: ([
@@ -134,7 +158,9 @@ function AndroidHomeHeader(props: HomeHeaderProps) {
134158
props.environments,
135159
props.projectGroupingMode,
136160
props.projectSortOrder,
161+
props.projects,
137162
props.selectedEnvironmentId,
163+
props.selectedProjectKey,
138164
props.threadSortOrder,
139165
threadListV2Enabled,
140166
],
@@ -158,6 +184,19 @@ function AndroidHomeHeader(props: HomeHeaderProps) {
158184
return;
159185
}
160186

187+
if (id === "project:all") {
188+
props.onProjectChange(null);
189+
return;
190+
}
191+
192+
if (id.startsWith("project:")) {
193+
const projectKey = id.slice("project:".length);
194+
if (props.projects.some((project) => project.key === projectKey)) {
195+
props.onProjectChange(projectKey);
196+
}
197+
return;
198+
}
199+
161200
const projectSort = PROJECT_SORT_OPTIONS.find(
162201
(option) => id === `project-sort:${option.value}`,
163202
);
@@ -278,7 +317,7 @@ function IosHomeHeader(props: HomeHeaderProps) {
278317
const iconColor = useThemeColor("--color-icon");
279318
const threadListV2Enabled = useThreadListV2FilterGate();
280319
const hasCustomListOptions = threadListV2Enabled
281-
? props.selectedEnvironmentId !== null
320+
? props.selectedEnvironmentId !== null || props.selectedProjectKey !== null
282321
: hasCustomHomeListOptions(props);
283322
const focusSearch = useCallback(() => {
284323
searchBarRef.current?.focus();
@@ -293,6 +332,7 @@ function IosHomeHeader(props: HomeHeaderProps) {
293332
return (
294333
<>
295334
<NativeStackScreenOptions
335+
optionsVersion={filterMenu.items}
296336
options={{
297337
// Static header config (glass, title, fonts) lives in Stack.tsx
298338
// (GLASS_HEADER_OPTIONS). Only dynamic values are set here.
@@ -393,6 +433,28 @@ function IosHomeHeader(props: HomeHeaderProps) {
393433
))}
394434
</NativeHeaderToolbar.Menu>
395435

436+
{props.projects.length > 0 ? (
437+
<NativeHeaderToolbar.Menu title="Project">
438+
<NativeHeaderToolbar.Label>Project</NativeHeaderToolbar.Label>
439+
<NativeHeaderToolbar.MenuAction
440+
isOn={props.selectedProjectKey === null}
441+
onPress={() => props.onProjectChange(null)}
442+
subtitle="Show threads from every project"
443+
>
444+
<NativeHeaderToolbar.Label>All projects</NativeHeaderToolbar.Label>
445+
</NativeHeaderToolbar.MenuAction>
446+
{props.projects.map((project) => (
447+
<NativeHeaderToolbar.MenuAction
448+
key={project.key}
449+
isOn={props.selectedProjectKey === project.key}
450+
onPress={() => props.onProjectChange(project.key)}
451+
>
452+
<NativeHeaderToolbar.Label>{project.label}</NativeHeaderToolbar.Label>
453+
</NativeHeaderToolbar.MenuAction>
454+
))}
455+
</NativeHeaderToolbar.Menu>
456+
) : null}
457+
396458
<NativeHeaderToolbar.Menu title="Sort projects">
397459
<NativeHeaderToolbar.Label>Sort projects</NativeHeaderToolbar.Label>
398460
{PROJECT_SORT_OPTIONS.map((option) => (

‎apps/mobile/src/features/home/HomeRouteScreen.tsx‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import * as Arr from "effect/Array";
22
import * as Order from "effect/Order";
33
import { useNavigation } from "@react-navigation/native";
4-
import { useMemo, useState } from "react";
4+
import { useEffect, useMemo, useState } from "react";
55

66
import { NativeHeaderToolbar, NativeStackScreenOptions } from "../../native/StackHeader";
7+
import { scopedProjectKey } from "../../lib/scopedEntities";
78
import { useProjects, useThreadShells } from "../../state/entities";
89
import { usePendingNewTasks } from "../../state/use-pending-new-tasks";
910
import { useWorkspaceState } from "../../state/workspace";
@@ -58,6 +59,28 @@ export function HomeRouteScreen() {
5859
setThreadSortOrder,
5960
} = useHomeListOptions(availableEnvironmentIds);
6061
const selectedEnvironmentId = listOptions.selectedEnvironmentId;
62+
const [selectedProjectKey, setSelectedProjectKey] = useState<string | null>(null);
63+
const projectFilterOptions = useMemo(
64+
() =>
65+
projects
66+
.filter(
67+
(project) =>
68+
selectedEnvironmentId === null || project.environmentId === selectedEnvironmentId,
69+
)
70+
.map((project) => ({
71+
key: scopedProjectKey(project.environmentId, project.id),
72+
label: project.title,
73+
})),
74+
[projects, selectedEnvironmentId],
75+
);
76+
useEffect(() => {
77+
if (
78+
selectedProjectKey !== null &&
79+
!projectFilterOptions.some((project) => project.key === selectedProjectKey)
80+
) {
81+
setSelectedProjectKey(null);
82+
}
83+
}, [projectFilterOptions, selectedProjectKey]);
6184

6285
// In split layouts the persistent sidebar IS the thread list — Home becomes
6386
// an empty detail pane so selecting a thread never transitions layouts.
@@ -90,12 +113,15 @@ export function HomeRouteScreen() {
90113
<NativeStackScreenOptions options={{ title: "Threads", headerTitle: "Threads" }} />
91114
<HomeHeader
92115
environments={environments}
116+
projects={projectFilterOptions}
93117
searchQuery={searchQuery}
94118
selectedEnvironmentId={selectedEnvironmentId}
119+
selectedProjectKey={selectedProjectKey}
95120
projectSortOrder={listOptions.projectSortOrder}
96121
threadSortOrder={listOptions.threadSortOrder}
97122
projectGroupingMode={listOptions.projectGroupingMode}
98123
onEnvironmentChange={setSelectedEnvironmentId}
124+
onProjectChange={setSelectedProjectKey}
99125
onOpenSettings={() => navigation.navigate("SettingsSheet", { screen: "Settings" })}
100126
onProjectGroupingModeChange={setProjectGroupingMode}
101127
onProjectSortOrderChange={setProjectSortOrder}
@@ -115,6 +141,7 @@ export function HomeRouteScreen() {
115141
onSettleThread={settleThread}
116142
onUnsettleThread={unsettleThread}
117143
onEnvironmentChange={setSelectedEnvironmentId}
144+
onProjectChange={setSelectedProjectKey}
118145
onOpenEnvironments={() =>
119146
navigation.navigate("SettingsSheet", { screen: "SettingsEnvironments" })
120147
}
@@ -151,6 +178,7 @@ export function HomeRouteScreen() {
151178
savedConnectionsById={savedConnectionsById}
152179
searchQuery={searchQuery}
153180
selectedEnvironmentId={selectedEnvironmentId}
181+
selectedProjectKey={selectedProjectKey}
154182
threads={threads}
155183
threadSortOrder={listOptions.threadSortOrder}
156184
/>

‎apps/mobile/src/features/home/HomeScreen.tsx‎

Lines changed: 47 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,13 @@ interface HomeScreenProps {
7070
readonly environments: ReadonlyArray<HomeListFilterMenuEnvironment>;
7171
readonly searchQuery: string;
7272
readonly selectedEnvironmentId: EnvironmentId | null;
73+
readonly selectedProjectKey: string | null;
7374
readonly projectSortOrder: HomeProjectSortOrder;
7475
readonly threadSortOrder: SidebarThreadSortOrder;
7576
readonly projectGroupingMode: SidebarProjectGroupingMode;
7677
readonly onSearchQueryChange: (query: string) => void;
7778
readonly onEnvironmentChange: (environmentId: EnvironmentId | null) => void;
79+
readonly onProjectChange: (projectKey: string | null) => void;
7880
readonly onProjectSortOrderChange: (sortOrder: HomeProjectSortOrder) => void;
7981
readonly onThreadSortOrderChange: (sortOrder: SidebarThreadSortOrder) => void;
8082
readonly onProjectGroupingModeChange: (mode: SidebarProjectGroupingMode) => void;
@@ -317,27 +319,64 @@ export function HomeScreen(props: HomeScreenProps) {
317319
onScrollBeginDrag: handleScrollBeginDrag,
318320
});
319321

322+
const scopedProject = useMemo(
323+
() =>
324+
props.selectedProjectKey === null
325+
? null
326+
: (props.projects.find(
327+
(project) =>
328+
scopedProjectKey(project.environmentId, project.id) === props.selectedProjectKey,
329+
) ?? null),
330+
[props.projects, props.selectedProjectKey],
331+
);
332+
const scopedProjects = useMemo(
333+
() => (scopedProject === null ? props.projects : [scopedProject]),
334+
[props.projects, scopedProject],
335+
);
336+
const scopedThreads = useMemo(
337+
() =>
338+
scopedProject === null
339+
? props.threads
340+
: props.threads.filter(
341+
(thread) =>
342+
thread.environmentId === scopedProject.environmentId &&
343+
thread.projectId === scopedProject.id,
344+
),
345+
[props.threads, scopedProject],
346+
);
347+
const scopedPendingTasks = useMemo(
348+
() =>
349+
scopedProject === null
350+
? props.pendingTasks
351+
: props.pendingTasks.filter(
352+
(pendingTask) =>
353+
pendingTask.message.environmentId === scopedProject.environmentId &&
354+
pendingTask.creation.projectId === scopedProject.id,
355+
),
356+
[props.pendingTasks, scopedProject],
357+
);
358+
320359
const projectGroups = useMemo(
321360
() =>
322361
buildHomeThreadGroups({
323-
projects: props.projects,
324-
threads: props.threads,
325-
pendingTasks: props.pendingTasks,
362+
projects: scopedProjects,
363+
threads: scopedThreads,
364+
pendingTasks: scopedPendingTasks,
326365
environmentId: props.selectedEnvironmentId,
327366
searchQuery: props.searchQuery,
328367
projectSortOrder: props.projectSortOrder,
329368
threadSortOrder: props.threadSortOrder,
330369
projectGroupingMode: props.projectGroupingMode,
331370
}),
332371
[
333-
props.pendingTasks,
334372
props.projectGroupingMode,
335-
props.projects,
336373
props.projectSortOrder,
337374
props.searchQuery,
338375
props.selectedEnvironmentId,
339376
props.threadSortOrder,
340-
props.threads,
377+
scopedPendingTasks,
378+
scopedProjects,
379+
scopedThreads,
341380
],
342381
);
343382

@@ -368,7 +407,8 @@ export function HomeScreen(props: HomeScreenProps) {
368407
return map;
369408
}, [props.projects]);
370409

371-
const [v2ProjectScopeKey, setV2ProjectScopeKey] = useState<string | null>(null);
410+
const v2ProjectScopeKey = props.selectedProjectKey;
411+
const setV2ProjectScopeKey = props.onProjectChange;
372412
const v2ScopeProjects = useMemo(
373413
() =>
374414
props.selectedEnvironmentId === null
@@ -385,12 +425,6 @@ export function HomeScreen(props: HomeScreenProps) {
385425
) ?? null),
386426
[v2ProjectScopeKey, v2ScopeProjects],
387427
);
388-
useEffect(() => {
389-
if (v2ProjectScopeKey !== null && v2ScopedProject === null) {
390-
setV2ProjectScopeKey(null);
391-
}
392-
}, [v2ProjectScopeKey, v2ScopedProject]);
393-
394428
// Thread List v2 (beta): one flat list in creation order, no grouping.
395429
// Settled threads collapse into a recency tail below the card block.
396430
// Settled threads stay in the live shell stream (settled ≠ archived), so
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
import { describe, expect, it, vi } from "vitest";
2+
3+
import { buildHomeListFilterMenu } from "./home-list-filter-menu";
4+
5+
describe("buildHomeListFilterMenu", () => {
6+
it("adds a project scope submenu that selects and clears the same scope as the chips", () => {
7+
const onProjectChange = vi.fn();
8+
const menu = buildHomeListFilterMenu({
9+
environments: [],
10+
projects: [
11+
{ key: "environment-1:project-1", label: "Codething" },
12+
{ key: "environment-1:project-2", label: "Website" },
13+
],
14+
selectedEnvironmentId: null,
15+
selectedProjectKey: "environment-1:project-1",
16+
projectSortOrder: "updated_at",
17+
threadSortOrder: "updated_at",
18+
projectGroupingMode: "repository",
19+
onEnvironmentChange: vi.fn(),
20+
onProjectChange,
21+
onProjectSortOrderChange: vi.fn(),
22+
onThreadSortOrderChange: vi.fn(),
23+
onProjectGroupingModeChange: vi.fn(),
24+
});
25+
26+
const projectMenu = menu.items.find(
27+
(item) => item.type === "submenu" && item.title === "Project",
28+
);
29+
expect(projectMenu).toMatchObject({
30+
type: "submenu",
31+
items: [
32+
{ title: "All projects", state: "off" },
33+
{ title: "Codething", state: "on" },
34+
{ title: "Website", state: "off" },
35+
],
36+
});
37+
if (projectMenu?.type !== "submenu") throw new Error("Expected project submenu");
38+
39+
projectMenu.items[0]?.onPress();
40+
projectMenu.items[2]?.onPress();
41+
expect(onProjectChange).toHaveBeenNthCalledWith(1, null);
42+
expect(onProjectChange).toHaveBeenNthCalledWith(2, "environment-1:project-2");
43+
});
44+
});

0 commit comments

Comments
 (0)