Skip to content

Commit e087ae1

Browse files
committed
fix(mobile): preserve selected checkout titles in settings
1 parent 1c112b2 commit e087ae1

4 files changed

Lines changed: 67 additions & 24 deletions

File tree

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ import {
99
isAtomCommandInterrupted,
1010
squashAtomCommandFailure,
1111
} from "@t3tools/client-runtime/state/runtime";
12-
import type { ProjectGroup } from "@t3tools/client-runtime/state/project-grouping";
12+
import {
13+
deriveScopedProjectGroupLabel,
14+
type ProjectGroup,
15+
} from "@t3tools/client-runtime/state/project-grouping";
1316
import type { EnvironmentProject } from "@t3tools/client-runtime/state/shell";
1417
import { useNavigation } from "@react-navigation/native";
1518
import { useRef, useState } from "react";
@@ -135,7 +138,7 @@ function ProjectOverviewContent(props: {
135138
}) {
136139
const { isRemoving, setIsRemoving, startRemoval, finishRemoval } = props;
137140
const representative = props.members[0]!;
138-
const displayName = props.group.label;
141+
const displayName = deriveScopedProjectGroupLabel(props.group, props.members);
139142
const [draftName, setDraftName] = useState<string | null>(null);
140143
const [isSaving, setIsSaving] = useState(false);
141144
const threads = useThreadShells();

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import { useAuth, useUser } from "@clerk/expo";
1818
import { useNavigation, useNavigationState } from "@react-navigation/native";
1919
import { use, type ComponentProps } from "react";
2020
import { Platform, View } from "react-native";
21+
import { deriveScopedProjectGroupLabel } from "@t3tools/client-runtime/state/project-grouping";
2122
import { useNativeColumnLayoutMetrics } from "../../native/native-layout-metrics";
2223
import { useSafeAreaInsets } from "react-native-safe-area-context";
2324

@@ -214,7 +215,15 @@ function useSettingsIndexSections(): SettingsListSection[] {
214215
const { selectedTargets, projectGroups, selectedProjectKey } = useSettingsEnvironmentFilter();
215216
const noServerTargets = selectedTargets.length === 0;
216217
const selectedProject = projectGroups.find((group) => group.key === selectedProjectKey);
217-
const projectLabel = selectedProject?.label ?? "Unavailable project";
218+
const scopedProjectMembers =
219+
selectedProject?.members
220+
.map((member) => member.project)
221+
.filter((project) =>
222+
selectedTargets.some((target) => target.environmentId === project.environmentId),
223+
) ?? [];
224+
const projectLabel = selectedProject
225+
? deriveScopedProjectGroupLabel(selectedProject, scopedProjectMembers)
226+
: "Unavailable project";
218227
const page = (
219228
target: SettingsPageTarget,
220229
icon: SettingsListRow["icon"],

‎packages/client-runtime/src/state/projectGrouping.test.ts‎

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
deriveLogicalProjectKeyFromSettings,
99
pickableProjectGroups,
1010
derivePhysicalProjectKey,
11+
deriveScopedProjectGroupLabel,
1112
resolveScratchProjectScopeKey,
1213
sortProjectsByGroupOrder,
1314
type ProjectGroupingSettings,
@@ -346,6 +347,7 @@ describe("buildProjectGroups", () => {
346347
});
347348
expect(unlabeled.map((group) => group.label)).toEqual(["EtanHey/orchestrator"]);
348349
expect(groups.map((group) => group.label)).toEqual([label]);
350+
expect(deriveScopedProjectGroupLabel(groups[0]!, [projects[0]!])).toBe(label);
349351
expect(groups.map(({ key, memberProjectRefs }) => ({ key, memberProjectRefs }))).toEqual(
350352
unlabeled.map(({ key, memberProjectRefs }) => ({ key, memberProjectRefs })),
351353
);
@@ -356,17 +358,32 @@ describe("buildProjectGroups", () => {
356358
[environmentId]: account("EtanHey"),
357359
[macB]: account("EtanHey"),
358360
};
359-
const labels = (projects: EnvironmentProject[]) =>
360-
buildProjectGroups({ projects, settings: settings("repository"), repositoryAccounts }).map(
361-
(group) => group.label,
362-
);
363-
expect(labels(linked("Orchestrator app"))).toEqual(["Orchestrator app"]);
364-
expect(
365-
labels([
366-
...linked(),
367-
makeProject("other", "/a/other", { title: "Orchestrator", repositoryIdentity: null }),
368-
]),
369-
).toEqual(["EtanHey/orchestrator", "Orchestrator"]);
361+
const groups = (projects: EnvironmentProject[]) =>
362+
buildProjectGroups({ projects, settings: settings("repository"), repositoryAccounts });
363+
expect(groups(linked("Orchestrator app")).map((group) => group.label)).toEqual([
364+
"Orchestrator app",
365+
]);
366+
const differentlyNamed = linked().map((project, index) => ({
367+
...project,
368+
title: index === 0 ? "Local project" : "Remote project",
369+
}));
370+
const namedGroup = groups(differentlyNamed)[0]!;
371+
expect(deriveScopedProjectGroupLabel(namedGroup, differentlyNamed)).toBe(namedGroup.label);
372+
for (const project of differentlyNamed) {
373+
expect(deriveScopedProjectGroupLabel(namedGroup, [project])).toBe(project.title);
374+
}
375+
const collisionProjects = linked();
376+
const colliding = groups([
377+
...collisionProjects,
378+
makeProject("other", "/a/other", { title: "Orchestrator", repositoryIdentity: null }),
379+
]);
380+
expect(colliding.map((group) => group.label)).toEqual([
381+
"EtanHey/orchestrator",
382+
"Orchestrator",
383+
]);
384+
expect(deriveScopedProjectGroupLabel(colliding[0]!, [collisionProjects[0]!])).toBe(
385+
"EtanHey/orchestrator",
386+
);
370387
});
371388

372389
it.each([

‎packages/client-runtime/src/state/projectGrouping.ts‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,28 @@ type ProjectLabelSource = Pick<
213213
"environmentId" | "title" | "repositoryIdentity"
214214
>;
215215

216+
export function deriveScopedProjectGroupLabel(
217+
group: Pick<ProjectGroup, "label">,
218+
members: ReadonlyArray<ProjectLabelSource>,
219+
): string {
220+
return deriveCustomProjectTitle(members) ?? group.label;
221+
}
222+
223+
function deriveCustomProjectTitle(members: ReadonlyArray<ProjectLabelSource>): string | undefined {
224+
const sharedTitles = uniqueNonEmptyValues(members.map((member) => member.title));
225+
const sharedTitle = sharedTitles[0];
226+
if (sharedTitles.length !== 1 || sharedTitle === undefined) return undefined;
227+
const isRepositoryName = members.some((member) => {
228+
const repository = member.repositoryIdentity;
229+
return (
230+
repository &&
231+
(repository.name.trim() === sharedTitle ||
232+
repositoryGroupingDisplayNameOf(repository).trim() === sharedTitle)
233+
);
234+
});
235+
return isRepositoryName ? undefined : sharedTitle;
236+
}
237+
216238
/** Drops the owner only when every member's environment is signed in as it. */
217239
function deriveOwnRepositoryName(
218240
members: ReadonlyArray<ProjectLabelSource>,
@@ -249,7 +271,8 @@ function deriveProjectGroupLabel(input: {
249271
readonly members: ReadonlyArray<ProjectLabelSource>;
250272
readonly repositoryAccounts?: SourceControlAccountsByEnvironment;
251273
}): string {
252-
const sharedTitles = uniqueNonEmptyValues(input.members.map((member) => member.title));
274+
const customTitle = deriveCustomProjectTitle(input.members);
275+
if (customTitle !== undefined) return customTitle;
253276
const sharedDisplayNames = uniqueNonEmptyValues(
254277
input.members.map((member) =>
255278
member.repositoryIdentity ? repositoryGroupingDisplayNameOf(member.repositoryIdentity) : null,
@@ -258,15 +281,6 @@ function deriveProjectGroupLabel(input: {
258281
const sharedRepositoryNames = uniqueNonEmptyValues(
259282
input.members.map((member) => member.repositoryIdentity?.name),
260283
);
261-
const sharedTitle = sharedTitles[0];
262-
if (
263-
sharedTitles.length === 1 &&
264-
sharedTitle !== undefined &&
265-
!sharedDisplayNames.includes(sharedTitle) &&
266-
!sharedRepositoryNames.includes(sharedTitle)
267-
) {
268-
return sharedTitle;
269-
}
270284
if (sharedDisplayNames.length === 1) {
271285
return (
272286
deriveOwnRepositoryName(input.members, sharedDisplayNames[0]!, input.repositoryAccounts) ??

0 commit comments

Comments
 (0)