Skip to content

Commit 486b691

Browse files
committed
feat(web): add all-except project filtering
Fork-Domain: workspaces Fork-Tier: qol
1 parent f76f58c commit 486b691

15 files changed

Lines changed: 305 additions & 34 deletions

‎README.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ The fork encodes none of that policy.
3232
| `mod+alt+f` | Choose this window's projects |
3333
| `mod+alt+o` | Reuse a window showing this project, else open |
3434

35-
- **Filter:** narrows lists, never hides live work
35+
Choose **Only selected** to show specific projects, or **All except selected** to hide selected projects and include new ones automatically.
36+
With no selection, both modes show all projects.
37+
The filter narrows lists without closing open threads.
38+
3639
- **Same thread:** **Open in New Window**, both live
3740
- **Update:** back on their Hyprland workspaces
3841
- **Old links:** `#/project/...` links still open

‎apps/web/src/components/CommandPalette.fork.tsx‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,17 @@ export function useCommandPaletteProjectScopeFork(): CommandPaletteProjectScope
118118
const chooser = useProjectChooserHostValue();
119119
const filter = chooser?.filter ?? null;
120120
const label = chooser?.label ?? null;
121+
const groups = chooser?.groups;
121122
const [searchAll, setSearchAll] = useState(false);
122123
const filterKeys = useMemo(
123-
() => (filter === null ? null : projectFilterProjectKeys(filter)),
124-
[filter],
124+
() =>
125+
filter === null
126+
? null
127+
: projectFilterProjectKeys(
128+
filter,
129+
groups?.flatMap((group) => group.memberProjectRefs),
130+
),
131+
[filter, groups],
125132
);
126133
return useMemo(() => {
127134
if (filterKeys === null || label === null) return { projectKeys: null, toggle: null };

‎apps/web/src/components/Sidebar.tsx‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,15 @@ import { useWindowSidebarScopeSeed } from "../windowSidebarScope.fork"; // fork-
115115
import { useWindowProjectFilter } from "../windowProjectFilter.fork"; // fork-hook: workspaces/filter-import
116116
import { startFilteredNewThreadFork } from "../projectFilterScope.fork"; // fork-hook: workspaces/filtered-new-thread-import
117117
import {
118-
ProjectChooserRowCheckFork,
119118
ProjectChooserShowOnlyButtonFork,
120119
ProjectChooserTriggerIconFork,
121120
ProjectChooserUnavailableFork,
122121
useSidebarProjectChooserFork,
123122
} from "./sidebar/SidebarProjectChooser.fork"; // fork-hook: workspaces/chooser-import
123+
import {
124+
ProjectChooserModeFork,
125+
ProjectChooserRowMarkFork,
126+
} from "./sidebar/SidebarProjectChooser.fork"; // fork-hook: workspaces/chooser-mode-import
124127
import { isElectron } from "../env";
125128
import {
126129
resolveShortcutCommand,
@@ -5273,6 +5276,12 @@ export default function Sidebar() {
52735276
anchor={headerSearchRef}
52745277
className="max-w-[min(18rem,var(--available-width))] overflow-hidden"
52755278
>
5279+
{/* fork-hook: workspaces/chooser-mode */}
5280+
<ProjectChooserModeFork
5281+
filter={windowFilter.filter}
5282+
setFilter={windowFilter.setFilter}
5283+
/>
5284+
{/* fork-hook-end */}
52765285
<ComboboxSearchInput
52775286
aria-label="Search projects"
52785287
placeholder="Search projects..."
@@ -5314,9 +5323,12 @@ export default function Sidebar() {
53145323
if (project) handleProjectSettings(event, project);
53155324
}}
53165325
>
5317-
{/* fork-hook: workspaces/chooser-row-check */}
5318-
<ProjectChooserRowCheckFork
5326+
{/* fork-hook: workspaces/chooser-row-mark */}
5327+
<ProjectChooserRowMarkFork
53195328
selected={projectChooser.selectedValues.has(item.value)}
5329+
excluded={
5330+
windowFilter.filter.mode === "exclude" && item.value !== "all"
5331+
}
53205332
/>
53215333
{/* fork-hook-end */}
53225334
{project ? (

‎apps/web/src/components/sidebar/SidebarProjectChooser.fork.tsx‎

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// combobox and carries marked hook lines pointing here: the chooser state, its
44
// value and change handler, the trigger's label and icon, and the row extras.
55
import type { ProjectFilter } from "@t3tools/client-runtime/state/project-filter";
6-
import { CheckIcon, FocusIcon, FolderIcon, FoldersIcon } from "lucide-react";
6+
import { CheckIcon, FocusIcon, FolderIcon, FoldersIcon, MinusIcon } from "lucide-react";
77
import { useCallback, useMemo, useRef, type MouseEvent as ReactMouseEvent } from "react";
88

99
import { cn } from "~/lib/utils";
@@ -17,6 +17,7 @@ import {
1717
} from "../../projectChooser.fork";
1818
import { Button } from "../ui/button";
1919
import { useSidebar } from "../ui/sidebar";
20+
import { Toggle, ToggleGroup } from "../ui/toggle-group";
2021

2122
export function useSidebarProjectChooserFork<Group extends ProjectChooserGroup>(input: {
2223
readonly filter: ProjectFilter;
@@ -87,9 +88,45 @@ export function ProjectChooserTriggerIconFork({ count }: { readonly count: numbe
8788
}
8889

8990
/** A row's selection mark; kept in layout when unselected so labels stay aligned. */
90-
export function ProjectChooserRowCheckFork({ selected }: { readonly selected: boolean }) {
91+
export function ProjectChooserRowMarkFork({
92+
selected,
93+
excluded = false,
94+
}: {
95+
readonly selected: boolean;
96+
readonly excluded?: boolean;
97+
}) {
98+
const Icon = excluded ? MinusIcon : CheckIcon;
99+
return <Icon aria-hidden className={cn("size-3.5 shrink-0", selected ? null : "invisible")} />;
100+
}
101+
102+
/** Switching modes keeps the picks; their meaning changes explicitly, not via a modifier key. */
103+
export function ProjectChooserModeFork({
104+
filter,
105+
setFilter,
106+
}: {
107+
readonly filter: ProjectFilter;
108+
readonly setFilter: (filter: ProjectFilter) => void;
109+
}) {
110+
const mode = filter.mode ?? "include";
91111
return (
92-
<CheckIcon aria-hidden className={cn("size-3.5 shrink-0", selected ? null : "invisible")} />
112+
<div className="flex flex-col gap-2 px-2 pt-2 pb-1">
113+
<ToggleGroup
114+
aria-label="Project filter mode"
115+
value={[mode]}
116+
onValueChange={(values) => {
117+
const next = values[0];
118+
if (next === "include" || next === "exclude") setFilter({ ...filter, mode: next });
119+
}}
120+
>
121+
<Toggle value="include">Only selected</Toggle>
122+
<Toggle value="exclude">All except selected</Toggle>
123+
</ToggleGroup>
124+
<p className="text-xs text-muted-foreground">
125+
{mode === "exclude"
126+
? "Select projects to hide. New projects stay visible."
127+
: "Select projects to show. No selection shows all."}
128+
</p>
129+
</div>
93130
);
94131
}
95132

‎apps/web/src/projectChooser.fork.test.ts‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,32 @@ const values = (filter: ProjectFilter) =>
3636
projectChooserState(filter, groups).value.map((item) => item.value);
3737

3838
describe("project chooser", () => {
39+
it("exclusion labels the hidden picks rather than presenting one as the shown project", () => {
40+
const filter: ProjectFilter = { ...filterOf(web), mode: "exclude" };
41+
const state = projectChooserState(filter, groups);
42+
expect(state.label).toBe("Projects: All except 1");
43+
expect(state.titleLabel).toBe("All except web");
44+
expect(state.single).toBeNull();
45+
expect(state.value.map((item) => item.value)).toEqual([web.projectKey]);
46+
expect(projectFilterFromChooser(filter, [web.projectKey, api.projectKey], groups)).toEqual({
47+
...filterOf(web, api),
48+
mode: "exclude",
49+
});
50+
expect(projectFilterFromChooser(filter, [], groups)).toEqual({ entries: [], mode: "exclude" });
51+
expect(
52+
projectFilterFromChooser(filter, [web.projectKey, ALL_PROJECTS_CHOOSER_VALUE], groups),
53+
).toEqual({ entries: [], mode: "exclude" });
54+
expect(showOnlyProjectFilter(api)).toEqual(filterOf(api));
55+
});
56+
57+
it("exclusion can pick its first hidden project from an empty selection", () => {
58+
const empty: ProjectFilter = { mode: "exclude", entries: [] };
59+
expect(projectChooserState(empty, groups).label).toBe("Projects: All");
60+
expect(
61+
projectFilterFromChooser(empty, [ALL_PROJECTS_CHOOSER_VALUE, web.projectKey], groups),
62+
).toEqual({ ...filterOf(web), mode: "exclude" });
63+
});
64+
3965
it("Empty: an empty filter selects All projects and reads Projects: All", () => {
4066
const state = projectChooserState(ALL_PROJECTS_FILTER, groups);
4167
expect(state.value.map((item) => item.value)).toEqual([ALL_PROJECTS_CHOOSER_VALUE]);

‎apps/web/src/projectChooser.fork.ts‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,18 +92,22 @@ export function projectChooserState<Group extends ProjectChooserGroup>(
9292
return item === undefined ? [] : [item];
9393
});
9494
const count = filter.entries.length;
95+
const excluding = filter.mode === "exclude";
9596
const only = count === 1 ? value[0] : undefined;
9697
return {
9798
items,
9899
value,
99100
label:
100101
count === 0
101102
? "Projects: All"
102-
: only !== undefined
103-
? `Projects: ${only.label}`
104-
: `Projects: ${count} selected`,
105-
titleLabel: count === 0 ? null : titleLabelOf(value),
106-
single: only === undefined ? null : (groupByKey.get(only.value) ?? null),
103+
: excluding
104+
? `Projects: All except ${count}`
105+
: only !== undefined
106+
? `Projects: ${only.label}`
107+
: `Projects: ${count} selected`,
108+
titleLabel:
109+
count === 0 ? null : excluding ? `All except ${titleLabelOf(value)}` : titleLabelOf(value),
110+
single: excluding || only === undefined ? null : (groupByKey.get(only.value) ?? null),
107111
count,
108112
};
109113
}
@@ -123,7 +127,7 @@ export function projectFilterFromChooser(
123127
// "All projects" is in the selection only while the filter is empty, so
124128
// seeing it beside entries means the user just picked it.
125129
if (values.includes(ALL_PROJECTS_CHOOSER_VALUE) && filter.entries.length > 0) {
126-
return ALL_PROJECTS_FILTER;
130+
return filter.mode === "exclude" ? { mode: "exclude", entries: [] } : ALL_PROJECTS_FILTER;
127131
}
128132
const keys = new Set(values.filter((value) => value !== ALL_PROJECTS_CHOOSER_VALUE));
129133
const kept = filter.entries.filter((entry) => keys.has(entry.key));
@@ -135,7 +139,11 @@ export function projectFilterFromChooser(
135139
}));
136140
const entries = [...kept, ...added];
137141
if (entries.length === filter.entries.length && added.length === 0) return filter;
138-
return entries.length === 0 ? ALL_PROJECTS_FILTER : { entries };
142+
return filter.mode === "exclude"
143+
? { mode: "exclude", entries }
144+
: entries.length === 0
145+
? ALL_PROJECTS_FILTER
146+
: { entries };
139147
}
140148

141149
/** A project row's Show only: the filter becomes that one project. */

‎apps/web/src/projectFilterScope.fork.test.ts‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,16 @@ const filterOf = (...selected: Array<typeof api>): ProjectFilter => ({
4040
});
4141

4242
describe("outside thread", () => {
43+
it("adding an excluded open thread's project removes its exclusion", () => {
44+
const filter: ProjectFilter = { ...filterOf(api, web), mode: "exclude" };
45+
expect(outsideFilterProjectGroup(filter, groups, ref("vm", "web"))).toBe(web);
46+
expect(outsideFilterProjectGroup(filter, groups, ref("local", "docs"))).toBeNull();
47+
const added = addProjectFilterEntry(filter, web);
48+
expect(added).toEqual({ ...filterOf(api), mode: "exclude" });
49+
expect(outsideFilterProjectGroup(added, groups, ref("vm", "web"))).toBeNull();
50+
expect(addProjectFilterEntry(added, docs)).toBe(added);
51+
});
52+
4353
it("Outside: a thread outside the filter names the group to add", () => {
4454
expect(outsideFilterProjectGroup(filterOf(api), groups, ref("vm", "web"))).toBe(web);
4555
});
@@ -59,6 +69,16 @@ describe("outside thread", () => {
5969
});
6070

6171
describe("new thread under the filter", () => {
72+
it("exclusion opens the scoped picker rather than creating in the hidden project", () => {
73+
const filter: ProjectFilter = { ...filterOf(api), mode: "exclude" };
74+
expect(resolveFilteredNewThread({ filter, contextProjectRef: null, direct: false })).toEqual({
75+
kind: "choose",
76+
});
77+
expect(
78+
resolveFilteredNewThread({ filter, contextProjectRef: ref("local", "api"), direct: true }),
79+
).toEqual({ kind: "project", projectRef: ref("local", "api") });
80+
});
81+
6282
it("New thread: all projects keeps upstream's resolution", () => {
6383
for (const direct of [false, true]) {
6484
expect(

‎apps/web/src/projectFilterScope.fork.ts‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ export function outsideFilterProjectGroup<Group extends ProjectChooserGroup>(
3030
groups: ReadonlyArray<Group>,
3131
projectRef: ScopedProjectRef,
3232
): Group | null {
33-
const shown = projectFilterProjectKeys(filter);
33+
const shown = projectFilterProjectKeys(
34+
filter,
35+
groups.flatMap((group) => group.memberProjectRefs),
36+
);
3437
if (shown === null || shown.has(scopedProjectKey(projectRef))) return null;
3538
return (
3639
groups.find((group) => group.memberProjectRefs.some((ref) => sameRef(ref, projectRef))) ?? null
@@ -42,6 +45,10 @@ export function addProjectFilterEntry(
4245
filter: ProjectFilter,
4346
group: ProjectChooserGroup,
4447
): ProjectFilter {
48+
if (filter.mode === "exclude") {
49+
const entries = filter.entries.filter((entry) => entry.key !== group.projectKey);
50+
return entries.length === filter.entries.length ? filter : { ...filter, entries };
51+
}
4552
if (filter.entries.some((entry) => entry.key === group.projectKey)) return filter;
4653
return {
4754
entries: [...filter.entries, { key: group.projectKey, members: group.memberProjectRefs }],
@@ -77,7 +84,7 @@ export function resolveFilteredNewThread(input: {
7784
if (direct && contextProjectRef !== null) {
7885
return { kind: "project", projectRef: contextProjectRef };
7986
}
80-
if (filter.entries.length > 1) return { kind: "choose" };
87+
if (filter.mode === "exclude" || filter.entries.length > 1) return { kind: "choose" };
8188
const members = filter.entries[0]!.members;
8289
const viewed =
8390
contextProjectRef === null

‎apps/web/src/windowProjectFilter.fork.test.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ describe("windowListProjects", () => {
7070
});
7171

7272
describe("windowLandingProjects", () => {
73+
it("does not reintroduce excluded projects when every project is excluded", () => {
74+
expect(windowLandingProjects([project("env-a", "solar")], new Set(), null, false)).toEqual([]);
75+
});
76+
7377
const projects = [
7478
project("env-a", "solar"),
7579
project("env-a", "quarry"),

‎apps/web/src/windowProjectFilter.fork.ts‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
import type { EnvironmentId, ProjectId, ScopedProjectRef } from "@t3tools/contracts";
1111
import { useEffect, useMemo, useSyncExternalStore } from "react";
1212

13-
import { useAllEnvironmentProjectSnapshotsReady } from "./state/entities";
13+
import { useAllEnvironmentProjectSnapshotsReady, useProjects } from "./state/entities";
1414
import { pendingWindowScopeSeed, windowProjectFilterState } from "./windowSidebarScope.fork";
1515

1616
/**
@@ -45,9 +45,12 @@ export function useWindowProjectFilter(
4545
filter,
4646
setFilter: state.set,
4747
scopeKey: projectFilterScopeKey(filter),
48-
projectKeys: projectFilterProjectKeys(filter),
48+
projectKeys: projectFilterProjectKeys(
49+
filter,
50+
groups.flatMap((group) => group.members),
51+
),
4952
}),
50-
[filter, state],
53+
[filter, groups, state],
5154
);
5255
}
5356

@@ -71,7 +74,15 @@ export function filterProjectsToWindow<Project extends WindowFilterableProject>(
7174
export function useWindowProjectKeys(): ReadonlySet<string> | null {
7275
const state = windowProjectFilterState();
7376
const stored = useSyncExternalStore(state.subscribe, state.get);
74-
return useMemo(() => projectFilterProjectKeys(stored), [stored]);
77+
const projects = useProjects();
78+
return useMemo(
79+
() =>
80+
projectFilterProjectKeys(
81+
stored,
82+
projects.map((project) => scopeProjectRef(project.environmentId, project.id)),
83+
),
84+
[stored, projects],
85+
);
7586
}
7687

7788
/** A project a link names explicitly; `environmentId` is absent on older links. */
@@ -124,6 +135,7 @@ export function windowLandingProjects<Project extends WindowFilterableProject>(
124135
projects: ReadonlyArray<Project>,
125136
projectKeys: ReadonlySet<string> | null,
126137
pendingSeed: ScopedProjectRef | null,
138+
fallbackToAll = true,
127139
): ReadonlyArray<Project> {
128140
const seeded =
129141
pendingSeed === null
@@ -135,19 +147,22 @@ export function windowLandingProjects<Project extends WindowFilterableProject>(
135147
);
136148
if (seeded.length > 0) return seeded;
137149
const shown = filterProjectsToWindow(projects, projectKeys);
138-
return shown.length > 0 ? shown : projects;
150+
return shown.length > 0 || !fallbackToAll ? shown : projects;
139151
}
140152

141153
/** `windowLandingProjects` for this window. */
142154
export function useWindowLandingProjects<Project extends WindowFilterableProject>(
143155
projects: ReadonlyArray<Project>,
144156
): ReadonlyArray<Project> {
145157
const projectKeys = useWindowProjectKeys();
158+
const state = windowProjectFilterState();
159+
const filter = useSyncExternalStore(state.subscribe, state.get);
160+
const fallbackToAll = filter.mode !== "exclude";
146161
// Read on each change of the inputs: the seed only ever goes from pending to
147162
// applied, and applying it changes `projectKeys`.
148163
const pendingSeed = pendingWindowScopeSeed();
149164
return useMemo(
150-
() => windowLandingProjects(projects, projectKeys, pendingSeed),
151-
[pendingSeed, projectKeys, projects],
165+
() => windowLandingProjects(projects, projectKeys, pendingSeed, fallbackToAll),
166+
[pendingSeed, projectKeys, projects, fallbackToAll],
152167
);
153168
}

0 commit comments

Comments
 (0)