Skip to content

Commit 47dfc65

Browse files
shivamhwpT3 Code Test
andauthored
fix(mobile): preserve grouped project workspaces (pingdotgg#4642)
Co-authored-by: T3 Code Test <[email protected]>
1 parent 41ebf22 commit 47dfc65

25 files changed

Lines changed: 880 additions & 655 deletions

‎apps/mobile/src/Stack.tsx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import { SettingsClientStorageRouteScreen } from "./features/settings/SettingsCl
4747
import { SettingsAuthRouteScreen } from "./features/settings/SettingsAuthRouteScreen";
4848
import { SettingsEnvironmentsRouteScreen } from "./features/settings/SettingsEnvironmentsRouteScreen";
4949
import { SettingsLegalRouteScreen } from "./features/settings/SettingsLegalRouteScreen";
50+
import { SettingsProjectGroupingRouteScreen } from "./features/settings/SettingsProjectGroupingRouteScreen";
5051
import { SettingsRouteScreen } from "./features/settings/SettingsRouteScreen";
5152
import { ShowcaseCaptureCoordinator } from "./features/showcase/ShowcaseCaptureCoordinator";
5253
import {
@@ -175,6 +176,13 @@ const SettingsSheetStack = createNativeStackNavigator({
175176
title: "Appearance",
176177
},
177178
}),
179+
SettingsProjectGrouping: createNativeStackScreen({
180+
screen: SettingsProjectGroupingRouteScreen,
181+
linking: "project-grouping",
182+
options: {
183+
title: "Project Grouping",
184+
},
185+
}),
178186
SettingsClientStorage: createNativeStackScreen({
179187
screen: SettingsClientStorageRouteScreen,
180188
linking: "client-storage",

‎apps/mobile/src/components/AndroidScreenHeader.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export function AndroidScreenHeader(props: {
7070
accessibilityRole="button"
7171
hitSlop={8}
7272
onPress={props.onBack}
73-
className="size-11 items-center justify-center"
73+
className="-mr-2 size-11 items-center justify-center"
7474
>
7575
<SymbolView
7676
name="chevron.left"

‎apps/mobile/src/features/home/home-list-options.ts‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ export interface ResolvedHomeListOptions extends HomeListOptions {
3131
readonly projectGroupingMode: SidebarProjectGroupingMode;
3232
}
3333

34-
export function resolveProjectGroupingMode(
35-
projectGroupingEnabled: boolean | undefined,
36-
): SidebarProjectGroupingMode {
37-
return projectGroupingEnabled === false ? "separate" : "repository";
38-
}
39-
4034
export const PROJECT_SORT_OPTIONS: ReadonlyArray<{
4135
readonly value: HomeProjectSortOrder;
4236
readonly label: string;
@@ -76,7 +70,9 @@ const HomeListOptionsContext = createContext<HomeListOptionsContextValue | null>
7670
export function HomeListOptionsProvider({
7771
children,
7872
projectGroupingMode,
79-
}: PropsWithChildren<{ readonly projectGroupingMode: SidebarProjectGroupingMode }>) {
73+
}: PropsWithChildren<{
74+
readonly projectGroupingMode: SidebarProjectGroupingMode;
75+
}>) {
8076
const [options, setOptions] = useState<HomeListOptions>(defaultHomeListOptions);
8177
const value = useMemo(
8278
() => ({ options, setOptions, projectGroupingMode }),

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ describe("buildHomeThreadGroups", () => {
375375
).toHaveLength(2);
376376
});
377377

378-
it("uses the repository label for a singleton repository scope", () => {
378+
it("uses the physical project title for a singleton scope", () => {
379379
const project = makeProject({
380380
environmentId: EnvironmentId.make("environment-1"),
381381
id: ProjectId.make("project-1"),
@@ -408,8 +408,8 @@ describe("buildHomeThreadGroups", () => {
408408
],
409409
);
410410

411-
expect(scopes[0]?.title).toBe("codething-mvp");
412-
expect(groups[0]?.title).toBe("codething-mvp");
411+
expect(scopes[0]?.title).toBe("local-worktree-name");
412+
expect(groups[0]?.title).toBe("local-worktree-name");
413413
});
414414

415415
it("sorts the newest thread first regardless of snapshot order", () => {
@@ -565,10 +565,16 @@ describe("buildHomeThreadGroups", () => {
565565
);
566566

567567
expect(buildGroups(projects, threads, { projectGroupingMode: "repository" })).toHaveLength(1);
568-
expect(buildGroups(projects, threads, { projectGroupingMode: "repository_path" })).toHaveLength(
569-
2,
570-
);
571-
expect(buildGroups(projects, threads, { projectGroupingMode: "separate" })).toHaveLength(2);
568+
expect(
569+
buildGroups(projects, threads, { projectGroupingMode: "repository_path" }).map(
570+
(group) => group.title,
571+
),
572+
).toEqual(["Mobile", "Web"]);
573+
expect(
574+
buildGroups(projects, threads, { projectGroupingMode: "separate" }).map(
575+
(group) => group.title,
576+
),
577+
).toEqual(["Mobile", "Web"]);
572578
});
573579

574580
it("default view shows only threads from the last 5 days", () => {

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

Lines changed: 18 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {
2-
deriveLogicalProjectKey,
2+
buildProjectGroups,
33
derivePhysicalProjectKey,
44
deriveProjectGroupLabel,
55
} from "@t3tools/client-runtime/state/project-grouping";
@@ -37,10 +37,6 @@ export interface HomeProjectScope {
3737
readonly projectRefs: ReadonlyArray<ScopedProjectRef>;
3838
}
3939

40-
function getProjectFreshnessTimestamp(project: EnvironmentProject): number {
41-
return toSortableTimestamp(project.updatedAt) ?? toSortableTimestamp(project.createdAt) ?? 0;
42-
}
43-
4440
function getProjectSortTimestamp(
4541
project: EnvironmentProject,
4642
sortOrder: HomeProjectSortOrder,
@@ -60,64 +56,19 @@ export function buildHomeProjectScopes(input: {
6056
const projects = input.projects.filter(
6157
(project) => input.environmentId === null || project.environmentId === input.environmentId,
6258
);
63-
const projectsByPhysicalKey = new Map<string, EnvironmentProject[]>();
64-
for (const project of projects) {
65-
const physicalKey = derivePhysicalProjectKey(project);
66-
const existing = projectsByPhysicalKey.get(physicalKey);
67-
if (existing) existing.push(project);
68-
else projectsByPhysicalKey.set(physicalKey, [project]);
69-
}
70-
71-
const winnersByPhysicalKey = new Map<
72-
string,
73-
{ readonly key: string; readonly project: EnvironmentProject }
74-
>();
75-
for (const [physicalKey, members] of projectsByPhysicalKey) {
76-
const project = members.reduce((winner, candidate) => {
77-
const freshnessDelta =
78-
getProjectFreshnessTimestamp(candidate) - getProjectFreshnessTimestamp(winner);
79-
return freshnessDelta > 0 || (freshnessDelta === 0 && candidate.id > winner.id)
80-
? candidate
81-
: winner;
82-
});
83-
const identitySource = members.find((member) => member.repositoryIdentity !== null) ?? project;
84-
winnersByPhysicalKey.set(physicalKey, {
85-
key: deriveLogicalProjectKey(identitySource, { groupingMode: input.projectGroupingMode }),
86-
project,
87-
});
88-
}
89-
90-
const groups = new Map<string, EnvironmentProject[]>();
91-
for (const { key, project } of winnersByPhysicalKey.values()) {
92-
const existing = groups.get(key);
93-
if (existing) existing.push(project);
94-
else groups.set(key, [project]);
95-
}
96-
97-
const projectRefsByGroup = new Map<string, ScopedProjectRef[]>();
98-
const seenProjectRefs = new Set<string>();
99-
for (const project of projects) {
100-
const refKey = scopedProjectKey(project.environmentId, project.id);
101-
if (seenProjectRefs.has(refKey)) continue;
102-
seenProjectRefs.add(refKey);
103-
104-
const key =
105-
winnersByPhysicalKey.get(derivePhysicalProjectKey(project))?.key ??
106-
deriveLogicalProjectKey(project, { groupingMode: input.projectGroupingMode });
107-
const refs = projectRefsByGroup.get(key);
108-
const projectRef = { environmentId: project.environmentId, projectId: project.id };
109-
if (refs) refs.push(projectRef);
110-
else projectRefsByGroup.set(key, [projectRef]);
111-
}
112-
113-
return Array.from(groups, ([key, projects]) => {
114-
const representative = projects[0]!;
59+
return buildProjectGroups({
60+
projects,
61+
settings: {
62+
sidebarProjectGroupingMode: input.projectGroupingMode,
63+
sidebarProjectGroupingOverrides: {},
64+
},
65+
}).map((group) => {
11566
return {
116-
key,
117-
title: deriveProjectGroupLabel({ representative, members: projects }),
118-
representative,
119-
projects,
120-
projectRefs: projectRefsByGroup.get(key) ?? [],
67+
key: group.key,
68+
title: group.label,
69+
representative: group.representative,
70+
projects: group.members.map((member) => member.project),
71+
projectRefs: group.memberProjectRefs,
12172
};
12273
});
12374
}
@@ -264,9 +215,11 @@ export function buildHomeThreadGroups(input: {
264215
}): ReadonlyArray<HomeThreadGroup> {
265216
const now = input.now ?? Date.now();
266217
const groups = new Map<string, MutableHomeThreadGroup>();
218+
const groupTitleByKey = new Map<string, string>();
267219
const groupKeyByProjectKey = new Map<string, string>();
268220

269221
for (const scope of buildHomeProjectScopes(input)) {
222+
groupTitleByKey.set(scope.key, scope.title);
270223
groups.set(scope.key, {
271224
key: scope.key,
272225
projects: [...scope.projects],
@@ -345,7 +298,9 @@ export function buildHomeThreadGroups(input: {
345298
continue;
346299
}
347300

348-
const title = deriveProjectGroupLabel({ representative, members: group.projects });
301+
const title =
302+
groupTitleByKey.get(group.key) ??
303+
deriveProjectGroupLabel({ representative, members: group.projects });
349304
const groupMatches =
350305
query.length === 0 ||
351306
title.toLocaleLowerCase().includes(query) ||

‎apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,15 @@ import {
3737
import { resolveThreadSelectionNavigationAction } from "../../lib/adaptive-navigation";
3838
import { scopedThreadKey } from "../../lib/scopedEntities";
3939
import { mobilePreferencesAtom } from "../../state/preferences";
40+
import {
41+
DEFAULT_MOBILE_PROJECT_GROUPING_SETTINGS,
42+
resolveMobileProjectGroupingSettings,
43+
} from "../../state/project-grouping";
4044
import {
4145
parseActiveThreadPath,
4246
useHardwareKeyboardCommand,
4347
} from "../keyboard/hardwareKeyboardCommands";
44-
import { HomeListOptionsProvider, resolveProjectGroupingMode } from "../home/home-list-options";
48+
import { HomeListOptionsProvider } from "../home/home-list-options";
4549
import { ThreadNavigationSidebar } from "../threads/ThreadNavigationSidebar";
4650
import { WORKSPACE_PANE_TIMING } from "./workspace-pane-animation";
4751
import { WorkspaceInspectorPane } from "./workspace-inspector-pane";
@@ -190,15 +194,17 @@ export function AdaptiveWorkspaceLayout(props: {
190194
const preferencesResult = useAtomValue(mobilePreferencesAtom);
191195
if (!AsyncResult.isSuccess(preferencesResult)) {
192196
return AsyncResult.isFailure(preferencesResult) ? (
193-
<AdaptiveWorkspaceLayoutContent {...props} projectGroupingMode="repository" />
197+
<AdaptiveWorkspaceLayoutContent
198+
{...props}
199+
projectGroupingMode={DEFAULT_MOBILE_PROJECT_GROUPING_SETTINGS.sidebarProjectGroupingMode}
200+
/>
194201
) : null;
195202
}
203+
const groupingSettings = resolveMobileProjectGroupingSettings(preferencesResult.value);
196204
return (
197205
<AdaptiveWorkspaceLayoutContent
198206
{...props}
199-
projectGroupingMode={resolveProjectGroupingMode(
200-
preferencesResult.value.projectGroupingEnabled,
201-
)}
207+
projectGroupingMode={groupingSettings.sidebarProjectGroupingMode}
202208
/>
203209
);
204210
}

‎apps/mobile/src/features/settings/SettingsAppearanceRouteScreen.tsx‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,25 @@
1-
import { ScrollView, View } from "react-native";
1+
import { useNavigation } from "@react-navigation/native";
2+
import { Platform, ScrollView, View } from "react-native";
23
import { useSafeAreaInsets } from "react-native-safe-area-context";
34

5+
import { AndroidScreenHeader } from "../../components/AndroidScreenHeader";
6+
import { NativeStackScreenOptions } from "../../native/StackHeader";
47
import { CodeAppearanceSection } from "./appearance/sections/CodeAppearanceSection";
58
import { TerminalAppearanceSection } from "./appearance/sections/TerminalAppearanceSection";
69
import { TextAppearanceSection } from "./appearance/sections/TextAppearanceSection";
710

811
export function SettingsAppearanceRouteScreen() {
12+
const navigation = useNavigation();
913
const insets = useSafeAreaInsets();
1014

1115
return (
1216
<View collapsable={false} className="flex-1 bg-sheet">
17+
{Platform.OS === "android" ? (
18+
<>
19+
<NativeStackScreenOptions options={{ headerShown: false }} />
20+
<AndroidScreenHeader title="Appearance" onBack={() => navigation.goBack()} />
21+
</>
22+
) : null}
1323
<ScrollView
1424
contentInsetAdjustmentBehavior="automatic"
1525
showsVerticalScrollIndicator={false}
Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
import { useAtomSet, useAtomValue } from "@effect/atom-react";
2+
import { useNavigation } from "@react-navigation/native";
3+
import type { SidebarProjectGroupingMode } from "@t3tools/contracts";
4+
import { AsyncResult } from "effect/unstable/reactivity";
5+
import { Platform, Pressable, ScrollView, View } from "react-native";
6+
import { useSafeAreaInsets } from "react-native-safe-area-context";
7+
8+
import { AndroidScreenHeader } from "../../components/AndroidScreenHeader";
9+
import { AppText as Text } from "../../components/AppText";
10+
import { SymbolView } from "../../components/AppSymbol";
11+
import { useThemeColor } from "../../lib/useThemeColor";
12+
import { NativeStackScreenOptions } from "../../native/StackHeader";
13+
import {
14+
mobileProjectGroupingModePatch,
15+
resolveMobileProjectGroupingSettings,
16+
} from "../../state/project-grouping";
17+
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
18+
import { SettingsSection } from "./components/SettingsSection";
19+
20+
const GROUPING_OPTIONS: ReadonlyArray<{
21+
readonly mode: SidebarProjectGroupingMode;
22+
readonly label: string;
23+
readonly description: string;
24+
}> = [
25+
{
26+
mode: "repository",
27+
label: "Group by repository",
28+
description: "Matching repositories appear as one project.",
29+
},
30+
{
31+
mode: "repository_path",
32+
label: "Group by repository path",
33+
description: "Keep monorepo paths separate.",
34+
},
35+
{
36+
mode: "separate",
37+
label: "Keep separate",
38+
description: "Show every workspace as its own project.",
39+
},
40+
];
41+
42+
export function SettingsProjectGroupingRouteScreen() {
43+
const navigation = useNavigation();
44+
const insets = useSafeAreaInsets();
45+
const checkmarkColor = useThemeColor("--color-icon");
46+
const preferencesResult = useAtomValue(mobilePreferencesAtom);
47+
const savePreferences = useAtomSet(updateMobilePreferencesAtom);
48+
const preferencesReady = AsyncResult.isSuccess(preferencesResult) && !preferencesResult.waiting;
49+
const selectedMode = AsyncResult.isSuccess(preferencesResult)
50+
? resolveMobileProjectGroupingSettings(preferencesResult.value).sidebarProjectGroupingMode
51+
: null;
52+
53+
return (
54+
<View collapsable={false} className="flex-1 bg-sheet">
55+
{Platform.OS === "android" ? (
56+
<>
57+
<NativeStackScreenOptions options={{ headerShown: false }} />
58+
<AndroidScreenHeader title="Project Grouping" onBack={() => navigation.goBack()} />
59+
</>
60+
) : null}
61+
<ScrollView
62+
contentInsetAdjustmentBehavior="automatic"
63+
showsVerticalScrollIndicator={false}
64+
className="flex-1"
65+
contentContainerClassName="gap-3 px-5 pt-4"
66+
contentContainerStyle={{ paddingBottom: Math.max(insets.bottom, 18) + 18 }}
67+
>
68+
<SettingsSection title="Default grouping">
69+
{GROUPING_OPTIONS.map((option, index) => (
70+
<Pressable
71+
key={option.mode}
72+
accessibilityRole="radio"
73+
accessibilityState={{
74+
checked: selectedMode === option.mode,
75+
disabled: !preferencesReady,
76+
}}
77+
disabled={!preferencesReady}
78+
onPress={() => savePreferences(mobileProjectGroupingModePatch(option.mode))}
79+
className={
80+
index === 0
81+
? "flex-row items-center gap-4 p-4"
82+
: "flex-row items-center gap-4 border-t border-border-subtle p-4"
83+
}
84+
>
85+
<View className="min-w-0 flex-1 gap-1">
86+
<Text className="text-lg text-foreground">{option.label}</Text>
87+
<Text className="text-sm leading-normal text-foreground-muted">
88+
{option.description}
89+
</Text>
90+
</View>
91+
{selectedMode === option.mode ? (
92+
<SymbolView
93+
name="checkmark"
94+
size={18}
95+
tintColor={checkmarkColor}
96+
type="monochrome"
97+
weight="semibold"
98+
/>
99+
) : null}
100+
</Pressable>
101+
))}
102+
</SettingsSection>
103+
</ScrollView>
104+
</View>
105+
);
106+
}

0 commit comments

Comments
 (0)