Skip to content

Commit 5d52d3b

Browse files
donjor-agent[bot]rsi-pr-agent
authored andcommitted
feat(web): add all-except project filtering (#1663)
Squashes: - 567a176 feat(web): add all-except project filtering (#1663) (#1663) - 30cf028 fixup! feat(web): add all-except project filtering (#1663) (#1663) - 2ec6622 feat(web): add all-except project filtering (#1663) (#1663) - 4f08e42 fixup! feat(web): add all-except project filtering (#1663) (#1663) Fork-Domain: workspaces Fork-Tier: qol
1 parent aa22745 commit 5d52d3b

15 files changed

Lines changed: 306 additions & 45 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 & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,16 @@ export function useCommandPaletteProjectScopeFork(): CommandPaletteProjectScope
115115
const chooser = useProjectChooserHostValue();
116116
const filter = chooser?.filter ?? null;
117117
const label = chooser?.label ?? null;
118+
const groups = chooser?.groups;
118119
const [searchAll, setSearchAll] = useState(false);
119-
const filterKeys = useMemo(
120-
() => (filter === null ? null : projectFilterProjectKeys(filter)),
121-
[filter],
122-
);
123-
return useMemo(() => {
120+
const filterKeys =
121+
filter === null
122+
? null
123+
: projectFilterProjectKeys(
124+
filter,
125+
groups?.flatMap((group) => group.memberProjectRefs),
126+
);
127+
return (() => {
124128
if (filterKeys === null || label === null) return { projectKeys: null, toggle: null };
125129
const toggle: CommandPaletteActionItem = searchAll
126130
? {

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,15 @@ import { useWindowSidebarScopeSeed } from "../windowSidebarScope.fork"; // fork-
8888
import { useWindowProjectFilter, useWindowProjectFilterChange } from "../windowProjectFilter.fork"; // fork-hook: workspaces/filter-import
8989
import { startFilteredNewThreadFork } from "../projectFilterScope.fork"; // fork-hook: workspaces/filtered-new-thread-import
9090
import {
91-
ProjectChooserRowCheckFork,
9291
ProjectChooserShowOnlyButtonFork,
9392
ProjectChooserTriggerIconFork,
9493
ProjectChooserUnavailableFork,
9594
useSidebarProjectChooserFork,
9695
} from "./sidebar/SidebarProjectChooser.fork"; // fork-hook: workspaces/chooser-import
96+
import {
97+
ProjectChooserModeFork,
98+
ProjectChooserRowMarkFork,
99+
} from "./sidebar/SidebarProjectChooser.fork"; // fork-hook: workspaces/chooser-mode-import
97100
import { isElectron } from "../env";
98101
import {
99102
resolveShortcutCommand,
@@ -3009,6 +3012,12 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
30093012
anchor={headerSearchRef}
30103013
className="max-w-[min(18rem,var(--available-width))] overflow-hidden"
30113014
>
3015+
{/* fork-hook: workspaces/chooser-mode */}
3016+
<ProjectChooserModeFork
3017+
filter={windowFilter.filter}
3018+
setFilter={windowFilter.setFilter}
3019+
/>
3020+
{/* fork-hook-end */}
30123021
<ComboboxSearchInput
30133022
aria-label="Search projects"
30143023
placeholder="Search projects..."
@@ -3048,9 +3057,12 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
30483057
if (project) handleProjectSettings(event, project);
30493058
}}
30503059
>
3051-
{/* fork-hook: workspaces/chooser-row-check */}
3052-
<ProjectChooserRowCheckFork
3060+
{/* fork-hook: workspaces/chooser-row-mark */}
3061+
<ProjectChooserRowMarkFork
30533062
selected={projectChooser.selectedValues.has(item.value)}
3063+
excluded={
3064+
windowFilter.filter.mode === "exclude" && item.value !== "all"
3065+
}
30543066
/>
30553067
{/* fork-hook-end */}
30563068
{project ? (

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

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
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";
7-
import { useCallback, useMemo, useRef, type MouseEvent as ReactMouseEvent } from "react";
6+
import { CheckIcon, FocusIcon, FolderIcon, FoldersIcon, MinusIcon } from "lucide-react";
7+
import { useLayoutEffect, useRef, type MouseEvent as ReactMouseEvent } from "react";
88

99
import { cn } from "~/lib/utils";
1010
import {
@@ -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;
@@ -77,9 +78,45 @@ export function ProjectChooserTriggerIconFork({ count }: { readonly count: numbe
7778
}
7879

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

‎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
@@ -90,18 +90,22 @@ export function projectChooserState<Group extends ProjectChooserGroup>(
9090
return item === undefined ? [] : [item];
9191
});
9292
const count = filter.entries.length;
93+
const excluding = filter.mode === "exclude";
9394
const only = count === 1 ? value[0] : undefined;
9495
return {
9596
items,
9697
value,
9798
label:
9899
count === 0
99100
? "Projects: All"
100-
: only !== undefined
101-
? `Projects: ${only.label}`
102-
: `Projects: ${count} selected`,
103-
titleLabel: count === 0 ? null : titleLabelOf(value),
104-
single: only === undefined ? null : (groupByKey.get(only.value) ?? null),
101+
: excluding
102+
? `Projects: All except ${count}`
103+
: only !== undefined
104+
? `Projects: ${only.label}`
105+
: `Projects: ${count} selected`,
106+
titleLabel:
107+
count === 0 ? null : excluding ? `All except ${titleLabelOf(value)}` : titleLabelOf(value),
108+
single: excluding || only === undefined ? null : (groupByKey.get(only.value) ?? null),
105109
count,
106110
};
107111
}
@@ -121,7 +125,7 @@ export function projectFilterFromChooser(
121125
// "All projects" is in the selection only while the filter is empty, so
122126
// seeing it beside entries means the user just picked it.
123127
if (values.includes(ALL_PROJECTS_CHOOSER_VALUE) && filter.entries.length > 0) {
124-
return ALL_PROJECTS_FILTER;
128+
return filter.mode === "exclude" ? { mode: "exclude", entries: [] } : ALL_PROJECTS_FILTER;
125129
}
126130
const keys = new Set(values.filter((value) => value !== ALL_PROJECTS_CHOOSER_VALUE));
127131
const kept = filter.entries.filter((entry) => keys.has(entry.key));
@@ -133,7 +137,11 @@ export function projectFilterFromChooser(
133137
}));
134138
const entries = [...kept, ...added];
135139
if (entries.length === filter.entries.length && added.length === 0) return filter;
136-
return entries.length === 0 ? ALL_PROJECTS_FILTER : { entries };
140+
return filter.mode === "exclude"
141+
? { mode: "exclude", entries }
142+
: entries.length === 0
143+
? ALL_PROJECTS_FILTER
144+
: { entries };
137145
}
138146

139147
/** 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
@@ -28,7 +28,10 @@ export function outsideFilterProjectGroup<Group extends ProjectChooserGroup>(
2828
groups: ReadonlyArray<Group>,
2929
projectRef: ScopedProjectRef,
3030
): Group | null {
31-
const shown = projectFilterProjectKeys(filter);
31+
const shown = projectFilterProjectKeys(
32+
filter,
33+
groups.flatMap((group) => group.memberProjectRefs),
34+
);
3235
if (shown === null || shown.has(scopedProjectKey(projectRef))) return null;
3336
return (
3437
groups.find((group) => group.memberProjectRefs.some((ref) => sameRef(ref, projectRef))) ?? null
@@ -40,6 +43,10 @@ export function addProjectFilterEntry(
4043
filter: ProjectFilter,
4144
group: ProjectChooserGroup,
4245
): ProjectFilter {
46+
if (filter.mode === "exclude") {
47+
const entries = filter.entries.filter((entry) => entry.key !== group.projectKey);
48+
return entries.length === filter.entries.length ? filter : { ...filter, entries };
49+
}
4350
if (filter.entries.some((entry) => entry.key === group.projectKey)) return filter;
4451
return {
4552
entries: [...filter.entries, { key: group.projectKey, members: group.memberProjectRefs }],
@@ -70,7 +77,7 @@ export function resolveFilteredNewThread(input: {
7077
if (direct && contextProjectRef !== null) {
7178
return { kind: "project", projectRef: contextProjectRef };
7279
}
73-
if (filter.entries.length > 1) return { kind: "choose" };
80+
if (filter.mode === "exclude" || filter.entries.length > 1) return { kind: "choose" };
7481
const members = filter.entries[0]!.members;
7582
const viewed =
7683
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 & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import {
88
reconcileProjectFilter,
99
} from "@t3tools/client-runtime/state/project-filter";
1010
import type { EnvironmentId, ProjectId, ScopedProjectRef } from "@t3tools/contracts";
11-
import { useEffect, useMemo, useSyncExternalStore } from "react";
11+
import { useEffect, 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
/**
@@ -43,12 +43,15 @@ export function useWindowProjectFilter(
4343
scopeKey: projectFilterScopeKey(filter),
4444
projectKeys: projectFilterProjectKeys(
4545
filter,
46-
setFilter: state.set,
47-
scopeKey: projectFilterScopeKey(filter),
48-
projectKeys: projectFilterProjectKeys(filter),
49-
}),
50-
[filter, state],
51-
);
46+
groups.flatMap((group) => group.members),
47+
),
48+
};
49+
}
50+
51+
/** Runs `onChange` after every write to this window's filter. */
52+
export function useWindowProjectFilterChange(onChange: () => void) {
53+
// oxlint-disable-next-line t3code/react-effect-budget -- subscribes to the external window filter store.
54+
useEffect(() => windowProjectFilterState().subscribe(onChange), [onChange]);
5255
}
5356

5457
interface WindowFilterableProject {
@@ -71,7 +74,11 @@ 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 projectFilterProjectKeys(
79+
stored,
80+
projects.map((project) => scopeProjectRef(project.environmentId, project.id)),
81+
);
7582
}
7683

7784
/** A project a link names explicitly; `environmentId` is absent on older links. */
@@ -121,6 +128,7 @@ export function windowLandingProjects<Project extends WindowFilterableProject>(
121128
projects: ReadonlyArray<Project>,
122129
projectKeys: ReadonlySet<string> | null,
123130
pendingSeed: ScopedProjectRef | null,
131+
fallbackToAll = true,
124132
): ReadonlyArray<Project> {
125133
const seeded =
126134
pendingSeed === null
@@ -132,19 +140,19 @@ export function windowLandingProjects<Project extends WindowFilterableProject>(
132140
);
133141
if (seeded.length > 0) return seeded;
134142
const shown = filterProjectsToWindow(projects, projectKeys);
135-
return shown.length > 0 ? shown : projects;
143+
return shown.length > 0 || !fallbackToAll ? shown : projects;
136144
}
137145

138146
/** `windowLandingProjects` for this window. */
139147
export function useWindowLandingProjects<Project extends WindowFilterableProject>(
140148
projects: ReadonlyArray<Project>,
141149
): ReadonlyArray<Project> {
142150
const projectKeys = useWindowProjectKeys();
151+
const state = windowProjectFilterState();
152+
const filter = useSyncExternalStore(state.subscribe, state.get);
153+
const fallbackToAll = filter.mode !== "exclude";
143154
// Read on each change of the inputs: the seed only ever goes from pending to
144155
// applied, and applying it changes `projectKeys`.
145156
const pendingSeed = pendingWindowScopeSeed();
146-
return useMemo(
147-
() => windowLandingProjects(projects, projectKeys, pendingSeed),
148-
[pendingSeed, projectKeys, projects],
149-
);
157+
return windowLandingProjects(projects, projectKeys, pendingSeed, fallbackToAll);
150158
}

0 commit comments

Comments
 (0)