Skip to content

Commit 8eefa56

Browse files
donjor-agent[bot]rsi-pr-agent
authored andcommitted
feat(web): each window filters several projects
## What Changed - Shared `ProjectFilter` model in `@t3tools/client-runtime/state/project-filter` - entries keep member refs - reconciled against the current groups - Web: `useWindowProjectFilter` feeds upstream's `scopedProjectKeys` - desktop: per-`WindowId` record in localStorage (update restore) - plain web: sessionStorage, per tab - a legacy `scopeKey` record becomes a one-entry filter - Mobile: `projectFilter` device-local preference - bound to the Home list and sidebar chooser state - Existing single-select chooser still drives the filter - with 2+ entries, "All projects" clears them - one pick replaces them - Stored filters decode through Effect Schema ## Why Each window needs its own filter over several projects (#1338). The multi-select chooser (#1352) and list behaviour (#1353) follow. Closes #1351 ## Close conditions ### Model - [x] Members: entries keep member refs (`projectFilter.fork.test.ts` "Members") - [x] Grouping: change re-maps members (`projectFilter.fork.test.ts` "Grouping") - [x] Growth: new group members join (`projectFilter.fork.test.ts` "Growth") - [x] Empty: shows all projects (`projectFilter.fork.test.ts` "Empty") - [x] Last deleted: returns to all (`projectFilter.fork.test.ts` "Last deleted") ### Storage - [x] Web: sessionStorage (`windowSidebarScope.fork.test.ts` "Web: plain web keeps each tab's filter in sessionStorage") - [x] Mobile: device-local preference (`mobile-preferences.fork.test.ts` "Mobile: ...") Also covered: with 2+ entries, "All projects" clears the filter (`windowSidebarScope.fork.test.ts` "with several entries, the chooser's All projects clears them and one pick replaces them"). Each test fails when its behaviour is swapped out. ## Checklist - [x] This PR is small and focused - [x] I explained what changed and why - [ ] I included before/after screenshots for any UI changes - [ ] I included a video for animation/interaction changes Claude Opus 5.5 in Claude Code. ## Fork trailers Squashes: - a105d07 feat(web): each window filters several projects - a0c38a1 fixup! feat(web): each window filters several projects Fork-Domain: workspaces Fork-Tier: core
1 parent 76fc8a6 commit 8eefa56

12 files changed

Lines changed: 756 additions & 65 deletions

‎apps/mobile/src/features/home/HomeRouteScreen.tsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import { useAtomValueWhileVisible, useHomeRouteVisible } from "./home-route-visi
3030
import { buildHomeProjectScopes } from "./homeThreadList";
3131
import { usePendingTaskListActions } from "./usePendingTaskListActions";
3232
import { useThreadListActions } from "./useThreadListActions";
33+
import { mobileProjectFilterPick, useMobileProjectFilter } from "./useMobileProjectFilter.fork"; // fork-hook: workspaces/mobile-filter-import
3334
import { getConnectionAwareBrandHeaderOptions } from "./WorkspaceConnectionTitle";
3435
import { useWorkspaceTabs } from "../workspace/WorkspaceTabsContext";
3536
import { openSettings } from "../settings/settings-navigation";
@@ -164,6 +165,7 @@ export function HomeRouteScreen() {
164165
)
165166
? resolvedProjectKey
166167
: null;
168+
useMobileProjectFilter(projects, listOptions, selectedProjectKey, setSelectedProjectKey); // fork-hook: workspaces/mobile-filter
167169

168170
if (layout.usesSplitView && !nativePrimaryColumn) {
169171
return (
@@ -234,6 +236,7 @@ export function HomeRouteScreen() {
234236
selectedProjectKey={selectedProjectKey}
235237
onEnvironmentChange={setSelectedEnvironmentId}
236238
onProjectChange={setSelectedProjectKey}
239+
{...mobileProjectFilterPick} // fork-hook: workspaces/mobile-filter-pick
237240
onOpenEnvironments={() => openSettings(navigation, "SettingsEnvironments")}
238241
onOpenSettings={() => selectTab("settings")}
239242
onSearchQueryChange={setSearchQuery}
@@ -258,6 +261,7 @@ export function HomeRouteScreen() {
258261
onRegenerateThreadTitle={regenerateThreadTitle}
259262
onEnvironmentChange={setSelectedEnvironmentId}
260263
onProjectChange={setSelectedProjectKey}
264+
{...mobileProjectFilterPick} // fork-hook: workspaces/mobile-filter-pick
261265
onOpenSettings={() => selectTab("settings")}
262266
onSearchQueryChange={setSearchQuery}
263267
onSelectThread={handleSelectThread}
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
// This device's project filter (RSI-Software/t3code-hyprws#1351), kept as a
2+
// device-local preference. The single-select chooser's picks write it, and the
3+
// Home list's and the sidebar's selected project follow it.
4+
import { useAtomSet, useAtomValue } from "@effect/atom-react";
5+
import {
6+
ALL_PROJECTS_FILTER,
7+
projectFilterFromKey,
8+
projectFilterScopeKey,
9+
reconcileProjectFilter,
10+
} from "@t3tools/client-runtime/state/project-filter";
11+
import type { EnvironmentProject } from "@t3tools/client-runtime/state/shell";
12+
import { AsyncResult } from "effect/unstable/reactivity";
13+
import { useEffect, useMemo, useRef } from "react";
14+
15+
import { appAtomRegistry } from "../../state/atom-registry";
16+
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
17+
import { useWorkspaceState } from "../../state/workspace";
18+
import type { ResolvedHomeListOptions } from "./home-list-options";
19+
import { buildHomeProjectScopes } from "./homeThreadList";
20+
21+
/**
22+
* Records a chooser pick: a project replaces the filter, `null` clears it. A
23+
* cleared filter of several entries leaves the selected key `null` as it was,
24+
* so the pick itself, not a key change, has to reach the preference.
25+
*/
26+
export function pickMobileProjectFilter(projectKey: string | null): void {
27+
appAtomRegistry.set(updateMobilePreferencesAtom, {
28+
projectFilter: projectFilterFromKey(projectKey),
29+
});
30+
}
31+
32+
/**
33+
* Replaces upstream's `onProjectChange` when spread after it. Optional in type
34+
* only, so the spread may follow the prop it replaces.
35+
*/
36+
export const mobileProjectFilterPick: {
37+
readonly onProjectChange?: (projectKey: string | null) => void;
38+
} = { onProjectChange: pickMobileProjectFilter };
39+
40+
/**
41+
* Keeps `selectedProjectKey` on the stored filter. The filter follows the device's project groups; an entry whose
42+
* environment is not connected yet stays stored, and shows again once back.
43+
*/
44+
export function useMobileProjectFilter(
45+
projects: ReadonlyArray<EnvironmentProject>,
46+
options: Pick<ResolvedHomeListOptions, "projectGroupingMode" | "selectedEnvironmentId">,
47+
selectedProjectKey: string | null,
48+
setSelectedProjectKey: (key: string | null) => void,
49+
) {
50+
const preferences = useAtomValue(mobilePreferencesAtom);
51+
const savePreferences = useAtomSet(updateMobilePreferencesAtom);
52+
const loaded = AsyncResult.isSuccess(preferences);
53+
const stored = (loaded && preferences.value.projectFilter) || ALL_PROJECTS_FILTER;
54+
const { environments, state } = useWorkspaceState();
55+
const settled =
56+
!state.isLoadingConnections &&
57+
state.hasLoadedShellSnapshot &&
58+
!state.hasPendingShellSnapshot &&
59+
environments.every((environment) => {
60+
return !environment.isEnabled || environment.connectionState === "connected";
61+
});
62+
const { projectGroupingMode, selectedEnvironmentId } = options;
63+
const groups = useMemo(
64+
() =>
65+
buildHomeProjectScopes({ projects, environmentId: null, projectGroupingMode }).map(
66+
(scope) => ({ key: scope.key, members: scope.projectRefs }),
67+
),
68+
[projectGroupingMode, projects],
69+
);
70+
const filter = useMemo(
71+
() => reconcileProjectFilter(stored, groups, settled),
72+
[groups, settled, stored],
73+
);
74+
// oxlint-disable-next-line t3code/react-effect-budget -- writes the reconciled filter back to the persisted device preferences store
75+
useEffect(() => {
76+
if (loaded && filter !== stored) savePreferences({ projectFilter: filter });
77+
}, [filter, loaded, savePreferences, stored]);
78+
79+
// The chooser can only show a key its environment filter lists.
80+
const scopeKey = projectFilterScopeKey(filter);
81+
const exposedKey = useMemo(() => {
82+
if (scopeKey === null) return null;
83+
const visible = buildHomeProjectScopes({
84+
projects,
85+
environmentId: selectedEnvironmentId,
86+
projectGroupingMode,
87+
});
88+
return visible.some((scope) => scope.key === scopeKey) ? scopeKey : null;
89+
}, [projectGroupingMode, projects, scopeKey, selectedEnvironmentId]);
90+
91+
const seenExposed = useRef<string | null>(null);
92+
// oxlint-disable-next-line t3code/react-effect-budget -- pushes filter changes into the caller-owned upstream selected-project state
93+
useEffect(() => {
94+
if (!loaded || exposedKey === seenExposed.current) return;
95+
seenExposed.current = exposedKey;
96+
if (exposedKey !== selectedProjectKey) setSelectedProjectKey(exposedKey);
97+
}, [exposedKey, loaded, selectedProjectKey, setSelectedProjectKey]);
98+
}

‎apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ import { buildHomeProjectScopes } from "../home/homeThreadList";
5353
import { SwipeableScrollGateProvider, useSwipeableScrollGate } from "../home/thread-swipe-actions";
5454
import { usePendingTaskListActions } from "../home/usePendingTaskListActions";
5555
import { useThreadListActions } from "../home/useThreadListActions";
56+
import { useMobileProjectFilter } from "../home/useMobileProjectFilter.fork"; // fork-hook: workspaces/mobile-filter-import
57+
import { pickMobileProjectFilter } from "../home/useMobileProjectFilter.fork"; // fork-hook: workspaces/mobile-filter-import
58+
import { mobileProjectFilterPick } from "../home/useMobileProjectFilter.fork"; // fork-hook: workspaces/mobile-filter-import
5659
import {
5760
getConnectionAwareBrandHeaderOptions,
5861
WorkspaceConnectionTitle,
@@ -245,6 +248,7 @@ function ThreadNavigationSidebarPane(
245248
// identity; the hook keeps it stable.
246249
const threadSearchMatchByKey = useThreadListSearchMatches(threads, threadSearch);
247250
const selectedProjectKey = selectedProjectScope?.key ?? null;
251+
useMobileProjectFilter(projects, options, selectedProjectKey, setSelectedProjectKey); // fork-hook: workspaces/mobile-filter
248252
const projectByKey = useMemo(() => {
249253
const map = new Map<string, EnvironmentProject>();
250254
for (const project of projects) {
@@ -393,12 +397,14 @@ function ThreadNavigationSidebarPane(
393397
return;
394398
}
395399
if (event === "project:all") {
400+
pickMobileProjectFilter(null); // fork-hook: workspaces/mobile-filter-pick
396401
setSelectedProjectKey(null);
397402
return;
398403
}
399404
if (event.startsWith("project:")) {
400405
const projectKey = event.slice("project:".length);
401406
if (projectFilterOptions.some((project) => project.key === projectKey)) {
407+
pickMobileProjectFilter(projectKey); // fork-hook: workspaces/mobile-filter-pick
402408
setSelectedProjectKey(projectKey);
403409
}
404410
return;
@@ -665,6 +671,7 @@ function ThreadNavigationSidebarPane(
665671
selectedProjectKey,
666672
onEnvironmentChange: setSelectedEnvironmentId,
667673
onProjectChange: setSelectedProjectKey,
674+
...mobileProjectFilterPick, // fork-hook: workspaces/mobile-filter-pick
668675
});
669676
const nativeHeaderItems = createSidebarHeaderItems({
670677
filterIcon,
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
import { describe, expect, it } from "@effect/vitest";
2+
import type { ProjectFilter } from "@t3tools/client-runtime/state/project-filter";
3+
import { EnvironmentId, ProjectId } from "@t3tools/contracts";
4+
import * as Effect from "effect/Effect";
5+
import * as Layer from "effect/Layer";
6+
import { vi } from "vite-plus/test";
7+
8+
// SQLite is unavailable, so preferences land in the device's secure storage.
9+
const secureItems = vi.hoisted(() => new Map<string, string>());
10+
vi.mock("expo-sqlite", () => ({
11+
openDatabaseAsync: () => Promise.reject(new Error("SQLite unavailable")),
12+
}));
13+
vi.mock("expo-secure-store", () => ({
14+
getItemAsync: async (key: string) => secureItems.get(key) ?? null,
15+
setItemAsync: async (key: string, value: string) => void secureItems.set(key, value),
16+
deleteItemAsync: async (key: string) => void secureItems.delete(key),
17+
}));
18+
19+
import * as MobileDatabase from "./mobile-database";
20+
import * as MobilePreferences from "./mobile-preferences";
21+
import * as MobileSecureStorage from "./mobile-secure-storage";
22+
23+
const openStore = MobilePreferences.make().pipe(
24+
Effect.provide(
25+
Layer.mergeAll(
26+
MobileDatabase.layer,
27+
Layer.succeed(MobileSecureStorage.MobileSecureStorage, MobileSecureStorage.make),
28+
),
29+
),
30+
);
31+
32+
const ref = (environmentId: string, projectId: string) => ({
33+
environmentId: EnvironmentId.make(environmentId),
34+
projectId: ProjectId.make(projectId),
35+
});
36+
const filter: ProjectFilter = {
37+
entries: [
38+
{ key: "github.com/acme/web", members: [ref("local", "web"), ref("vm", "web")] },
39+
{ key: "vm:api", members: [ref("vm", "api")] },
40+
],
41+
};
42+
43+
describe("mobile project filter preference", () => {
44+
it.effect("Mobile: the filter is a device-local preference that survives a relaunch", () =>
45+
Effect.gen(function* () {
46+
secureItems.clear();
47+
const store = yield* openStore;
48+
yield* store.savePatch({ projectGroupingMode: "repository", projectFilter: filter });
49+
50+
// A relaunch reads the device's storage again.
51+
const relaunched = yield* openStore;
52+
const loaded = yield* relaunched.load;
53+
expect(loaded.projectFilter).toEqual(filter);
54+
expect(loaded.projectGroupingMode).toBe("repository");
55+
expect([...secureItems.keys()]).toEqual(["t3code.preferences.fallback"]);
56+
}),
57+
);
58+
59+
it.effect("drops a stored filter it cannot read", () =>
60+
Effect.gen(function* () {
61+
secureItems.clear();
62+
secureItems.set(
63+
"t3code.preferences.fallback",
64+
JSON.stringify({ payload: JSON.stringify({ projectFilter: "web" }), updatedAt: 1 }),
65+
);
66+
const loaded = yield* (yield* openStore).load;
67+
expect(loaded).not.toHaveProperty("projectFilter");
68+
}),
69+
);
70+
});

‎apps/mobile/src/persistence/mobile-preferences.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ import {
1414
type PullRequestMergeMethod,
1515
type SidebarProjectGroupingMode,
1616
} from "@t3tools/contracts";
17+
import { decodeProjectFilter } from "@t3tools/client-runtime/state/project-filter"; // fork-hook: workspaces/mobile-filter-preference-import
18+
import type { ProjectFilter } from "@t3tools/client-runtime/state/project-filter"; // fork-hook: workspaces/mobile-filter-preference-import
1719
import type { AndroidNavigationStyle } from "../lib/androidNavigationStyle";
1820
import type { ComposerEnterBehavior } from "../lib/composerEnterBehavior";
1921
import type { FollowUpBehavior } from "../lib/followUpBehavior";
@@ -114,6 +116,7 @@ export interface Preferences {
114116
readonly microphones?: ReadonlyArray<MicrophoneEntry>;
115117
readonly projectGroupingEnabled?: boolean;
116118
readonly projectGroupingMode?: SidebarProjectGroupingMode;
119+
readonly projectFilter?: ProjectFilter; // fork-hook: workspaces/mobile-filter-preference
117120
readonly showIgnoredFiles?: boolean; // fork-hook: workspace-files/mobile-preferences-field
118121
readonly planModeEnabled?: boolean;
119122
readonly workingShelfEnabled?: boolean;
@@ -196,6 +199,7 @@ function sanitizePreferences(parsed: Preferences): Preferences {
196199
microphones?: ReadonlyArray<MicrophoneEntry>;
197200
projectGroupingEnabled?: boolean;
198201
projectGroupingMode?: SidebarProjectGroupingMode;
202+
projectFilter?: ProjectFilter; // fork-hook: workspaces/mobile-filter-preference-type
199203
showIgnoredFiles?: boolean; // fork-hook: workspace-files/mobile-preferences-sanitize-type
200204
planModeEnabled?: boolean;
201205
workingShelfEnabled?: boolean;
@@ -326,6 +330,8 @@ function sanitizePreferences(parsed: Preferences): Preferences {
326330
if (typeof parsed.showIgnoredFiles === "boolean") {
327331
preferences.showIgnoredFiles = parsed.showIgnoredFiles;
328332
}
333+
const projectFilter = decodeProjectFilter(parsed.projectFilter); // fork-hook: workspaces/mobile-filter-preference-sanitize
334+
if (projectFilter !== null) preferences.projectFilter = projectFilter; // fork-hook: workspaces/mobile-filter-preference-sanitize
329335
if (typeof parsed.planModeEnabled === "boolean") {
330336
preferences.planModeEnabled = parsed.planModeEnabled;
331337
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ import { canOpenDesktopWindow, openThreadInNewWindow } from "../desktopProjectWi
9191
import { useOpenProjectWindowFork } from "./Sidebar.fork"; // fork-hook: project-windows/sidebar-open-window-import
9292
import { SidebarOpenProjectWindowButtonFork } from "./Sidebar.fork"; // fork-hook: project-windows/sidebar-open-window-button-import
9393
import { useWindowSidebarScopeSeed } from "../windowSidebarScope.fork"; // fork-hook: multi-window/window-sidebar-scope-seed-import
94+
import { useWindowProjectFilter } from "../windowProjectFilter.fork"; // fork-hook: workspaces/filter-import
9495
import { isElectron } from "../env";
9596
import {
9697
resolveShortcutCommand,
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
// The sidebar's view of this window's project filter
2+
// (RSI-Software/t3code-hyprws#1351). The filter itself lives with the
3+
// per-window record in `windowSidebarScope.fork.ts`.
4+
import {
5+
projectFilterProjectKeys,
6+
projectFilterScopeKey,
7+
reconcileProjectFilter,
8+
} from "@t3tools/client-runtime/state/project-filter";
9+
import type { ScopedProjectRef } from "@t3tools/contracts";
10+
import { useEffect, useMemo, useSyncExternalStore } from "react";
11+
12+
import { useAllEnvironmentProjectSnapshotsReady } from "./state/entities";
13+
import { windowProjectFilterState } from "./windowSidebarScope.fork";
14+
15+
/**
16+
* Follows this window's filter onto the sidebar's current project groups and
17+
* projects it for upstream: `scopeKey` is the single-select chooser's value,
18+
* `projectKeys` the scoped project keys the list shows (`null` = all).
19+
*/
20+
export function useWindowProjectFilter(
21+
projectGroups: ReadonlyArray<{
22+
readonly projectKey: string;
23+
readonly memberProjectRefs: ReadonlyArray<ScopedProjectRef>;
24+
}>,
25+
) {
26+
const state = windowProjectFilterState();
27+
const stored = useSyncExternalStore(state.subscribe, state.get);
28+
const settled = useAllEnvironmentProjectSnapshotsReady();
29+
const groups = projectGroups.map((group) => ({
30+
key: group.projectKey,
31+
members: group.memberProjectRefs,
32+
}));
33+
const filter = reconcileProjectFilter(stored, groups, settled);
34+
useEffect(() => {
35+
if (filter !== stored) state.set(filter);
36+
}, [filter, state, stored]);
37+
return useMemo(
38+
() => ({
39+
scopeKey: projectFilterScopeKey(filter),
40+
projectKeys: projectFilterProjectKeys(filter),
41+
}),
42+
[filter],
43+
);
44+
}

0 commit comments

Comments
 (0)