Skip to content

Commit a564952

Browse files
juliusmarmingecodex
andcommitted
fix(mobile): use logical project labels
Co-authored-by: codex <[email protected]>
1 parent 88c69ff commit a564952

6 files changed

Lines changed: 77 additions & 18 deletions

File tree

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { useNavigation } from "@react-navigation/native";
44
import { useEffect, useMemo, useState } from "react";
55

66
import { NativeHeaderToolbar, NativeStackScreenOptions } from "../../native/StackHeader";
7-
import { scopedProjectKey } from "../../lib/scopedEntities";
87
import { useProjects, useThreadShells } from "../../state/entities";
98
import { usePendingNewTasks } from "../../state/use-pending-new-tasks";
109
import { useWorkspaceState } from "../../state/workspace";
@@ -16,6 +15,7 @@ import { AndroidHomeFabLayout } from "./AndroidHomeFab";
1615
import { HomeScreen } from "./HomeScreen";
1716
import { HomeHeader } from "./HomeHeader";
1817
import { useHomeListOptions } from "./home-list-options";
18+
import { buildHomeProjectScopes } from "./homeThreadList";
1919
import { usePendingTaskListActions } from "./usePendingTaskListActions";
2020
import { useThreadListActions } from "./useThreadListActions";
2121

@@ -61,16 +61,15 @@ export function HomeRouteScreen() {
6161
const [selectedProjectKey, setSelectedProjectKey] = useState<string | null>(null);
6262
const projectFilterOptions = useMemo(
6363
() =>
64-
projects
65-
.filter(
66-
(project) =>
67-
selectedEnvironmentId === null || project.environmentId === selectedEnvironmentId,
68-
)
69-
.map((project) => ({
70-
key: scopedProjectKey(project.environmentId, project.id),
71-
label: project.title,
72-
})),
73-
[projects, selectedEnvironmentId],
64+
buildHomeProjectScopes({
65+
projects,
66+
environmentId: selectedEnvironmentId,
67+
projectGroupingMode: listOptions.projectGroupingMode,
68+
}).map((scope) => ({
69+
key: scope.key,
70+
label: scope.title,
71+
})),
72+
[listOptions.projectGroupingMode, projects, selectedEnvironmentId],
7473
);
7574
useEffect(() => {
7675
if (

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,21 @@ export function HomeScreen(props: HomeScreenProps) {
372372
) ?? null),
373373
[v2ProjectScopeKey, v2ScopeProjects],
374374
);
375+
const v2ProjectTitleByProjectKey = useMemo(
376+
() =>
377+
new Map(
378+
v2ScopeProjects.flatMap((scope) =>
379+
scope.projectRefs.map(
380+
(projectRef) =>
381+
[
382+
scopedProjectKey(projectRef.environmentId, projectRef.projectId),
383+
scope.title,
384+
] as const,
385+
),
386+
),
387+
),
388+
[v2ScopeProjects],
389+
);
375390
const v2ScopedProjectKeys = useMemo(
376391
() =>
377392
v2ScopedProjectGroup === null
@@ -493,6 +508,9 @@ export function HomeScreen(props: HomeScreenProps) {
493508
projectByKey.get(scopedProjectKey(item.thread.environmentId, item.thread.projectId)) ??
494509
null
495510
}
511+
projectTitle={v2ProjectTitleByProjectKey.get(
512+
scopedProjectKey(item.thread.environmentId, item.thread.projectId),
513+
)}
496514
providerDriver={
497515
serverConfigs
498516
.get(item.thread.environmentId)
@@ -536,6 +554,7 @@ export function HomeScreen(props: HomeScreenProps) {
536554
props.savedConnectionsById,
537555
serverConfigs,
538556
settlementEnvironmentIds,
557+
v2ProjectTitleByProjectKey,
539558
],
540559
);
541560
const v2KeyExtractor = useCallback(

‎apps/mobile/src/features/home/homeThreadList.test.ts‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ describe("buildHomeThreadGroups", () => {
104104
});
105105

106106
expect(scopes).toHaveLength(1);
107+
expect(scopes[0]?.title).toBe("t3code");
107108
expect(scopes[0]?.projects).toEqual(projects);
108109
expect(scopes[0]?.projectRefs).toEqual(
109110
projects.map((project) => ({
@@ -373,6 +374,31 @@ describe("buildHomeThreadGroups", () => {
373374
).toHaveLength(2);
374375
});
375376

377+
it("uses the repository label for a singleton repository scope", () => {
378+
const project = makeProject({
379+
environmentId: EnvironmentId.make("environment-1"),
380+
id: ProjectId.make("project-1"),
381+
title: "local-worktree-name",
382+
repositoryIdentity: {
383+
canonicalKey: "github.com/pingdotgg/t3code",
384+
displayName: "codething-mvp",
385+
locator: {
386+
source: "git-remote" as const,
387+
remoteName: "origin",
388+
remoteUrl: "[email protected]:pingdotgg/t3code.git",
389+
},
390+
},
391+
});
392+
393+
expect(
394+
buildHomeProjectScopes({
395+
projects: [project],
396+
environmentId: null,
397+
projectGroupingMode: "repository",
398+
})[0]?.title,
399+
).toBe("codething-mvp");
400+
});
401+
376402
it("sorts the newest thread first regardless of snapshot order", () => {
377403
const environmentId = EnvironmentId.make("environment-1");
378404
const project = makeProject({

‎apps/mobile/src/features/home/homeThreadList.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,7 @@ export function buildHomeProjectScopes(input: {
113113
const representative = projects[0]!;
114114
return {
115115
key,
116-
title:
117-
projects.length > 1
118-
? deriveProjectGroupLabel({ representative, members: projects })
119-
: representative.title,
116+
title: deriveProjectGroupLabel({ representative, members: projects }),
120117
representative,
121118
projects,
122119
projectRefs: projectRefsByGroup.get(key) ?? [],

‎apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,21 @@ function ThreadNavigationSidebarPane(
236236
})),
237237
[projectScopes],
238238
);
239+
const projectTitleByProjectKey = useMemo(
240+
() =>
241+
new Map(
242+
projectScopes.flatMap((scope) =>
243+
scope.projectRefs.map(
244+
(projectRef) =>
245+
[
246+
scopedProjectKey(projectRef.environmentId, projectRef.projectId),
247+
scope.title,
248+
] as const,
249+
),
250+
),
251+
),
252+
[projectScopes],
253+
);
239254
const selectedProjectScope = useMemo(
240255
() =>
241256
selectedProjectKey === null
@@ -728,6 +743,7 @@ function ThreadNavigationSidebarPane(
728743
variant={item.item.variant}
729744
showSettledDivider={item.item.showSettledDivider}
730745
project={projectByKey.get(scopeKey) ?? null}
746+
projectTitle={projectTitleByProjectKey.get(scopeKey)}
731747
providerDriver={
732748
serverConfigs
733749
.get(thread.environmentId)
@@ -857,6 +873,7 @@ function ThreadNavigationSidebarPane(
857873
openPendingTask,
858874
projectByKey,
859875
projectCwdByKey,
876+
projectTitleByProjectKey,
860877
props.onNewThreadInProject,
861878
props.selectedThreadKey,
862879
props.width,

‎apps/mobile/src/features/threads/thread-list-v2-items.tsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
9090
readonly variant: "card" | "slim";
9191
readonly showSettledDivider: boolean;
9292
readonly project: EnvironmentProject | null;
93+
readonly projectTitle?: string;
9394
readonly providerDriver: string | null;
9495
/** Which machine hosts the thread. Null when only one environment is
9596
connected — repeating the same label on every row is noise. Mirrors
@@ -219,7 +220,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
219220
<ProjectFavicon
220221
environmentId={thread.environmentId}
221222
size={15}
222-
projectTitle={props.project.title}
223+
projectTitle={props.projectTitle ?? props.project.title}
223224
workspaceRoot={props.project.workspaceRoot}
224225
/>
225226
) : null}
@@ -230,7 +231,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
230231
)}
231232
numberOfLines={1}
232233
>
233-
{props.project?.title ?? ""}
234+
{props.projectTitle ?? props.project?.title ?? ""}
234235
</Text>
235236
<Text
236237
className={cn(
@@ -393,7 +394,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
393394
<ProjectFavicon
394395
environmentId={thread.environmentId}
395396
size={15}
396-
projectTitle={props.project.title}
397+
projectTitle={props.projectTitle ?? props.project.title}
397398
workspaceRoot={props.project.workspaceRoot}
398399
/>
399400
</View>

0 commit comments

Comments
 (0)