Skip to content

Commit 3397803

Browse files
fix(web): filter settings projects by chosen environment
1 parent dd48737 commit 3397803

3 files changed

Lines changed: 67 additions & 2 deletions

File tree

‎apps/web/src/components/settings/SettingsScopeSentence.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import {
3333
ALL_PROJECTS_VALUE,
3434
environmentAxisValue,
3535
projectAxisValue,
36+
projectScopeMenuGroups,
3637
selectEnvironmentAxis,
3738
selectProjectAxis,
3839
settingsScopeEnvironmentAddress,
@@ -287,7 +288,7 @@ function EnvironmentScopeMenu({
287288

288289
function ProjectScopeMenu({ value, groups, environments, onChange }: SettingsScopeMenuProps) {
289290
const selected = groups.find((group) => group.projectKey === value.project);
290-
const projects = groups.map((group) => ({
291+
const projects = projectScopeMenuGroups(groups, value).map((group) => ({
291292
group,
292293
machines: settingsScopeProjectMachines(group, environments, true).join(", "),
293294
}));

‎apps/web/src/components/settings/settingsScopeAxis.test.ts‎

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
import { EnvironmentId } from "@t3tools/contracts";
1+
import { EnvironmentId, ProjectId } from "@t3tools/contracts";
22
import { describe, expect, it } from "vite-plus/test";
33

4+
import type { SidebarProjectSnapshot } from "../../sidebarProjectGrouping";
45
import {
56
environmentAxisValue,
67
projectAxisValue,
8+
projectScopeMenuGroups,
79
selectEnvironmentAxis,
810
selectProjectAxis,
911
settingsScopeEnvironmentLabel,
@@ -83,3 +85,54 @@ describe("environmentAxisValue", () => {
8385
expect(environmentAxisValue({ machine: "desk" }, "laptop")).toBe("desk");
8486
});
8587
});
88+
89+
describe("settings project picker", () => {
90+
function group(
91+
projectKey: string,
92+
environmentIds: readonly [EnvironmentId, ...EnvironmentId[]],
93+
): SidebarProjectSnapshot {
94+
const members = environmentIds.map((environmentId) => ({
95+
id: ProjectId.make(`${projectKey}-${environmentId}`),
96+
environmentId,
97+
title: projectKey,
98+
workspaceRoot: `/repos/${projectKey}`,
99+
physicalProjectKey: `${environmentId}:/repos/${projectKey}`,
100+
environmentLabel: null,
101+
defaultModelSelection: null,
102+
scripts: [],
103+
createdAt: "2026-10-19T00:00:00.000Z",
104+
updatedAt: "2026-10-19T00:00:00.000Z",
105+
}));
106+
return {
107+
...members[0]!,
108+
projectKey,
109+
displayName: projectKey,
110+
memberProjects: members,
111+
memberProjectRefs: members.map((member) => ({
112+
environmentId: member.environmentId,
113+
projectId: member.id,
114+
})),
115+
groupedProjectCount: members.length,
116+
environmentPresence: environmentIds.length > 1 ? "mixed" : "local-only",
117+
allRemoteMembersAreDesktopLocal: false,
118+
allRemoteMembersAreWsl: false,
119+
remoteEnvironmentLabels: [],
120+
};
121+
}
122+
123+
it("offers groups with any checkout on the chosen environment, or all groups without one", () => {
124+
const laptop = EnvironmentId.make("laptop");
125+
const server = EnvironmentId.make("server");
126+
const local = group("local", [laptop]);
127+
const shared = group("shared", [laptop, server]);
128+
const remote = group("remote", [server]);
129+
const groups = [local, shared, remote];
130+
131+
expect(projectScopeMenuGroups(groups, { machine: server })).toEqual([shared, remote]);
132+
expect(projectScopeMenuGroups(groups, { machine: laptop })).toEqual([local, shared]);
133+
expect(projectScopeMenuGroups(groups, { machine: "unknown" })).toEqual([]);
134+
expect(projectScopeMenuGroups(groups, {})).toEqual(groups);
135+
expect(projectScopeMenuGroups([], { machine: server })).toEqual([]);
136+
expect(projectScopeMenuGroups([], {})).toEqual([]);
137+
});
138+
});

‎apps/web/src/components/settings/settingsScopeAxis.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,17 @@ export function projectAxisValue(search: SettingsScopeSearch): string {
6969
return search.project ?? ALL_PROJECTS_VALUE;
7070
}
7171

72+
export function projectScopeMenuGroups(
73+
groups: readonly SidebarProjectSnapshot[],
74+
search: Pick<SettingsScopeSearch, "machine">,
75+
) {
76+
const { machine } = search;
77+
if (machine === undefined) return groups;
78+
return groups.filter((group) =>
79+
group.memberProjects.some((member) => member.environmentId === machine),
80+
);
81+
}
82+
7283
export function selectEnvironmentAxis(
7384
search: SettingsScopeSearch,
7485
value: string,

0 commit comments

Comments
 (0)